diff options
157 files changed, 17036 insertions, 10608 deletions
diff --git a/.gitattributes b/.gitattributes index 32583149c2..6e66623b12 100644 --- a/.gitattributes +++ b/.gitattributes @@ -1,4 +1,4 @@ -* whitespace=!indent,trail,space +* whitespace=trail,space *.[ch] whitespace=indent,trail,space diff=cpp *.sh whitespace=indent,trail,space text eol=lf *.perl text eol=lf diff=perl diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index cc54824c38..816d5a34c4 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -123,7 +123,7 @@ jobs: - name: zip up tracked files run: git archive -o artifacts/tracked.tar.gz HEAD - name: upload tracked files and build artifacts - uses: actions/upload-artifact@v4 + uses: actions/upload-artifact@v5 with: name: windows-artifacts path: artifacts @@ -140,7 +140,7 @@ jobs: cancel-in-progress: ${{ needs.ci-config.outputs.skip_concurrent == 'yes' }} steps: - name: download tracked files and build artifacts - uses: actions/download-artifact@v5 + uses: actions/download-artifact@v6 with: name: windows-artifacts path: ${{github.workspace}} @@ -157,7 +157,7 @@ jobs: run: ci/print-test-failures.sh - name: Upload failed tests' directories if: failure() && env.FAILED_TEST_ARTIFACTS != '' - uses: actions/upload-artifact@v4 + uses: actions/upload-artifact@v5 with: name: failed-tests-windows-${{ matrix.nr }} path: ${{env.FAILED_TEST_ARTIFACTS}} @@ -208,7 +208,7 @@ jobs: - name: zip up tracked files run: git archive -o artifacts/tracked.tar.gz HEAD - name: upload tracked files and build artifacts - uses: actions/upload-artifact@v4 + uses: actions/upload-artifact@v5 with: name: vs-artifacts path: artifacts @@ -226,7 +226,7 @@ jobs: steps: - uses: git-for-windows/setup-git-for-windows-sdk@v1 - name: download tracked files and build artifacts - uses: actions/download-artifact@v5 + uses: actions/download-artifact@v6 with: name: vs-artifacts path: ${{github.workspace}} @@ -244,7 +244,7 @@ jobs: run: ci/print-test-failures.sh - name: Upload failed tests' directories if: failure() && env.FAILED_TEST_ARTIFACTS != '' - uses: actions/upload-artifact@v4 + uses: actions/upload-artifact@v5 with: name: failed-tests-windows-vs-${{ matrix.nr }} path: ${{env.FAILED_TEST_ARTIFACTS}} @@ -270,7 +270,7 @@ jobs: shell: pwsh run: meson compile -C build - name: Upload build artifacts - uses: actions/upload-artifact@v4 + uses: actions/upload-artifact@v5 with: name: windows-meson-artifacts path: build @@ -292,7 +292,7 @@ jobs: shell: pwsh run: pip install meson ninja - name: Download build artifacts - uses: actions/download-artifact@v5 + uses: actions/download-artifact@v6 with: name: windows-meson-artifacts path: build @@ -313,16 +313,16 @@ jobs: vector: - jobname: osx-clang cc: clang - pool: macos-13 + pool: macos-14 - jobname: osx-reftable cc: clang - pool: macos-13 + pool: macos-14 - jobname: osx-gcc cc: gcc-13 - pool: macos-13 + pool: macos-14 - jobname: osx-meson cc: clang - pool: macos-13 + pool: macos-14 env: CC: ${{matrix.vector.cc}} CC_PACKAGE: ${{matrix.vector.cc_package}} @@ -339,7 +339,7 @@ jobs: run: ci/print-test-failures.sh - name: Upload failed tests' directories if: failure() && env.FAILED_TEST_ARTIFACTS != '' - uses: actions/upload-artifact@v4 + uses: actions/upload-artifact@v5 with: name: failed-tests-${{matrix.vector.jobname}} path: ${{env.FAILED_TEST_ARTIFACTS}} @@ -439,7 +439,7 @@ jobs: run: sudo --preserve-env --set-home --user=builder ci/print-test-failures.sh - name: Upload failed tests' directories if: failure() && env.FAILED_TEST_ARTIFACTS != '' - uses: actions/upload-artifact@v4 + uses: actions/upload-artifact@v5 with: name: failed-tests-${{matrix.vector.jobname}} path: ${{env.FAILED_TEST_ARTIFACTS}} diff --git a/Documentation/MyFirstContribution.adoc b/Documentation/MyFirstContribution.adoc index 02ba8ba5f6..f186dfbc89 100644 --- a/Documentation/MyFirstContribution.adoc +++ b/Documentation/MyFirstContribution.adoc @@ -1153,6 +1153,11 @@ NOTE: When you are sending a real patch, it will go to git@vger.kernel.org - but please don't send your patchset from the tutorial to the real mailing list! For now, you can send it to yourself, to make sure you understand how it will look. +NOTE: After sending your patches, you can confirm that they reached the mailing +list by visiting https://lore.kernel.org/git/. Use the search bar to find your +name or the subject of your patch. If it appears, your email was successfully +delivered. + After you run the command above, you will be presented with an interactive prompt for each patch that's about to go out. This gives you one last chance to edit or quit sending something (but again, don't edit code this way). Once you diff --git a/Documentation/RelNotes/2.52.0.adoc b/Documentation/RelNotes/2.52.0.adoc index a86e2c09e0..fc78d22567 100644 --- a/Documentation/RelNotes/2.52.0.adoc +++ b/Documentation/RelNotes/2.52.0.adoc @@ -17,10 +17,10 @@ UI, Workflows & Features * A new command "git last-modified" has been added to show the closest ancestor commit that touched each path. - * "git refs exists" that works like "git show-ref --exists" has been - added. + * The "git refs exists" command that works like "git show-ref --exists" + has been added. - * "repo info" learns a short-hand option "-z" that is the same as + * "git repo info" learns the short-hand option "-z" that is the same as "--format=nul", and learns to report the objects format used in the repository. @@ -53,7 +53,7 @@ UI, Workflows & Features * Configuration variables that take a pathname as a value (e.g. blame.ignorerevsfile) can be marked as optional by prefixing - ":(optoinal)" before its value. + ":(optional)" before its value. * Show 'P'ipe command in "git add -p". @@ -70,6 +70,15 @@ UI, Workflows & Features * "Symlink symref" has been added to the list of things that will disappear at Git 3.0 boundary. + * "git maintenance" command learns the "geometric" strategy where it + avoids doing maintenance tasks that rebuilds everything from + scratch. + + * "git repo structure", a new command. + + * The help text and manual page of "git bisect" command have been + made consistent with each other. + Performance, Internal Implementation, Development Support etc. -------------------------------------------------------------- @@ -158,6 +167,29 @@ Performance, Internal Implementation, Development Support etc. * Two slightly different ways to get at "all the packfiles" in API has been cleaned up. + * The code to walk revision graph to compute merge base has been + optimized. + + * AI guidelines has been added to our documentation set. + + * Contributed credential helpers (obviously in contrib/) now have "cd + $there && make install" target. + + * The "MyFirstContribution" tutorial tells the reader how to send out + their patches; the section gained a hint to verify the message + reached the mailing list. + + * The "debug" ref-backend was missing a method implementation, which + has been corrected. + + * Build procedure for Wincred credential helper has been updated. + + * The build procedure based on meson learned to allow builders to + specify the directory to install HTML documents. + + * Building "git contacts" script (in contrib/) left the resulting + file unexecutable, which has been corrected. + Fixes since v2.51 ----------------- @@ -382,6 +414,30 @@ including security updates, are included in this release. and "git bisect unknown", which has been corrected. (merge 2bb3a012f3 rz/bisect-help-unknown later to maint). + * The 'q'(uit) command in "git add -p" has been improved to quit + without doing any meaningless work before leaving, and giving EOF + (typically control-D) to the prompt is made to behave the same way. + + * The wildmatch code had a corner case bug that mistakenly makes + "foo**/bar" match with "foobar", which has been corrected. + (merge 1940a02dc1 jk/match-pathname-fix later to maint). + + * Tests did not set up GNUPGHOME correctly, which is fixed but some + flaky tests are exposed in t1016, which needs to be addressed + before this topic can move forward. + (merge 6cd8369ef3 tz/test-prepare-gnupghome later to maint). + + * The patterns used in the .gitignore files use backslash in the way + documented for fnmatch(3); document as such to reduce confusion. + (merge 8a6d158a1d jk/doc-backslash-in-exclude later to maint). + + * The version of macos image used in GitHub CI has been updated to + macos-14, as the macos-13 that we have been using got deprecated. + Perforce binary used there has been changed to arm64 version to + match. + (merge 73b9cdb7c4 jc/ci-use-macos-14 later to maint). + (merge ffff0bb0da jc/ci-use-arm64-p4-on-macos later to maint). + * Other code cleanup, docfix, build fix, etc. (merge 529a60a885 ua/t1517-short-help-tests later to maint). (merge 22d421fed9 ac/deglobal-fmt-merge-log-config later to maint). @@ -393,3 +449,6 @@ including security updates, are included in this release. (merge a66fc22bf9 rs/get-oid-with-flags-cleanup later to maint). (merge 15b8abde07 js/mingw-includes-cleanup later to maint). (merge 2cebca0582 tb/cat-file-objectmode-update later to maint). + (merge 8f487db07a kh/doc-patch-id-1 later to maint). + (merge f711f37b05 eb/t1016-hash-transition-fix later to maint). + (merge 85333aa1af jk/test-delete-gpgsig-leakfix later to maint). diff --git a/Documentation/RelNotes/2.53.0.adoc b/Documentation/RelNotes/2.53.0.adoc new file mode 100644 index 0000000000..997ae7476c --- /dev/null +++ b/Documentation/RelNotes/2.53.0.adoc @@ -0,0 +1,31 @@ +Git v2.53 Release Notes +======================= + +UI, Workflows & Features +------------------------ + + * "git maintenance" command learned "is-needed" subcommand to tell if + it is necessary to perform various maintenance tasks. + + +Performance, Internal Implementation, Development Support etc. +-------------------------------------------------------------- + + * The list of packfiles used in a running Git process is moved from + the packed_git structure into the packfile store. + + * Some ref backend storage can hold not just the object name of an + annotated tag, but the object name of the object the tag points at. + The code to handle this information has been streamlined. + + * As "git diff --quiet" only cares about the existence of any + changes, disable rename/copy detection to skip more expensive + processing whose result will be discarded anyway. + + +Fixes since v2.51 +----------------- + + * Ever since we added whitespace rules for this project, we misspelt + an entry, which has been corrected. + (merge 358e94dc70 jc/gitattributes-whitespace-no-indent-fix later to maint). diff --git a/Documentation/SubmittingPatches b/Documentation/SubmittingPatches index d620bd93bd..e270ccbe85 100644 --- a/Documentation/SubmittingPatches +++ b/Documentation/SubmittingPatches @@ -446,6 +446,34 @@ highlighted above. Only capitalize the very first letter of the trailer, i.e. favor "Signed-off-by" over "Signed-Off-By" and "Acked-by:" over "Acked-By". +[[ai]] +=== Use of Artificial Intelligence (AI) + +The Developer's Certificate of Origin requires contributors to certify +that they know the origin of their contributions to the project and +that they have the right to submit it under the project's license. +It's not yet clear that this can be legally satisfied when submitting +significant amount of content that has been generated by AI tools. + +Another issue with AI generated content is that AIs still often +hallucinate or just produce bad code, commit messages, documentation +or output, even when you point out their mistakes. + +To avoid these issues, we will reject anything that looks AI +generated, that sounds overly formal or bloated, that looks like AI +slop, that looks good on the surface but makes no sense, or that +senders don’t understand or cannot explain. + +We strongly recommend using AI tools carefully and responsibly. + +Contributors would often benefit more from AI by using it to guide and +help them step by step towards producing a solution by themselves +rather than by asking for a full solution that they would then mostly +copy-paste. They can also use AI to help with debugging, or with +checking for obvious mistakes, things that can be improved, things +that don’t match our style, guidelines or our feedback, before sending +it to us. + [[git-tools]] === Generate your patch using Git tools out of your commits. diff --git a/Documentation/config/maintenance.adoc b/Documentation/config/maintenance.adoc index 2f71934218..d0c38f03fa 100644 --- a/Documentation/config/maintenance.adoc +++ b/Documentation/config/maintenance.adoc @@ -16,19 +16,36 @@ detach. maintenance.strategy:: This string config option provides a way to specify one of a few - recommended schedules for background maintenance. This only affects - which tasks are run during `git maintenance run --schedule=X` - commands, provided no `--task=<task>` arguments are provided. - Further, if a `maintenance.<task>.schedule` config value is set, - then that value is used instead of the one provided by - `maintenance.strategy`. The possible strategy strings are: + recommended strategies for repository maintenance. This affects + which tasks are run during `git maintenance run`, provided no + `--task=<task>` arguments are provided. This setting impacts manual + maintenance, auto-maintenance as well as scheduled maintenance. The + tasks that run may be different depending on the maintenance type. + -* `none`: This default setting implies no tasks are run at any schedule. +The maintenance strategy can be further tweaked by setting +`maintenance.<task>.enabled` and `maintenance.<task>.schedule`. If set, these +values are used instead of the defaults provided by `maintenance.strategy`. ++ +The possible strategies are: ++ +* `none`: This strategy implies no tasks are run at all. This is the default + strategy for scheduled maintenance. +* `gc`: This strategy runs the `gc` task. This is the default strategy for + manual maintenance. +* `geometric`: This strategy performs geometric repacking of packfiles and + keeps auxiliary data structures up-to-date. The strategy expires data in the + reflog and removes worktrees that cannot be located anymore. When the + geometric repacking strategy would decide to do an all-into-one repack, then + the strategy generates a cruft pack for all unreachable objects. Objects that + are already part of a cruft pack will be expired. ++ +This repacking strategy is a full replacement for the `gc` strategy and is +recommended for large repositories. * `incremental`: This setting optimizes for performing small maintenance activities that do not delete any data. This does not schedule the `gc` task, but runs the `prefetch` and `commit-graph` tasks hourly, the `loose-objects` and `incremental-repack` tasks daily, and the `pack-refs` - task weekly. + task weekly. Manual repository maintenance uses the `gc` task. maintenance.<task>.enabled:: This boolean config option controls whether the maintenance task @@ -75,6 +92,22 @@ maintenance.incremental-repack.auto:: number of pack-files not in the multi-pack-index is at least the value of `maintenance.incremental-repack.auto`. The default value is 10. +maintenance.geometric-repack.auto:: + This integer config option controls how often the `geometric-repack` + task should be run as part of `git maintenance run --auto`. If zero, + then the `geometric-repack` task will not run with the `--auto` + option. A negative value will force the task to run every time. + Otherwise, a positive value implies the command should run either when + there are packfiles that need to be merged together to retain the + geometric progression, or when there are at least this many loose + objects that would be written into a new packfile. The default value is + 100. + +maintenance.geometric-repack.splitFactor:: + This integer config option controls the factor used for the geometric + sequence. See the `--geometric=` option in linkgit:git-repack[1] for + more details. Defaults to `2`. + maintenance.reflog-expire.auto:: This integer config option controls how often the `reflog-expire` task should be run as part of `git maintenance run --auto`. If zero, then diff --git a/Documentation/config/replay.adoc b/Documentation/config/replay.adoc new file mode 100644 index 0000000000..7d549d2f0e --- /dev/null +++ b/Documentation/config/replay.adoc @@ -0,0 +1,11 @@ +replay.refAction:: + Specifies the default mode for handling reference updates in + `git replay`. The value can be: ++ +-- + * `update`: Update refs directly using an atomic transaction (default behavior). + * `print`: Output update-ref commands for pipeline use. +-- ++ +This setting can be overridden with the `--ref-action` command-line option. +When not configured, `git replay` defaults to `update` mode. diff --git a/Documentation/git-bisect.adoc b/Documentation/git-bisect.adoc index 58dbb74a15..b0078dda0e 100644 --- a/Documentation/git-bisect.adoc +++ b/Documentation/git-bisect.adoc @@ -9,26 +9,22 @@ git-bisect - Use binary search to find the commit that introduced a bug SYNOPSIS -------- [verse] -'git bisect' <subcommand> <options> +'git bisect' start [--term-(bad|new)=<term-new> --term-(good|old)=<term-old>] + [--no-checkout] [--first-parent] [<bad> [<good>...]] [--] [<pathspec>...] +'git bisect' (bad|new|<term-new>) [<rev>] +'git bisect' (good|old|<term-old>) [<rev>...] +'git bisect' terms [--term-(good|old) | --term-(bad|new)] +'git bisect' skip [(<rev>|<range>)...] +'git bisect' next +'git bisect' reset [<commit>] +'git bisect' (visualize|view) +'git bisect' replay <logfile> +'git bisect' log +'git bisect' run <cmd> [<arg>...] +'git bisect' help DESCRIPTION ----------- -The command takes various subcommands, and different options depending -on the subcommand: - - git bisect start [--term-(bad|new)=<term-new> --term-(good|old)=<term-old>] - [--no-checkout] [--first-parent] [<bad> [<good>...]] [--] [<pathspec>...] - git bisect (bad|new|<term-new>) [<rev>] - git bisect (good|old|<term-old>) [<rev>...] - git bisect terms [--term-(good|old) | --term-(bad|new)] - git bisect skip [(<rev>|<range>)...] - git bisect reset [<commit>] - git bisect (visualize|view) - git bisect replay <logfile> - git bisect log - git bisect run <cmd> [<arg>...] - git bisect help - This command uses a binary search algorithm to find which commit in your project's history introduced a bug. You use it by first telling it a "bad" commit that is known to contain the bug, and a "good" @@ -295,6 +291,19 @@ $ git bisect skip v2.5 v2.5..v2.6 This tells the bisect process that the commits between `v2.5` and `v2.6` (inclusive) should be skipped. +Bisect next +~~~~~~~~~~~ + +Normally, after marking a revision as good or bad, Git automatically +computes and checks out the next revision to test. However, if you need to +explicitly request the next bisection step, you can use: + +------------ +$ git bisect next +------------ + +You might use this to resume the bisection process after interrupting it +by checking out a different revision. Cutting down bisection by giving more parameters to bisect start ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ diff --git a/Documentation/git-checkout.adoc b/Documentation/git-checkout.adoc index 431185ca0b..6f281b298e 100644 --- a/Documentation/git-checkout.adoc +++ b/Documentation/git-checkout.adoc @@ -61,7 +61,7 @@ uncommitted changes. `git checkout -B <branch> [<start-point>]`:: The same as `-b`, except that if the branch already exists it - resets `_<branch>_` to the start point instead of failing. + resets _<branch>_ to the start point instead of failing. `git checkout --detach [<branch>]`:: `git checkout [--detach] <commit>`:: @@ -155,7 +155,7 @@ of it"). `-B <new-branch>`:: The same as `-b`, except that if the branch already exists it - resets `_<branch>_` to the start point instead of failing. + resets _<branch>_ to the start point instead of failing. `-t`:: `--track[=(direct|inherit)]`:: diff --git a/Documentation/git-maintenance.adoc b/Documentation/git-maintenance.adoc index 540b5cf68b..bda616f14c 100644 --- a/Documentation/git-maintenance.adoc +++ b/Documentation/git-maintenance.adoc @@ -12,6 +12,7 @@ SYNOPSIS 'git maintenance' run [<options>] 'git maintenance' start [--scheduler=<scheduler>] 'git maintenance' (stop|register|unregister) [<options>] +'git maintenance' is-needed [<options>] DESCRIPTION @@ -84,6 +85,16 @@ The `unregister` subcommand will report an error if the current repository is not already registered. Use the `--force` option to return success even when the current repository is not registered. +is-needed:: + Check whether maintenance needs to be run without actually running it. + Exits with a 0 status code if maintenance needs to be run, 1 otherwise. + Ideally used with the '--auto' flag. ++ +If one or more `--task` options are specified, then those tasks are checked +in that order. Otherwise, the tasks are determined by which +`maintenance.<task>.enabled` config options are true. By default, only +`maintenance.gc.enabled` is true. + TASKS ----- @@ -183,6 +194,8 @@ OPTIONS in the `gc.auto` config setting, or when the number of pack-files exceeds the `gc.autoPackLimit` config setting. Not compatible with the `--schedule` option. + When combined with the `is-needed` subcommand, check if the required + thresholds are met without actually running maintenance. --schedule:: When combined with the `run` subcommand, run maintenance tasks diff --git a/Documentation/git-patch-id.adoc b/Documentation/git-patch-id.adoc index 45da0f27ac..92a1af36a2 100644 --- a/Documentation/git-patch-id.adoc +++ b/Documentation/git-patch-id.adoc @@ -7,8 +7,8 @@ git-patch-id - Compute unique ID for a patch SYNOPSIS -------- -[verse] -'git patch-id' [--stable | --unstable | --verbatim] +[synopsis] +git patch-id [--stable | --unstable | --verbatim] DESCRIPTION ----------- @@ -21,7 +21,7 @@ the same time also reasonably unique, i.e., two patches that have the same The main usecase for this command is to look for likely duplicate commits. -When dealing with 'git diff-tree' output, it takes advantage of +When dealing with `git diff-tree` output, it takes advantage of the fact that the patch is prefixed with the object name of the commit, and outputs two 40-byte hexadecimal strings. The first string is the patch ID, and the second string is the commit ID. @@ -30,35 +30,35 @@ This can be used to make a mapping from patch ID to commit ID. OPTIONS ------- ---verbatim:: +`--verbatim`:: Calculate the patch-id of the input as it is given, do not strip any whitespace. + -This is the default if patchid.verbatim is true. +This is the default if `patchid.verbatim` is `true`. ---stable:: +`--stable`:: Use a "stable" sum of hashes as the patch ID. With this option: + -- - Reordering file diffs that make up a patch does not affect the ID. In particular, two patches produced by comparing the same two trees - with two different settings for "-O<orderfile>" result in the same + with two different settings for `-O<orderfile>` result in the same patch ID signature, thereby allowing the computed result to be used as a key to index some meta-information about the change between the two trees; - Result is different from the value produced by git 1.9 and older - or produced when an "unstable" hash (see --unstable below) is + or produced when an "unstable" hash (see `--unstable` below) is configured - even when used on a diff output taken without any use - of "-O<orderfile>", thereby making existing databases storing such + of `-O<orderfile>`, thereby making existing databases storing such "unstable" or historical patch-ids unusable. - All whitespace within the patch is ignored and does not affect the id. -- + -This is the default if patchid.stable is set to true. +This is the default if `patchid.stable` is set to `true`. ---unstable:: +`--unstable`:: Use an "unstable" hash as the patch ID. With this option, the result produced is compatible with the patch-id value produced by git 1.9 and older and whitespace is ignored. Users with pre-existing diff --git a/Documentation/git-replay.adoc b/Documentation/git-replay.adoc index 0b12bf8aa4..dcb26e8a8e 100644 --- a/Documentation/git-replay.adoc +++ b/Documentation/git-replay.adoc @@ -9,15 +9,16 @@ git-replay - EXPERIMENTAL: Replay commits on a new base, works with bare repos t SYNOPSIS -------- [verse] -(EXPERIMENTAL!) 'git replay' ([--contained] --onto <newbase> | --advance <branch>) <revision-range>... +(EXPERIMENTAL!) 'git replay' ([--contained] --onto <newbase> | --advance <branch>) [--ref-action[=<mode>]] <revision-range>... DESCRIPTION ----------- Takes ranges of commits and replays them onto a new location. Leaves -the working tree and the index untouched, and updates no references. -The output of this command is meant to be used as input to -`git update-ref --stdin`, which would update the relevant branches +the working tree and the index untouched. By default, updates the +relevant references using an atomic transaction (all refs update or +none). Use `--ref-action=print` to avoid automatic ref updates and +instead get update commands that can be piped to `git update-ref --stdin` (see the OUTPUT section below). THIS COMMAND IS EXPERIMENTAL. THE BEHAVIOR MAY CHANGE. @@ -29,18 +30,29 @@ OPTIONS Starting point at which to create the new commits. May be any valid commit, and not just an existing branch name. + -When `--onto` is specified, the update-ref command(s) in the output will -update the branch(es) in the revision range to point at the new -commits, similar to the way how `git rebase --update-refs` updates -multiple branches in the affected range. +When `--onto` is specified, the branch(es) in the revision range will be +updated to point at the new commits, similar to the way `git rebase --update-refs` +updates multiple branches in the affected range. --advance <branch>:: Starting point at which to create the new commits; must be a branch name. + -When `--advance` is specified, the update-ref command(s) in the output -will update the branch passed as an argument to `--advance` to point at -the new commits (in other words, this mimics a cherry-pick operation). +The history is replayed on top of the <branch> and <branch> is updated to +point at the tip of the resulting history. This is different from `--onto`, +which uses the target only as a starting point without updating it. + +--ref-action[=<mode>]:: + Control how references are updated. The mode can be: ++ +-- + * `update` (default): Update refs directly using an atomic transaction. + All refs are updated or none are (all-or-nothing behavior). + * `print`: Output update-ref commands for pipeline use. This is the + traditional behavior where output can be piped to `git update-ref --stdin`. +-- ++ +The default mode can be configured via the `replay.refAction` configuration variable. <revision-range>:: Range of commits to replay. More than one <revision-range> can @@ -54,8 +66,11 @@ include::rev-list-options.adoc[] OUTPUT ------ -When there are no conflicts, the output of this command is usable as -input to `git update-ref --stdin`. It is of the form: +By default, or with `--ref-action=update`, this command produces no output on +success, as refs are updated directly using an atomic transaction. + +When using `--ref-action=print`, the output is usable as input to +`git update-ref --stdin`. It is of the form: update refs/heads/branch1 ${NEW_branch1_HASH} ${OLD_branch1_HASH} update refs/heads/branch2 ${NEW_branch2_HASH} ${OLD_branch2_HASH} @@ -81,6 +96,14 @@ To simply rebase `mybranch` onto `target`: ------------ $ git replay --onto target origin/main..mybranch +------------ + +The refs are updated atomically and no output is produced on success. + +To see what would be updated without actually updating: + +------------ +$ git replay --ref-action=print --onto target origin/main..mybranch update refs/heads/mybranch ${NEW_mybranch_HASH} ${OLD_mybranch_HASH} ------------ @@ -88,33 +111,29 @@ To cherry-pick the commits from mybranch onto target: ------------ $ git replay --advance target origin/main..mybranch -update refs/heads/target ${NEW_target_HASH} ${OLD_target_HASH} ------------ Note that the first two examples replay the exact same commits and on top of the exact same new base, they only differ in that the first -provides instructions to make mybranch point at the new commits and -the second provides instructions to make target point at them. +updates mybranch to point at the new commits and the second updates +target to point at them. What if you have a stack of branches, one depending upon another, and you'd really like to rebase the whole set? ------------ $ git replay --contained --onto origin/main origin/main..tipbranch -update refs/heads/branch1 ${NEW_branch1_HASH} ${OLD_branch1_HASH} -update refs/heads/branch2 ${NEW_branch2_HASH} ${OLD_branch2_HASH} -update refs/heads/tipbranch ${NEW_tipbranch_HASH} ${OLD_tipbranch_HASH} ------------ +All three branches (`branch1`, `branch2`, and `tipbranch`) are updated +atomically. + When calling `git replay`, one does not need to specify a range of commits to replay using the syntax `A..B`; any range expression will do: ------------ $ git replay --onto origin/main ^base branch1 branch2 branch3 -update refs/heads/branch1 ${NEW_branch1_HASH} ${OLD_branch1_HASH} -update refs/heads/branch2 ${NEW_branch2_HASH} ${OLD_branch2_HASH} -update refs/heads/branch3 ${NEW_branch3_HASH} ${OLD_branch3_HASH} ------------ This will simultaneously rebase `branch1`, `branch2`, and `branch3`, diff --git a/Documentation/git-repo.adoc b/Documentation/git-repo.adoc index 209afd1b61..ce43cb19c8 100644 --- a/Documentation/git-repo.adoc +++ b/Documentation/git-repo.adoc @@ -9,6 +9,7 @@ SYNOPSIS -------- [synopsis] git repo info [--format=(keyvalue|nul)] [-z] [<key>...] +git repo structure [--format=(table|keyvalue|nul)] DESCRIPTION ----------- @@ -43,6 +44,35 @@ supported: + `-z` is an alias for `--format=nul`. +`structure [--format=(table|keyvalue|nul)]`:: + Retrieve statistics about the current repository structure. The + following kinds of information are reported: ++ +* Reference counts categorized by type +* Reachable object counts categorized by type + ++ +The output format can be chosen through the flag `--format`. Three formats are +supported: ++ +`table`::: + Outputs repository stats in a human-friendly table. This format may + change and is not intended for machine parsing. This is the default + format. + +`keyvalue`::: + Each line of output contains a key-value pair for a repository stat. + The '=' character is used to delimit between the key and the value. + Values containing "unusual" characters are quoted as explained for the + configuration variable `core.quotePath` (see linkgit:git-config[1]). + +`nul`::: + Similar to `keyvalue`, but uses a NUL character to delimit between + key-value pairs instead of a newline. Also uses a newline character as + the delimiter between the key and value instead of '='. Unlike the + `keyvalue` format, values containing "unusual" characters are never + quoted. + INFO KEYS --------- In order to obtain a set of values from `git repo info`, you should provide diff --git a/Documentation/gitcli.adoc b/Documentation/gitcli.adoc index ef2a0a399d..6815d6bfb7 100644 --- a/Documentation/gitcli.adoc +++ b/Documentation/gitcli.adoc @@ -223,7 +223,7 @@ Options that take a filename allow a prefix `:(optional)`. For example: ---------------------------- git commit -F :(optional)COMMIT_EDITMSG -# if COMMIT_EDITMSG does not exist, equivalent to +# if COMMIT_EDITMSG does not exist, the above is equivalent to git commit ---------------------------- diff --git a/Documentation/gitignore.adoc b/Documentation/gitignore.adoc index 5e0964ef41..9fccab4ae8 100644 --- a/Documentation/gitignore.adoc +++ b/Documentation/gitignore.adoc @@ -111,6 +111,11 @@ PATTERN FORMAT one of the characters in a range. See fnmatch(3) and the FNM_PATHNAME flag for a more detailed description. + - A backslash ("`\`") can be used to escape any character. E.g., "`\*`" + matches a literal asterisk (and "`\a`" matches "`a`", even though + there is no need for escaping there). As with fnmatch(3), a backslash + at the end of a pattern is an invalid pattern that never matches. + Two consecutive asterisks ("`**`") in patterns matched against full pathname may have special meaning: diff --git a/Documentation/gitprotocol-http.adoc b/Documentation/gitprotocol-http.adoc index d024010414..e2ef7f0459 100644 --- a/Documentation/gitprotocol-http.adoc +++ b/Documentation/gitprotocol-http.adoc @@ -443,7 +443,8 @@ If no "want" objects are received, send an error: TODO: Define error if no "want" lines are requested. If any "want" object is not reachable, send an error: -TODO: Define error if an invalid "want" is requested. +When a Git server receives an invalid or malformed `want` line, it +responds with an error message that includes the offending object name. Create an empty list, `s_common`. diff --git a/Documentation/howto/meson.build b/Documentation/howto/meson.build index ece20244af..16b9056f24 100644 --- a/Documentation/howto/meson.build +++ b/Documentation/howto/meson.build @@ -35,7 +35,7 @@ doc_targets += custom_target( output: 'howto-index.html', depends: documentation_deps, install: true, - install_dir: get_option('datadir') / 'doc/git-doc', + install_dir: htmldir, ) foreach howto : howto_sources @@ -57,6 +57,6 @@ foreach howto : howto_sources output: fs.stem(howto_stripped.full_path()) + '.html', depends: documentation_deps, install: true, - install_dir: get_option('datadir') / 'doc/git-doc/howto', + install_dir: htmldir / 'howto', ) endforeach diff --git a/Documentation/meson.build b/Documentation/meson.build index 9d24f2da54..c00c9fe7f4 100644 --- a/Documentation/meson.build +++ b/Documentation/meson.build @@ -412,7 +412,7 @@ foreach manpage, category : manpages input: manpage, output: fs.stem(manpage) + '.html', install: true, - install_dir: get_option('datadir') / 'doc/git-doc', + install_dir: htmldir, ) endif endforeach @@ -423,7 +423,7 @@ if get_option('docs').contains('html') output: 'docinfo.html', copy: true, install: true, - install_dir: get_option('datadir') / 'doc/git-doc', + install_dir: htmldir, ) configure_file( @@ -431,11 +431,11 @@ if get_option('docs').contains('html') output: 'docbook-xsl.css', copy: true, install: true, - install_dir: get_option('datadir') / 'doc/git-doc', + install_dir: htmldir, ) install_symlink('index.html', - install_dir: get_option('datadir') / 'doc/git-doc', + install_dir: htmldir, pointing_to: 'git.html', ) @@ -466,7 +466,7 @@ if get_option('docs').contains('html') input: 'docbook.xsl', output: 'user-manual.html', install: true, - install_dir: get_option('datadir') / 'doc/git-doc', + install_dir: htmldir, ) articles = [ @@ -492,7 +492,7 @@ if get_option('docs').contains('html') output: fs.stem(article) + '.html', depends: documentation_deps, install: true, - install_dir: get_option('datadir') / 'doc/git-doc', + install_dir: htmldir, ) endforeach diff --git a/Documentation/technical/meson.build b/Documentation/technical/meson.build index be698ef22a..faff3964a9 100644 --- a/Documentation/technical/meson.build +++ b/Documentation/technical/meson.build @@ -53,7 +53,7 @@ doc_targets += custom_target( output: 'api-index.html', depends: documentation_deps, install: true, - install_dir: get_option('datadir') / 'doc/git-doc/technical', + install_dir: htmldir / 'technical', ) foreach article : api_docs + articles @@ -63,6 +63,6 @@ foreach article : api_docs + articles output: fs.stem(article) + '.html', depends: documentation_deps, install: true, - install_dir: get_option('datadir') / 'doc/git-doc/technical', + install_dir: htmldir / 'technical', ) endforeach diff --git a/GIT-VERSION-GEN b/GIT-VERSION-GEN index b16db85e77..1f7af0328a 100755 --- a/GIT-VERSION-GEN +++ b/GIT-VERSION-GEN @@ -1,6 +1,6 @@ #!/bin/sh -DEF_VER=v2.51.GIT +DEF_VER=v2.52.GIT LF=' ' @@ -1 +1 @@ -Documentation/RelNotes/2.52.0.adoc
\ No newline at end of file +Documentation/RelNotes/2.53.0.adoc
\ No newline at end of file diff --git a/add-patch.c b/add-patch.c index ae9a20d8f2..173a53241e 100644 --- a/add-patch.c +++ b/add-patch.c @@ -1569,8 +1569,10 @@ static int patch_update_file(struct add_p_state *s, if (*s->s.reset_color_interactive) fputs(s->s.reset_color_interactive, stdout); fflush(stdout); - if (read_single_character(s) == EOF) + if (read_single_character(s) == EOF) { + quit = 1; break; + } if (!s->answer.len) continue; @@ -1601,7 +1603,7 @@ soft_increment: } else if (hunk->use == UNDECIDED_HUNK) { hunk->use = USE_HUNK; } - } else if (ch == 'd' || ch == 'q') { + } else if (ch == 'd') { if (file_diff->hunk_nr) { for (; hunk_index < file_diff->hunk_nr; hunk_index++) { hunk = file_diff->hunk + hunk_index; @@ -1613,10 +1615,9 @@ soft_increment: } else if (hunk->use == UNDECIDED_HUNK) { hunk->use = SKIP_HUNK; } - if (ch == 'q') { - quit = 1; - break; - } + } else if (ch == 'q') { + quit = 1; + break; } else if (s->answer.buf[0] == 'K') { if (permitted & ALLOW_GOTO_PREVIOUS_HUNK) hunk_index = dec_mod(hunk_index, @@ -1064,24 +1064,52 @@ static int path_matches(const char *pathname, int pathlen, pattern, prefix, pat->patternlen); } -static int macroexpand_one(struct all_attrs_item *all_attrs, int nr, int rem); +struct attr_state_queue { + const struct attr_state **items; + size_t alloc, nr; +}; + +static void attr_state_queue_push(struct attr_state_queue *t, + const struct match_attr *a) +{ + for (size_t i = 0; i < a->num_attr; i++) { + ALLOC_GROW(t->items, t->nr + 1, t->alloc); + t->items[t->nr++] = &a->state[i]; + } +} + +static const struct attr_state *attr_state_queue_pop(struct attr_state_queue *t) +{ + return t->nr ? t->items[--t->nr] : NULL; +} + +static void attr_state_queue_release(struct attr_state_queue *t) +{ + free(t->items); +} static int fill_one(struct all_attrs_item *all_attrs, const struct match_attr *a, int rem) { - size_t i; + struct attr_state_queue todo = { 0 }; + const struct attr_state *state; - for (i = a->num_attr; rem > 0 && i > 0; i--) { - const struct git_attr *attr = a->state[i - 1].attr; + attr_state_queue_push(&todo, a); + while (rem > 0 && (state = attr_state_queue_pop(&todo))) { + const struct git_attr *attr = state->attr; const char **n = &(all_attrs[attr->attr_nr].value); - const char *v = a->state[i - 1].setto; + const char *v = state->setto; if (*n == ATTR__UNKNOWN) { + const struct all_attrs_item *item = + &all_attrs[attr->attr_nr]; *n = v; rem--; - rem = macroexpand_one(all_attrs, attr->attr_nr, rem); + if (item->macro && item->value == ATTR__TRUE) + attr_state_queue_push(&todo, item->macro); } } + attr_state_queue_release(&todo); return rem; } @@ -1106,16 +1134,6 @@ static int fill(const char *path, int pathlen, int basename_offset, return rem; } -static int macroexpand_one(struct all_attrs_item *all_attrs, int nr, int rem) -{ - const struct all_attrs_item *item = &all_attrs[nr]; - - if (item->macro && item->value == ATTR__TRUE) - return fill_one(all_attrs, item->macro, rem); - else - return rem; -} - /* * Marks the attributes which are macros based on the attribute stack. * This prevents having to search through the attribute stack each time @@ -450,21 +450,20 @@ void find_bisection(struct commit_list **commit_list, int *reaches, clear_commit_weight(&commit_weight); } -static int register_ref(const char *refname, const char *referent UNUSED, const struct object_id *oid, - int flags UNUSED, void *cb_data UNUSED) +static int register_ref(const struct reference *ref, void *cb_data UNUSED) { struct strbuf good_prefix = STRBUF_INIT; strbuf_addstr(&good_prefix, term_good); strbuf_addstr(&good_prefix, "-"); - if (!strcmp(refname, term_bad)) { + if (!strcmp(ref->name, term_bad)) { free(current_bad_oid); current_bad_oid = xmalloc(sizeof(*current_bad_oid)); - oidcpy(current_bad_oid, oid); - } else if (starts_with(refname, good_prefix.buf)) { - oid_array_append(&good_revs, oid); - } else if (starts_with(refname, "skip-")) { - oid_array_append(&skipped_revs, oid); + oidcpy(current_bad_oid, ref->oid); + } else if (starts_with(ref->name, good_prefix.buf)) { + oid_array_append(&good_revs, ref->oid); + } else if (starts_with(ref->name, "skip-")) { + oid_array_append(&skipped_revs, ref->oid); } strbuf_release(&good_prefix); @@ -1178,14 +1177,11 @@ int estimate_bisect_steps(int all) return (e < 3 * x) ? n : n - 1; } -static int mark_for_removal(const char *refname, - const char *referent UNUSED, - const struct object_id *oid UNUSED, - int flag UNUSED, void *cb_data) +static int mark_for_removal(const struct reference *ref, void *cb_data) { struct string_list *refs = cb_data; - char *ref = xstrfmt("refs/bisect%s", refname); - string_list_append(refs, ref); + char *bisect_ref = xstrfmt("refs/bisect%s", ref->name); + string_list_append(refs, bisect_ref); return 0; } diff --git a/builtin/bisect.c b/builtin/bisect.c index 993caf545d..4cc118fb57 100644 --- a/builtin/bisect.c +++ b/builtin/bisect.c @@ -27,13 +27,14 @@ static GIT_PATH_FUNC(git_path_bisect_first_parent, "BISECT_FIRST_PARENT") static GIT_PATH_FUNC(git_path_bisect_run, "BISECT_RUN") #define BUILTIN_GIT_BISECT_START_USAGE \ - N_("git bisect start [--term-(new|bad)=<term> --term-(old|good)=<term>]" \ - " [--no-checkout] [--first-parent] [<bad> [<good>...]] [--]" \ - " [<pathspec>...]") -#define BUILTIN_GIT_BISECT_STATE_USAGE \ - N_("git bisect (good|bad) [<rev>...]") + N_("git bisect start [--term-(bad|new)=<term-new> --term-(good|old)=<term-old>]\n" \ + " [--no-checkout] [--first-parent] [<bad> [<good>...]] [--] [<pathspec>...]") +#define BUILTIN_GIT_BISECT_BAD_USAGE \ + N_("git bisect (bad|new|<term-new>) [<rev>]") +#define BUILTIN_GIT_BISECT_GOOD_USAGE \ + N_("git bisect (good|old|<term-old>) [<rev>...]") #define BUILTIN_GIT_BISECT_TERMS_USAGE \ - "git bisect terms [--term-good | --term-bad]" + "git bisect terms [--term-(good|old) | --term-(bad|new)]" #define BUILTIN_GIT_BISECT_SKIP_USAGE \ N_("git bisect skip [(<rev>|<range>)...]") #define BUILTIN_GIT_BISECT_NEXT_USAGE \ @@ -41,17 +42,20 @@ static GIT_PATH_FUNC(git_path_bisect_run, "BISECT_RUN") #define BUILTIN_GIT_BISECT_RESET_USAGE \ N_("git bisect reset [<commit>]") #define BUILTIN_GIT_BISECT_VISUALIZE_USAGE \ - "git bisect visualize" + "git bisect (visualize|view)" #define BUILTIN_GIT_BISECT_REPLAY_USAGE \ N_("git bisect replay <logfile>") #define BUILTIN_GIT_BISECT_LOG_USAGE \ "git bisect log" #define BUILTIN_GIT_BISECT_RUN_USAGE \ N_("git bisect run <cmd> [<arg>...]") +#define BUILTIN_GIT_BISECT_HELP_USAGE \ + "git bisect help" static const char * const git_bisect_usage[] = { BUILTIN_GIT_BISECT_START_USAGE, - BUILTIN_GIT_BISECT_STATE_USAGE, + BUILTIN_GIT_BISECT_BAD_USAGE, + BUILTIN_GIT_BISECT_GOOD_USAGE, BUILTIN_GIT_BISECT_TERMS_USAGE, BUILTIN_GIT_BISECT_SKIP_USAGE, BUILTIN_GIT_BISECT_NEXT_USAGE, @@ -60,6 +64,7 @@ static const char * const git_bisect_usage[] = { BUILTIN_GIT_BISECT_REPLAY_USAGE, BUILTIN_GIT_BISECT_LOG_USAGE, BUILTIN_GIT_BISECT_RUN_USAGE, + BUILTIN_GIT_BISECT_HELP_USAGE, NULL }; @@ -358,10 +363,7 @@ static int check_and_set_terms(struct bisect_terms *terms, const char *cmd) return 0; } -static int inc_nr(const char *refname UNUSED, - const char *referent UNUSED, - const struct object_id *oid UNUSED, - int flag UNUSED, void *cb_data) +static int inc_nr(const struct reference *ref UNUSED, void *cb_data) { unsigned int *nr = (unsigned int *)cb_data; (*nr)++; @@ -549,12 +551,11 @@ finish: return res; } -static int add_bisect_ref(const char *refname, const char *referent UNUSED, const struct object_id *oid, - int flags UNUSED, void *cb) +static int add_bisect_ref(const struct reference *ref, void *cb) { struct add_bisect_ref_data *data = cb; - add_pending_oid(data->revs, refname, oid, data->object_flags); + add_pending_oid(data->revs, ref->name, ref->oid, data->object_flags); return 0; } @@ -1165,12 +1166,9 @@ static int bisect_visualize(struct bisect_terms *terms, int argc, return run_command(&cmd); } -static int get_first_good(const char *refname UNUSED, - const char *referent UNUSED, - const struct object_id *oid, - int flag UNUSED, void *cb_data) +static int get_first_good(const struct reference *ref, void *cb_data) { - oidcpy(cb_data, oid); + oidcpy(cb_data, ref->oid); return 1; } diff --git a/builtin/checkout.c b/builtin/checkout.c index f9453473fe..66b69df6e6 100644 --- a/builtin/checkout.c +++ b/builtin/checkout.c @@ -1063,11 +1063,9 @@ static void update_refs_for_switch(const struct checkout_opts *opts, report_tracking(new_branch_info); } -static int add_pending_uninteresting_ref(const char *refname, const char *referent UNUSED, - const struct object_id *oid, - int flags UNUSED, void *cb_data) +static int add_pending_uninteresting_ref(const struct reference *ref, void *cb_data) { - add_pending_oid(cb_data, refname, oid, UNINTERESTING); + add_pending_oid(cb_data, ref->name, ref->oid, UNINTERESTING); return 0; } diff --git a/builtin/describe.c b/builtin/describe.c index ffaf8d9f0a..443546aaac 100644 --- a/builtin/describe.c +++ b/builtin/describe.c @@ -154,20 +154,19 @@ static void add_to_known_names(const char *path, } } -static int get_name(const char *path, const char *referent UNUSED, const struct object_id *oid, - int flag UNUSED, void *cb_data UNUSED) +static int get_name(const struct reference *ref, void *cb_data UNUSED) { int is_tag = 0; struct object_id peeled; int is_annotated, prio; const char *path_to_match = NULL; - if (skip_prefix(path, "refs/tags/", &path_to_match)) { + if (skip_prefix(ref->name, "refs/tags/", &path_to_match)) { is_tag = 1; } else if (all) { if ((exclude_patterns.nr || patterns.nr) && - !skip_prefix(path, "refs/heads/", &path_to_match) && - !skip_prefix(path, "refs/remotes/", &path_to_match)) { + !skip_prefix(ref->name, "refs/heads/", &path_to_match) && + !skip_prefix(ref->name, "refs/remotes/", &path_to_match)) { /* Only accept reference of known type if there are match/exclude patterns */ return 0; } @@ -209,10 +208,10 @@ static int get_name(const char *path, const char *referent UNUSED, const struct } /* Is it annotated? */ - if (!peel_iterated_oid(the_repository, oid, &peeled)) { - is_annotated = !oideq(oid, &peeled); + if (!reference_get_peeled_oid(the_repository, ref, &peeled)) { + is_annotated = !oideq(ref->oid, &peeled); } else { - oidcpy(&peeled, oid); + oidcpy(&peeled, ref->oid); is_annotated = 0; } @@ -229,7 +228,8 @@ static int get_name(const char *path, const char *referent UNUSED, const struct else prio = 0; - add_to_known_names(all ? path + 5 : path + 10, &peeled, prio, oid); + add_to_known_names(all ? ref->name + 5 : ref->name + 10, + &peeled, prio, ref->oid); return 0; } diff --git a/builtin/fast-export.c b/builtin/fast-export.c index 7adbc55f0d..0421360ab7 100644 --- a/builtin/fast-export.c +++ b/builtin/fast-export.c @@ -65,7 +65,7 @@ static int parse_opt_sign_mode(const struct option *opt, return 0; if (parse_sign_mode(arg, val)) - return error("Unknown %s mode: %s", opt->long_name, arg); + return error(_("unknown %s mode: %s"), opt->long_name, arg); return 0; } @@ -82,7 +82,7 @@ static int parse_opt_tag_of_filtered_mode(const struct option *opt, else if (!strcmp(arg, "rewrite")) *val = REWRITE; else - return error("Unknown tag-of-filtered mode: %s", arg); + return error(_("unknown tag-of-filtered mode: %s"), arg); return 0; } @@ -107,7 +107,7 @@ static int parse_opt_reencode_mode(const struct option *opt, if (!strcasecmp(arg, "abort")) *val = REENCODE_ABORT; else - return error("Unknown reencoding mode: %s", arg); + return error(_("unknown reencoding mode: %s"), arg); } return 0; @@ -318,16 +318,16 @@ static void export_blob(const struct object_id *oid) } else { buf = odb_read_object(the_repository->objects, oid, &type, &size); if (!buf) - die("could not read blob %s", oid_to_hex(oid)); + die(_("could not read blob %s"), oid_to_hex(oid)); if (check_object_signature(the_repository, oid, buf, size, type) < 0) - die("oid mismatch in blob %s", oid_to_hex(oid)); + die(_("oid mismatch in blob %s"), oid_to_hex(oid)); object = parse_object_buffer(the_repository, oid, type, size, buf, &eaten); } if (!object) - die("Could not read blob %s", oid_to_hex(oid)); + die(_("could not read blob %s"), oid_to_hex(oid)); mark_next_object(object); @@ -336,7 +336,7 @@ static void export_blob(const struct object_id *oid) printf("original-oid %s\n", oid_to_hex(oid)); printf("data %"PRIuMAX"\n", (uintmax_t)size); if (size && fwrite(buf, size, 1, stdout) != 1) - die_errno("could not write blob '%s'", oid_to_hex(oid)); + die_errno(_("could not write blob '%s'"), oid_to_hex(oid)); printf("\n"); show_progress(); @@ -499,10 +499,10 @@ static void show_filemodify(struct diff_queue_struct *q, break; default: - die("Unexpected comparison status '%c' for %s, %s", - q->queue[i]->status, - ospec->path ? ospec->path : "none", - spec->path ? spec->path : "none"); + die(_("unexpected comparison status '%c' for %s, %s"), + q->queue[i]->status, + ospec->path ? ospec->path : _("none"), + spec->path ? spec->path : _("none")); } } } @@ -699,14 +699,14 @@ static void handle_commit(struct commit *commit, struct rev_info *rev, author = strstr(commit_buffer_cursor, "\nauthor "); if (!author) - die("could not find author in commit %s", + die(_("could not find author in commit %s"), oid_to_hex(&commit->object.oid)); author++; commit_buffer_cursor = author_end = strchrnul(author, '\n'); committer = strstr(commit_buffer_cursor, "\ncommitter "); if (!committer) - die("could not find committer in commit %s", + die(_("could not find committer in commit %s"), oid_to_hex(&commit->object.oid)); committer++; commit_buffer_cursor = committer_end = strchrnul(committer, '\n'); @@ -781,8 +781,8 @@ static void handle_commit(struct commit *commit, struct rev_info *rev, case REENCODE_NO: break; case REENCODE_ABORT: - die("Encountered commit-specific encoding %.*s in commit " - "%s; use --reencode=[yes|no] to handle it", + die(_("encountered commit-specific encoding %.*s in commit " + "%s; use --reencode=[yes|no] to handle it"), (int)encoding_len, encoding, oid_to_hex(&commit->object.oid)); } @@ -798,11 +798,11 @@ static void handle_commit(struct commit *commit, struct rev_info *rev, if (signatures.nr) { switch (signed_commit_mode) { case SIGN_ABORT: - die("encountered signed commit %s; use " - "--signed-commits=<mode> to handle it", + die(_("encountered signed commit %s; use " + "--signed-commits=<mode> to handle it"), oid_to_hex(&commit->object.oid)); case SIGN_WARN_VERBATIM: - warning("exporting %"PRIuMAX" signature(s) for commit %s", + warning(_("exporting %"PRIuMAX" signature(s) for commit %s"), (uintmax_t)signatures.nr, oid_to_hex(&commit->object.oid)); /* fallthru */ case SIGN_VERBATIM: @@ -812,7 +812,7 @@ static void handle_commit(struct commit *commit, struct rev_info *rev, } break; case SIGN_WARN_STRIP: - warning("stripping signature(s) from commit %s", + warning(_("stripping signature(s) from commit %s"), oid_to_hex(&commit->object.oid)); /* fallthru */ case SIGN_STRIP: @@ -890,7 +890,8 @@ static void handle_tag(const char *name, struct tag *tag) tagged = ((struct tag *)tagged)->tagged; } if (tagged->type == OBJ_TREE) { - warning("Omitting tag %s,\nsince tags of trees (or tags of tags of trees, etc.) are not supported.", + warning(_("omitting tag %s,\nsince tags of trees (or tags " + "of tags of trees, etc.) are not supported."), oid_to_hex(&tag->object.oid)); return; } @@ -898,7 +899,7 @@ static void handle_tag(const char *name, struct tag *tag) buf = odb_read_object(the_repository->objects, &tag->object.oid, &type, &size); if (!buf) - die("could not read tag %s", oid_to_hex(&tag->object.oid)); + die(_("could not read tag %s"), oid_to_hex(&tag->object.oid)); message = memmem(buf, size, "\n\n", 2); if (message) { message += 2; @@ -935,17 +936,17 @@ static void handle_tag(const char *name, struct tag *tag) if (sig_offset < message_size) switch (signed_tag_mode) { case SIGN_ABORT: - die("encountered signed tag %s; use " - "--signed-tags=<mode> to handle it", + die(_("encountered signed tag %s; use " + "--signed-tags=<mode> to handle it"), oid_to_hex(&tag->object.oid)); case SIGN_WARN_VERBATIM: - warning("exporting signed tag %s", + warning(_("exporting signed tag %s"), oid_to_hex(&tag->object.oid)); /* fallthru */ case SIGN_VERBATIM: break; case SIGN_WARN_STRIP: - warning("stripping signature from tag %s", + warning(_("stripping signature from tag %s"), oid_to_hex(&tag->object.oid)); /* fallthru */ case SIGN_STRIP: @@ -960,8 +961,8 @@ static void handle_tag(const char *name, struct tag *tag) if (!tagged_mark) { switch (tag_of_filtered_mode) { case TAG_FILTERING_ABORT: - die("tag %s tags unexported object; use " - "--tag-of-filtered-object=<mode> to handle it", + die(_("tag %s tags unexported object; use " + "--tag-of-filtered-object=<mode> to handle it"), oid_to_hex(&tag->object.oid)); case DROP: /* Ignore this tag altogether */ @@ -969,7 +970,7 @@ static void handle_tag(const char *name, struct tag *tag) return; case REWRITE: if (tagged->type == OBJ_TAG && !mark_tags) { - die(_("Error: Cannot export nested tags unless --mark-tags is specified.")); + die(_("cannot export nested tags unless --mark-tags is specified.")); } else if (tagged->type == OBJ_COMMIT) { p = rewrite_commit((struct commit *)tagged); if (!p) { @@ -1025,7 +1026,7 @@ static struct commit *get_commit(struct rev_cmdline_entry *e, const char *full_n tag = (struct tag *)tag->tagged; } if (!tag) - die("Tag %s points nowhere?", e->name); + die(_("tag %s points nowhere?"), e->name); return (struct commit *)tag; } default: @@ -1063,7 +1064,7 @@ static void get_tags_and_duplicates(struct rev_cmdline_info *info) commit = get_commit(e, full_name); if (!commit) { - warning("%s: Unexpected object of type %s, skipping.", + warning(_("%s: unexpected object of type %s, skipping."), e->name, type_name(e->item->type)); free(full_name); @@ -1078,7 +1079,7 @@ static void get_tags_and_duplicates(struct rev_cmdline_info *info) free(full_name); continue; default: /* OBJ_TAG (nested tags) is already handled */ - warning("Tag points to object of unexpected type %s, skipping.", + warning(_("tag points to object of unexpected type %s, skipping."), type_name(commit->object.type)); free(full_name); continue; @@ -1174,7 +1175,7 @@ static void export_marks(char *file) f = fopen_for_writing(file); if (!f) - die_errno("Unable to open marks file %s for writing.", file); + die_errno(_("unable to open marks file %s for writing."), file); for (i = 0; i < idnums.size; i++) { if (deco->base && deco->base->type == 1) { @@ -1191,7 +1192,7 @@ static void export_marks(char *file) e |= ferror(f); e |= fclose(f); if (e) - error("Unable to write marks file %s.", file); + error(_("unable to write marks file %s."), file); } static void import_marks(char *input_file, int check_exists) @@ -1214,20 +1215,20 @@ static void import_marks(char *input_file, int check_exists) line_end = strchr(line, '\n'); if (line[0] != ':' || !line_end) - die("corrupt mark line: %s", line); + die(_("corrupt mark line: %s"), line); *line_end = '\0'; mark = strtoumax(line + 1, &mark_end, 10); if (!mark || mark_end == line + 1 || *mark_end != ' ' || get_oid_hex(mark_end + 1, &oid)) - die("corrupt mark line: %s", line); + die(_("corrupt mark line: %s"), line); if (last_idnum < mark) last_idnum = mark; type = odb_read_object_info(the_repository->objects, &oid, NULL); if (type < 0) - die("object not found: %s", oid_to_hex(&oid)); + die(_("object not found: %s"), oid_to_hex(&oid)); if (type != OBJ_COMMIT) /* only commits */ @@ -1235,12 +1236,12 @@ static void import_marks(char *input_file, int check_exists) commit = lookup_commit(the_repository, &oid); if (!commit) - die("not a commit? can't happen: %s", oid_to_hex(&oid)); + die(_("not a commit? can't happen: %s"), oid_to_hex(&oid)); object = &commit->object; if (object->flags & SHOWN) - error("Object %s already has a mark", oid_to_hex(&oid)); + error(_("object %s already has a mark"), oid_to_hex(&oid)); mark_object(object, mark); @@ -1394,7 +1395,7 @@ int cmd_fast_export(int argc, get_tags_and_duplicates(&revs.cmdline); if (prepare_revision_walk(&revs)) - die("revision walk setup failed"); + die(_("revision walk setup failed")); revs.reverse = 1; revs.diffopt.format_callback = show_filemodify; diff --git a/builtin/fast-import.c b/builtin/fast-import.c index 54d3e592c6..4cd0b079b6 100644 --- a/builtin/fast-import.c +++ b/builtin/fast-import.c @@ -339,12 +339,12 @@ static void write_crash_report(const char *err) struct recent_command *rc; if (!rpt) { - error_errno("can't write crash report %s", loc); + error_errno(_("can't write crash report %s"), loc); free(loc); return; } - fprintf(stderr, "fast-import: dumping crash report to %s\n", loc); + fprintf(stderr, _("fast-import: dumping crash report to %s\n"), loc); fprintf(rpt, "fast-import crash report:\n"); fprintf(rpt, " fast-import process: %"PRIuMAX"\n", (uintmax_t) getpid()); @@ -588,7 +588,7 @@ static void *find_mark(struct mark_set *s, uintmax_t idnum) oe = s->data.marked[idnum]; } if (!oe) - die("mark :%" PRIuMAX " not declared", orig_idnum); + die(_("mark :%" PRIuMAX " not declared"), orig_idnum); return oe; } @@ -628,9 +628,9 @@ static struct branch *new_branch(const char *name) struct branch *b = lookup_branch(name); if (b) - die("Invalid attempt to create duplicate branch: %s", name); + die(_("invalid attempt to create duplicate branch: %s"), name); if (check_refname_format(name, REFNAME_ALLOW_ONELEVEL)) - die("Branch name doesn't conform to GIT standards: %s", name); + die(_("branch name doesn't conform to Git standards: %s"), name); b = mem_pool_calloc(&fi_mem_pool, 1, sizeof(struct branch)); b->name = mem_pool_strdup(&fi_mem_pool, name); @@ -801,7 +801,7 @@ static const char *create_index(void) *c++ = &e->idx; last = idx + object_count; if (c != last) - die("internal consistency error creating the index"); + die(_("internal consistency error creating the index")); tmpfile = write_idx_file(the_repository, NULL, idx, object_count, &pack_idx_opts, pack_data->hash); @@ -819,18 +819,18 @@ static char *keep_pack(const char *curr_index_name) keep_fd = safe_create_file_with_leading_directories(pack_data->repo, name.buf); if (keep_fd < 0) - die_errno("cannot create keep file"); + die_errno(_("cannot create keep file")); write_or_die(keep_fd, keep_msg, strlen(keep_msg)); if (close(keep_fd)) - die_errno("failed to write keep file"); + die_errno(_("failed to write keep file")); odb_pack_name(pack_data->repo, &name, pack_data->hash, "pack"); if (finalize_object_file(pack_data->repo, pack_data->pack_name, name.buf)) - die("cannot store pack file"); + die(_("cannot store pack file")); odb_pack_name(pack_data->repo, &name, pack_data->hash, "idx"); if (finalize_object_file(pack_data->repo, curr_index_name, name.buf)) - die("cannot store index file"); + die(_("cannot store index file")); free((void *)curr_index_name); return strbuf_detach(&name, NULL); } @@ -853,7 +853,7 @@ static int loosen_small_pack(const struct packed_git *p) struct child_process unpack = CHILD_PROCESS_INIT; if (lseek(p->pack_fd, 0, SEEK_SET) < 0) - die_errno("Failed seeking to start of '%s'", p->pack_name); + die_errno(_("failed seeking to start of '%s'"), p->pack_name); unpack.in = p->pack_fd; unpack.git_cmd = 1; @@ -903,7 +903,7 @@ static void end_packfile(void) new_p = packfile_store_load_pack(pack_data->repo->objects->packfiles, idx_name, 1); if (!new_p) - die("core git rejected index %s", idx_name); + die(_("core Git rejected index %s"), idx_name); all_packs[pack_id] = new_p; free(idx_name); @@ -979,7 +979,7 @@ static int store_object( if (e->idx.offset) { duplicate_count_by_type[type]++; return 1; - } else if (find_oid_pack(&oid, packfile_store_get_packs(packs))) { + } else if (packfile_list_find_oid(packfile_store_get_packs(packs), &oid)) { e->type = type; e->pack_id = MAX_PACK_ID; e->idx.offset = 1; /* just not zero! */ @@ -1090,7 +1090,7 @@ static int store_object( static void truncate_pack(struct hashfile_checkpoint *checkpoint) { if (hashfile_truncate(pack_file, checkpoint)) - die_errno("cannot truncate pack to skip duplicate"); + die_errno(_("cannot truncate pack to skip duplicate")); pack_size = checkpoint->offset; } @@ -1138,7 +1138,7 @@ static void stream_blob(uintmax_t len, struct object_id *oidout, uintmax_t mark) size_t cnt = in_sz < len ? in_sz : (size_t)len; size_t n = fread(in_buf, 1, cnt, stdin); if (!n && feof(stdin)) - die("EOF in data (%" PRIuMAX " bytes remaining)", len); + die(_("EOF in data (%" PRIuMAX " bytes remaining)"), len); git_hash_update(&c, in_buf, n); s.next_in = in_buf; @@ -1162,7 +1162,7 @@ static void stream_blob(uintmax_t len, struct object_id *oidout, uintmax_t mark) case Z_STREAM_END: continue; default: - die("unexpected deflate failure: %d", status); + die(_("unexpected deflate failure: %d"), status); } } git_deflate_end(&s); @@ -1180,7 +1180,7 @@ static void stream_blob(uintmax_t len, struct object_id *oidout, uintmax_t mark) duplicate_count_by_type[OBJ_BLOB]++; truncate_pack(&checkpoint); - } else if (find_oid_pack(&oid, packfile_store_get_packs(packs))) { + } else if (packfile_list_find_oid(packfile_store_get_packs(packs), &oid)) { e->type = OBJ_BLOB; e->pack_id = MAX_PACK_ID; e->idx.offset = 1; /* just not zero! */ @@ -1264,16 +1264,16 @@ static void load_tree(struct tree_entry *root) myoe = find_object(oid); if (myoe && myoe->pack_id != MAX_PACK_ID) { if (myoe->type != OBJ_TREE) - die("Not a tree: %s", oid_to_hex(oid)); + die(_("not a tree: %s"), oid_to_hex(oid)); t->delta_depth = myoe->depth; buf = gfi_unpack_entry(myoe, &size); if (!buf) - die("Can't load tree %s", oid_to_hex(oid)); + die(_("can't load tree %s"), oid_to_hex(oid)); } else { enum object_type type; buf = odb_read_object(the_repository->objects, oid, &type, &size); if (!buf || type != OBJ_TREE) - die("Can't load tree %s", oid_to_hex(oid)); + die(_("can't load tree %s"), oid_to_hex(oid)); } c = buf; @@ -1287,7 +1287,7 @@ static void load_tree(struct tree_entry *root) e->tree = NULL; c = parse_mode(c, &e->versions[1].mode); if (!c) - die("Corrupt mode in %s", oid_to_hex(oid)); + die(_("corrupt mode in %s"), oid_to_hex(oid)); e->versions[0].mode = e->versions[1].mode; e->name = to_atom(c, strlen(c)); c += e->name->str_len + 1; @@ -1399,7 +1399,7 @@ static void tree_content_replace( struct tree_content *newtree) { if (!S_ISDIR(mode)) - die("Root cannot be a non-directory"); + die(_("root cannot be a non-directory")); oidclr(&root->versions[0].oid, the_repository->hash_algo); oidcpy(&root->versions[1].oid, oid); if (root->tree) @@ -1422,9 +1422,9 @@ static int tree_content_set( slash1 = strchrnul(p, '/'); n = slash1 - p; if (!n) - die("Empty path component found in input"); + die(_("empty path component found in input")); if (!*slash1 && !S_ISDIR(mode) && subtree) - die("Non-directories cannot have subtrees"); + die(_("non-directories cannot have subtrees")); if (!root->tree) load_tree(root); @@ -1576,7 +1576,7 @@ static int tree_content_get( slash1 = strchrnul(p, '/'); n = slash1 - p; if (!n && !allow_root) - die("Empty path component found in input"); + die(_("empty path component found in input")); if (!root->tree) load_tree(root); @@ -1622,8 +1622,8 @@ static int update_branch(struct branch *b) !strcmp(b->name + strlen(replace_prefix), oid_to_hex(&b->oid))) { if (!quiet) - warning("Dropping %s since it would point to " - "itself (i.e. to %s)", + warning(_("dropping %s since it would point to " + "itself (i.e. to %s)"), b->name, oid_to_hex(&b->oid)); refs_delete_ref(get_main_ref_store(the_repository), NULL, b->name, NULL, 0); @@ -1646,14 +1646,14 @@ static int update_branch(struct branch *b) new_cmit = lookup_commit_reference_gently(the_repository, &b->oid, 0); if (!old_cmit || !new_cmit) - return error("Branch %s is missing commits.", b->name); + return error(_("branch %s is missing commits."), b->name); ret = repo_in_merge_bases(the_repository, old_cmit, new_cmit); if (ret < 0) exit(128); if (!ret) { - warning("Not updating %s" - " (new tip %s does not contain %s)", + warning(_("not updating %s" + " (new tip %s does not contain %s)"), b->name, oid_to_hex(&b->oid), oid_to_hex(&old_oid)); return -1; @@ -1729,13 +1729,13 @@ static void dump_marks(void) return; if (safe_create_leading_directories_const(the_repository, export_marks_file)) { - failure |= error_errno("unable to create leading directories of %s", + failure |= error_errno(_("unable to create leading directories of %s"), export_marks_file); return; } if (hold_lock_file_for_update(&mark_lock, export_marks_file, 0) < 0) { - failure |= error_errno("Unable to write marks file %s", + failure |= error_errno(_("unable to write marks file %s"), export_marks_file); return; } @@ -1744,14 +1744,14 @@ static void dump_marks(void) if (!f) { int saved_errno = errno; rollback_lock_file(&mark_lock); - failure |= error("Unable to write marks file %s: %s", + failure |= error(_("unable to write marks file %s: %s"), export_marks_file, strerror(saved_errno)); return; } for_each_mark(marks, 0, dump_marks_fn, f); if (commit_lock_file(&mark_lock)) { - failure |= error_errno("Unable to write file %s", + failure |= error_errno(_("unable to write file %s"), export_marks_file); return; } @@ -1765,7 +1765,7 @@ static void insert_object_entry(struct mark_set **s, struct object_id *oid, uint enum object_type type = odb_read_object_info(the_repository->objects, oid, NULL); if (type < 0) - die("object not found: %s", oid_to_hex(oid)); + die(_("object not found: %s"), oid_to_hex(oid)); e = insert_object(oid); e->type = type; e->pack_id = MAX_PACK_ID; @@ -1792,13 +1792,13 @@ static void read_mark_file(struct mark_set **s, FILE *f, mark_set_inserter_t ins end = strchr(line, '\n'); if (line[0] != ':' || !end) - die("corrupt mark line: %s", line); + die(_("corrupt mark line: %s"), line); *end = 0; mark = strtoumax(line + 1, &end, 10); if (!mark || end == line + 1 || *end != ' ' || get_oid_hex_any(end + 1, &oid) == GIT_HASH_UNKNOWN) - die("corrupt mark line: %s", line); + die(_("corrupt mark line: %s"), line); inserter(s, &oid, mark); } } @@ -1811,7 +1811,7 @@ static void read_marks(void) else if (import_marks_file_ignore_missing && errno == ENOENT) goto done; /* Marks file does not exist */ else - die_errno("cannot read '%s'", import_marks_file); + die_errno(_("cannot read '%s'"), import_marks_file); read_mark_file(&marks, f, insert_object_entry); fclose(f); done: @@ -1897,7 +1897,7 @@ static int parse_data(struct strbuf *sb, uintmax_t limit, uintmax_t *len_res) strbuf_reset(sb); if (!skip_prefix(command_buf.buf, "data ", &data)) - die("Expected 'data n' command, found: %s", command_buf.buf); + die(_("expected 'data n' command, found: %s"), command_buf.buf); if (skip_prefix(data, "<<", &data)) { char *term = xstrdup(data); @@ -1905,7 +1905,7 @@ static int parse_data(struct strbuf *sb, uintmax_t limit, uintmax_t *len_res) for (;;) { if (strbuf_getline_lf(&command_buf, stdin) == EOF) - die("EOF in data (terminator '%s' not found)", term); + die(_("EOF in data (terminator '%s' not found)"), term); if (term_len == command_buf.len && !strcmp(term, command_buf.buf)) break; @@ -1923,12 +1923,12 @@ static int parse_data(struct strbuf *sb, uintmax_t limit, uintmax_t *len_res) return 0; } if (length < len) - die("data is too large to use in this context"); + die(_("data is too large to use in this context")); while (n < length) { size_t s = strbuf_fread(sb, length - n, stdin); if (!s && feof(stdin)) - die("EOF in data (%lu bytes remaining)", + die(_("EOF in data (%lu bytes remaining)"), (unsigned long)(length - n)); n += s; } @@ -1985,15 +1985,15 @@ static char *parse_ident(const char *buf) ltgt = buf + strcspn(buf, "<>"); if (*ltgt != '<') - die("Missing < in ident string: %s", buf); + die(_("missing < in ident string: %s"), buf); if (ltgt != buf && ltgt[-1] != ' ') - die("Missing space before < in ident string: %s", buf); + die(_("missing space before < in ident string: %s"), buf); ltgt = ltgt + 1 + strcspn(ltgt + 1, "<>"); if (*ltgt != '>') - die("Missing > in ident string: %s", buf); + die(_("missing > in ident string: %s"), buf); ltgt++; if (*ltgt != ' ') - die("Missing space after > in ident string: %s", buf); + die(_("missing space after > in ident string: %s"), buf); ltgt++; name_len = ltgt - buf; strbuf_add(&ident, buf, name_len); @@ -2001,19 +2001,19 @@ static char *parse_ident(const char *buf) switch (whenspec) { case WHENSPEC_RAW: if (validate_raw_date(ltgt, &ident, 1) < 0) - die("Invalid raw date \"%s\" in ident: %s", ltgt, buf); + die(_("invalid raw date \"%s\" in ident: %s"), ltgt, buf); break; case WHENSPEC_RAW_PERMISSIVE: if (validate_raw_date(ltgt, &ident, 0) < 0) - die("Invalid raw date \"%s\" in ident: %s", ltgt, buf); + die(_("invalid raw date \"%s\" in ident: %s"), ltgt, buf); break; case WHENSPEC_RFC2822: if (parse_date(ltgt, &ident) < 0) - die("Invalid rfc2822 date \"%s\" in ident: %s", ltgt, buf); + die(_("invalid rfc2822 date \"%s\" in ident: %s"), ltgt, buf); break; case WHENSPEC_NOW: if (strcmp("now", ltgt)) - die("Date in ident must be 'now': %s", buf); + die(_("date in ident must be 'now': %s"), buf); datestamp(&ident); break; } @@ -2107,7 +2107,7 @@ static void construct_path_with_fanout(const char *hex_sha1, { unsigned int i = 0, j = 0; if (fanout >= the_hash_algo->rawsz) - die("Too large fanout (%u)", fanout); + die(_("too large fanout (%u)"), fanout); while (fanout) { path[i++] = hex_sha1[j++]; path[i++] = hex_sha1[j++]; @@ -2181,7 +2181,7 @@ static uintmax_t do_change_note_fanout( /* Rename fullpath to realpath */ if (!tree_content_remove(orig_root, fullpath, &leaf, 0)) - die("Failed to remove path %s", fullpath); + die(_("failed to remove path %s"), fullpath); tree_content_set(orig_root, realpath, &leaf.versions[1].oid, leaf.versions[1].mode, @@ -2254,7 +2254,7 @@ static uintmax_t parse_mark_ref(const char *p, char **endptr) p++; mark = strtoumax(p, endptr, 10); if (*endptr == p) - die("No value after ':' in mark: %s", command_buf.buf); + die(_("no value after ':' in mark: %s"), command_buf.buf); return mark; } @@ -2269,7 +2269,7 @@ static uintmax_t parse_mark_ref_eol(const char *p) mark = parse_mark_ref(p, &end); if (*end != '\0') - die("Garbage after mark: %s", command_buf.buf); + die(_("garbage after mark: %s"), command_buf.buf); return mark; } @@ -2284,7 +2284,7 @@ static uintmax_t parse_mark_ref_space(const char **p) mark = parse_mark_ref(*p, &end); if (*end++ != ' ') - die("Missing space after mark: %s", command_buf.buf); + die(_("missing space after mark: %s"), command_buf.buf); *p = end; return mark; } @@ -2300,9 +2300,9 @@ static void parse_path(struct strbuf *sb, const char *p, const char **endp, { if (*p == '"') { if (unquote_c_style(sb, p, endp)) - die("Invalid %s: %s", field, command_buf.buf); + die(_("invalid %s: %s"), field, command_buf.buf); if (strlen(sb->buf) != sb->len) - die("NUL in %s: %s", field, command_buf.buf); + die(_("NUL in %s: %s"), field, command_buf.buf); } else { /* * Unless we are parsing the last field of a line, @@ -2325,7 +2325,7 @@ static void parse_path_eol(struct strbuf *sb, const char *p, const char *field) parse_path(sb, p, &end, 1, field); if (*end) - die("Garbage after %s: %s", field, command_buf.buf); + die(_("garbage after %s: %s"), field, command_buf.buf); } /* @@ -2338,7 +2338,7 @@ static void parse_path_space(struct strbuf *sb, const char *p, { parse_path(sb, p, endp, 0, field); if (**endp != ' ') - die("Missing space after %s: %s", field, command_buf.buf); + die(_("missing space after %s: %s"), field, command_buf.buf); (*endp)++; } @@ -2351,7 +2351,7 @@ static void file_change_m(const char *p, struct branch *b) p = parse_mode(p, &mode); if (!p) - die("Corrupt mode: %s", command_buf.buf); + die(_("corrupt mode: %s"), command_buf.buf); switch (mode) { case 0644: case 0755: @@ -2364,7 +2364,7 @@ static void file_change_m(const char *p, struct branch *b) /* ok */ break; default: - die("Corrupt mode: %s", command_buf.buf); + die(_("corrupt mode: %s"), command_buf.buf); } if (*p == ':') { @@ -2375,10 +2375,10 @@ static void file_change_m(const char *p, struct branch *b) oe = NULL; /* not used with inline_data, but makes gcc happy */ } else { if (parse_mapped_oid_hex(p, &oid, &p)) - die("Invalid dataref: %s", command_buf.buf); + die(_("invalid dataref: %s"), command_buf.buf); oe = find_object(&oid); if (*p++ != ' ') - die("Missing space after SHA1: %s", command_buf.buf); + die(_("missing space after SHA1: %s"), command_buf.buf); } strbuf_reset(&path); @@ -2394,11 +2394,11 @@ static void file_change_m(const char *p, struct branch *b) if (S_ISGITLINK(mode)) { if (inline_data) - die("Git links cannot be specified 'inline': %s", + die(_("Git links cannot be specified 'inline': %s"), command_buf.buf); else if (oe) { if (oe->type != OBJ_COMMIT) - die("Not a commit (actually a %s): %s", + die(_("not a commit (actually a %s): %s"), type_name(oe->type), command_buf.buf); } /* @@ -2407,7 +2407,7 @@ static void file_change_m(const char *p, struct branch *b) */ } else if (inline_data) { if (S_ISDIR(mode)) - die("Directories cannot be specified 'inline': %s", + die(_("directories cannot be specified 'inline': %s"), command_buf.buf); while (read_next_command() != EOF) { const char *v; @@ -2425,11 +2425,11 @@ static void file_change_m(const char *p, struct branch *b) odb_read_object_info(the_repository->objects, &oid, NULL); if (type < 0) - die("%s not found: %s", - S_ISDIR(mode) ? "Tree" : "Blob", - command_buf.buf); + die(_("%s not found: %s"), + S_ISDIR(mode) ? _("tree") : _("blob"), + command_buf.buf); if (type != expected) - die("Not a %s (actually a %s): %s", + die(_("not a %s (actually a %s): %s"), type_name(expected), type_name(type), command_buf.buf); } @@ -2440,7 +2440,7 @@ static void file_change_m(const char *p, struct branch *b) } if (!verify_path(path.buf, mode)) - die("invalid path '%s'", path.buf); + die(_("invalid path '%s'"), path.buf); tree_content_set(&b->branch_tree, path.buf, &oid, mode, NULL); } @@ -2470,7 +2470,7 @@ static void file_change_cr(const char *p, struct branch *b, int rename) else tree_content_get(&b->branch_tree, source.buf, &leaf, 1); if (!leaf.versions[1].mode) - die("Path %s not in branch", source.buf); + die(_("path %s not in branch"), source.buf); if (!*dest.buf) { /* C "path/to/subdir" "" */ tree_content_replace(&b->branch_tree, &leaf.versions[1].oid, @@ -2479,7 +2479,7 @@ static void file_change_cr(const char *p, struct branch *b, int rename) return; } if (!verify_path(dest.buf, leaf.versions[1].mode)) - die("invalid path '%s'", dest.buf); + die(_("invalid path '%s'"), dest.buf); tree_content_set(&b->branch_tree, dest.buf, &leaf.versions[1].oid, leaf.versions[1].mode, @@ -2521,23 +2521,23 @@ static void note_change_n(const char *p, struct branch *b, unsigned char *old_fa oe = NULL; /* not used with inline_data, but makes gcc happy */ } else { if (parse_mapped_oid_hex(p, &oid, &p)) - die("Invalid dataref: %s", command_buf.buf); + die(_("invalid dataref: %s"), command_buf.buf); oe = find_object(&oid); if (*p++ != ' ') - die("Missing space after SHA1: %s", command_buf.buf); + die(_("missing space after SHA1: %s"), command_buf.buf); } /* <commit-ish> */ s = lookup_branch(p); if (s) { if (is_null_oid(&s->oid)) - die("Can't add a note on empty branch."); + die(_("can't add a note on empty branch.")); oidcpy(&commit_oid, &s->oid); } else if (*p == ':') { uintmax_t commit_mark = parse_mark_ref_eol(p); struct object_entry *commit_oe = find_mark(marks, commit_mark); if (commit_oe->type != OBJ_COMMIT) - die("Mark :%" PRIuMAX " not a commit", commit_mark); + die(_("mark :%" PRIuMAX " not a commit"), commit_mark); oidcpy(&commit_oid, &commit_oe->idx.oid); } else if (!repo_get_oid(the_repository, p, &commit_oid)) { unsigned long size; @@ -2545,25 +2545,25 @@ static void note_change_n(const char *p, struct branch *b, unsigned char *old_fa &commit_oid, OBJ_COMMIT, &size, &commit_oid); if (!buf || size < the_hash_algo->hexsz + 6) - die("Not a valid commit: %s", p); + die(_("not a valid commit: %s"), p); free(buf); } else - die("Invalid ref name or SHA1 expression: %s", p); + die(_("invalid ref name or SHA1 expression: %s"), p); if (inline_data) { read_next_command(); parse_and_store_blob(&last_blob, &oid, 0); } else if (oe) { if (oe->type != OBJ_BLOB) - die("Not a blob (actually a %s): %s", + die(_("not a blob (actually a %s): %s"), type_name(oe->type), command_buf.buf); } else if (!is_null_oid(&oid)) { enum object_type type = odb_read_object_info(the_repository->objects, &oid, NULL); if (type < 0) - die("Blob not found: %s", command_buf.buf); + die(_("blob not found: %s"), command_buf.buf); if (type != OBJ_BLOB) - die("Not a blob (actually a %s): %s", + die(_("not a blob (actually a %s): %s"), type_name(type), command_buf.buf); } @@ -2592,10 +2592,10 @@ static void file_change_deleteall(struct branch *b) static void parse_from_commit(struct branch *b, char *buf, unsigned long size) { if (!buf || size < the_hash_algo->hexsz + 6) - die("Not a valid commit: %s", oid_to_hex(&b->oid)); + die(_("not a valid commit: %s"), oid_to_hex(&b->oid)); if (memcmp("tree ", buf, 5) || get_oid_hex(buf + 5, &b->branch_tree.versions[1].oid)) - die("The commit %s is corrupt", oid_to_hex(&b->oid)); + die(_("the commit %s is corrupt"), oid_to_hex(&b->oid)); oidcpy(&b->branch_tree.versions[0].oid, &b->branch_tree.versions[1].oid); } @@ -2625,7 +2625,7 @@ static int parse_objectish(struct branch *b, const char *objectish) s = lookup_branch(objectish); if (b == s) - die("Can't create a branch from itself: %s", b->name); + die(_("can't create a branch from itself: %s"), b->name); else if (s) { struct object_id *t = &s->branch_tree.versions[1].oid; oidcpy(&b->oid, &s->oid); @@ -2635,7 +2635,7 @@ static int parse_objectish(struct branch *b, const char *objectish) uintmax_t idnum = parse_mark_ref_eol(objectish); struct object_entry *oe = find_mark(marks, idnum); if (oe->type != OBJ_COMMIT) - die("Mark :%" PRIuMAX " not a commit", idnum); + die(_("mark :%" PRIuMAX " not a commit"), idnum); if (!oideq(&b->oid, &oe->idx.oid)) { oidcpy(&b->oid, &oe->idx.oid); if (oe->pack_id != MAX_PACK_ID) { @@ -2652,7 +2652,7 @@ static int parse_objectish(struct branch *b, const char *objectish) b->delete = 1; } else - die("Invalid ref name or SHA1 expression: %s", objectish); + die(_("invalid ref name or SHA1 expression: %s"), objectish); if (b->branch_tree.tree && !oideq(&oid, &b->branch_tree.versions[1].oid)) { release_tree_content_recursive(b->branch_tree.tree); @@ -2699,7 +2699,7 @@ static struct hash_list *parse_merge(unsigned int *count) uintmax_t idnum = parse_mark_ref_eol(from); struct object_entry *oe = find_mark(marks, idnum); if (oe->type != OBJ_COMMIT) - die("Mark :%" PRIuMAX " not a commit", idnum); + die(_("mark :%" PRIuMAX " not a commit"), idnum); oidcpy(&n->oid, &oe->idx.oid); } else if (!repo_get_oid(the_repository, from, &n->oid)) { unsigned long size; @@ -2707,10 +2707,10 @@ static struct hash_list *parse_merge(unsigned int *count) &n->oid, OBJ_COMMIT, &size, &n->oid); if (!buf || size < the_hash_algo->hexsz + 6) - die("Not a valid commit: %s", from); + die(_("not a valid commit: %s"), from); free(buf); } else - die("Invalid ref name or SHA1 expression: %s", from); + die(_("invalid ref name or SHA1 expression: %s"), from); n->next = NULL; *tail = n; @@ -2734,8 +2734,8 @@ static void parse_one_signature(struct signature_data *sig, const char *v) char *space = strchr(args, ' '); if (!space) - die("Expected gpgsig format: 'gpgsig <hash-algo> <signature-format>', " - "got 'gpgsig %s'", args); + die(_("expected gpgsig format: 'gpgsig <hash-algo> <signature-format>', " + "got 'gpgsig %s'"), args); *space = '\0'; sig->hash_algo = args; @@ -2744,13 +2744,13 @@ static void parse_one_signature(struct signature_data *sig, const char *v) /* Validate hash algorithm */ if (strcmp(sig->hash_algo, "sha1") && strcmp(sig->hash_algo, "sha256")) - die("Unknown git hash algorithm in gpgsig: '%s'", sig->hash_algo); + die(_("unknown git hash algorithm in gpgsig: '%s'"), sig->hash_algo); /* Validate signature format */ if (!valid_signature_format(sig->sig_format)) - die("Invalid signature format in gpgsig: '%s'", sig->sig_format); + die(_("invalid signature format in gpgsig: '%s'"), sig->sig_format); if (!strcmp(sig->sig_format, "unknown")) - warning("'unknown' signature format in gpgsig"); + warning(_("'unknown' signature format in gpgsig")); /* Read signature data */ read_next_command(); @@ -2789,8 +2789,8 @@ static void store_signature(struct signature_data *stored_sig, const char *hash_type) { if (stored_sig->hash_algo) { - warning("multiple %s signatures found, " - "ignoring additional signature", + warning(_("multiple %s signatures found, " + "ignoring additional signature"), hash_type); strbuf_release(&new_sig->data); free(new_sig->hash_algo); @@ -2845,15 +2845,15 @@ static void parse_new_commit(const char *arg) read_next_command(); } if (!committer) - die("Expected committer but didn't get one"); + die(_("expected committer but didn't get one")); while (skip_prefix(command_buf.buf, "gpgsig ", &v)) { switch (signed_commit_mode) { /* First, modes that don't need the signature to be parsed */ case SIGN_ABORT: - die("encountered signed commit; use " - "--signed-commits=<mode> to handle it"); + die(_("encountered signed commit; use " + "--signed-commits=<mode> to handle it")); case SIGN_WARN_STRIP: warning(_("stripping a commit signature")); /* fallthru */ @@ -3025,11 +3025,11 @@ static void parse_new_tag(const char *arg) /* from ... */ if (!skip_prefix(command_buf.buf, "from ", &from)) - die("Expected from command, got %s", command_buf.buf); + die(_("expected 'from' command, got '%s'"), command_buf.buf); s = lookup_branch(from); if (s) { if (is_null_oid(&s->oid)) - die("Can't tag an empty branch."); + die(_("can't tag an empty branch.")); oidcpy(&oid, &s->oid); type = OBJ_COMMIT; } else if (*from == ':') { @@ -3044,11 +3044,11 @@ static void parse_new_tag(const char *arg) type = odb_read_object_info(the_repository->objects, &oid, NULL); if (type < 0) - die("Not a valid object: %s", from); + die(_("not a valid object: %s"), from); } else type = oe->type; } else - die("Invalid ref name or SHA1 expression: %s", from); + die(_("invalid ref name or SHA1 expression: %s"), from); read_next_command(); /* original-oid ... */ @@ -3139,7 +3139,7 @@ static void parse_reset_branch(const char *arg) static void cat_blob_write(const char *buf, unsigned long size) { if (write_in_full(cat_blob_fd, buf, size) < 0) - die_errno("Write to frontend failed"); + die_errno(_("write to frontend failed")); } static void cat_blob(struct object_entry *oe, struct object_id *oid) @@ -3168,9 +3168,9 @@ static void cat_blob(struct object_entry *oe, struct object_id *oid) return; } if (!buf) - die("Can't read object %s", oid_to_hex(oid)); + die(_("can't read object %s"), oid_to_hex(oid)); if (type != OBJ_BLOB) - die("Object %s is a %s but a blob was expected.", + die(_("object %s is a %s but a blob was expected."), oid_to_hex(oid), type_name(type)); strbuf_reset(&line); strbuf_addf(&line, "%s %s %"PRIuMAX"\n", oid_to_hex(oid), @@ -3194,11 +3194,11 @@ static void parse_get_mark(const char *p) /* get-mark SP <object> LF */ if (*p != ':') - die("Not a mark: %s", p); + die(_("not a mark: %s"), p); oe = find_mark(marks, parse_mark_ref_eol(p)); if (!oe) - die("Unknown mark: %s", command_buf.buf); + die(_("unknown mark: %s"), command_buf.buf); xsnprintf(output, sizeof(output), "%s\n", oid_to_hex(&oe->idx.oid)); cat_blob_write(output, the_hash_algo->hexsz + 1); @@ -3213,13 +3213,13 @@ static void parse_cat_blob(const char *p) if (*p == ':') { oe = find_mark(marks, parse_mark_ref_eol(p)); if (!oe) - die("Unknown mark: %s", command_buf.buf); + die(_("unknown mark: %s"), command_buf.buf); oidcpy(&oid, &oe->idx.oid); } else { if (parse_mapped_oid_hex(p, &oid, &p)) - die("Invalid dataref: %s", command_buf.buf); + die(_("invalid dataref: %s"), command_buf.buf); if (*p) - die("Garbage after SHA1: %s", command_buf.buf); + die(_("garbage after SHA1: %s"), command_buf.buf); oe = find_object(&oid); } @@ -3237,7 +3237,7 @@ static struct object_entry *dereference(struct object_entry *oe, enum object_type type = odb_read_object_info(the_repository->objects, oid, NULL); if (type < 0) - die("object not found: %s", oid_to_hex(oid)); + die(_("object not found: %s"), oid_to_hex(oid)); /* cache it! */ oe = insert_object(oid); oe->type = type; @@ -3251,7 +3251,7 @@ static struct object_entry *dereference(struct object_entry *oe, case OBJ_TAG: break; default: - die("Not a tree-ish: %s", command_buf.buf); + die(_("not a tree-ish: %s"), command_buf.buf); } if (oe->pack_id != MAX_PACK_ID) { /* in a pack being written */ @@ -3262,19 +3262,19 @@ static struct object_entry *dereference(struct object_entry *oe, &unused, &size); } if (!buf) - die("Can't load object %s", oid_to_hex(oid)); + die(_("can't load object %s"), oid_to_hex(oid)); /* Peel one layer. */ switch (oe->type) { case OBJ_TAG: if (size < hexsz + strlen("object ") || get_oid_hex(buf + strlen("object "), oid)) - die("Invalid SHA1 in tag: %s", command_buf.buf); + die(_("invalid SHA1 in tag: %s"), command_buf.buf); break; case OBJ_COMMIT: if (size < hexsz + strlen("tree ") || get_oid_hex(buf + strlen("tree "), oid)) - die("Invalid SHA1 in commit: %s", command_buf.buf); + die(_("invalid SHA1 in commit: %s"), command_buf.buf); } free(buf); @@ -3309,9 +3309,9 @@ static void build_mark_map(struct string_list *from, struct string_list *to) for_each_string_list_item(fromp, from) { top = string_list_lookup(to, fromp->string); if (!fromp->util) { - die(_("Missing from marks for submodule '%s'"), fromp->string); + die(_("missing from marks for submodule '%s'"), fromp->string); } else if (!top || !top->util) { - die(_("Missing to marks for submodule '%s'"), fromp->string); + die(_("missing to marks for submodule '%s'"), fromp->string); } build_mark_map_one(fromp->util, top->util); } @@ -3325,14 +3325,14 @@ static struct object_entry *parse_treeish_dataref(const char **p) if (**p == ':') { /* <mark> */ e = find_mark(marks, parse_mark_ref_space(p)); if (!e) - die("Unknown mark: %s", command_buf.buf); + die(_("unknown mark: %s"), command_buf.buf); oidcpy(&oid, &e->idx.oid); } else { /* <sha1> */ if (parse_mapped_oid_hex(*p, &oid, p)) - die("Invalid dataref: %s", command_buf.buf); + die(_("invalid dataref: %s"), command_buf.buf); e = find_object(&oid); if (*(*p)++ != ' ') - die("Missing space after tree-ish: %s", command_buf.buf); + die(_("missing space after tree-ish: %s"), command_buf.buf); } while (!e || e->type != OBJ_TREE) @@ -3376,7 +3376,7 @@ static void parse_ls(const char *p, struct branch *b) /* ls SP (<tree-ish> SP)? <path> */ if (*p == '"') { if (!b) - die("Not in a commit: %s", command_buf.buf); + die(_("not in a commit: %s"), command_buf.buf); root = &b->branch_tree; } else { struct object_entry *e = parse_treeish_dataref(&p); @@ -3439,12 +3439,12 @@ static void parse_alias(void) /* mark ... */ parse_mark(); if (!next_mark) - die(_("Expected 'mark' command, got %s"), command_buf.buf); + die(_("expected 'mark' command, got %s"), command_buf.buf); /* to ... */ memset(&b, 0, sizeof(b)); if (!parse_objectish_with_prefix(&b, "to ")) - die(_("Expected 'to' command, got %s"), command_buf.buf); + die(_("expected 'to' command, got %s"), command_buf.buf); e = find_object(&b.oid); assert(e); insert_mark(&marks, next_mark, e); @@ -3462,7 +3462,7 @@ static void option_import_marks(const char *marks, { if (import_marks_file) { if (from_stream) - die("Only one import-marks command allowed per stream"); + die(_("only one import-marks command allowed per stream")); /* read previous mark file */ if(!import_marks_file_from_stream) @@ -3486,7 +3486,7 @@ static void option_date_format(const char *fmt) else if (!strcmp(fmt, "now")) whenspec = WHENSPEC_NOW; else - die("unknown --date-format argument %s", fmt); + die(_("unknown --date-format argument %s"), fmt); } static unsigned long ulong_arg(const char *option, const char *arg) @@ -3494,7 +3494,7 @@ static unsigned long ulong_arg(const char *option, const char *arg) char *endptr; unsigned long rv = strtoul(arg, &endptr, 0); if (strchr(arg, '-') || endptr == arg || *endptr) - die("%s: argument must be a non-negative integer", option); + die(_("%s: argument must be a non-negative integer"), option); return rv; } @@ -3502,7 +3502,7 @@ static void option_depth(const char *depth) { max_depth = ulong_arg("--depth", depth); if (max_depth > MAX_DEPTH) - die("--depth cannot exceed %u", MAX_DEPTH); + die(_("--depth cannot exceed %u"), MAX_DEPTH); } static void option_active_branches(const char *branches) @@ -3520,7 +3520,7 @@ static void option_cat_blob_fd(const char *fd) { unsigned long n = ulong_arg("--cat-blob-fd", fd); if (n > (unsigned long) INT_MAX) - die("--cat-blob-fd cannot exceed %d", INT_MAX); + die(_("--cat-blob-fd cannot exceed %d"), INT_MAX); cat_blob_fd = (int) n; } @@ -3540,7 +3540,7 @@ static void option_rewrite_submodules(const char *arg, struct string_list *list) char *s = xstrdup(arg); char *f = strchr(s, ':'); if (!f) - die(_("Expected format name:filename for submodule rewrite option")); + die(_("expected format name:filename for submodule rewrite option")); *f = '\0'; f++; CALLOC_ARRAY(ms, 1); @@ -3548,7 +3548,7 @@ static void option_rewrite_submodules(const char *arg, struct string_list *list) f = prefix_filename(global_prefix, f); fp = fopen(f, "r"); if (!fp) - die_errno("cannot read '%s'", f); + die_errno(_("cannot read '%s'"), f); read_mark_file(&ms, fp, insert_oid_entry); fclose(fp); free(f); @@ -3565,10 +3565,10 @@ static int parse_one_option(const char *option) if (!git_parse_ulong(option, &v)) return 0; if (v < 8192) { - warning("max-pack-size is now in bytes, assuming --max-pack-size=%lum", v); + warning(_("max-pack-size is now in bytes, assuming --max-pack-size=%lum"), v); v *= 1024 * 1024; } else if (v < 1024 * 1024) { - warning("minimum max-pack-size is 1 MiB"); + warning(_("minimum max-pack-size is 1 MiB")); v = 1024 * 1024; } max_packsize = v; @@ -3655,23 +3655,23 @@ static int parse_one_feature(const char *feature, int from_stream) static void parse_feature(const char *feature) { if (seen_data_command) - die("Got feature command '%s' after data command", feature); + die(_("got feature command '%s' after data command"), feature); if (parse_one_feature(feature, 1)) return; - die("This version of fast-import does not support feature %s.", feature); + die(_("this version of fast-import does not support feature %s."), feature); } static void parse_option(const char *option) { if (seen_data_command) - die("Got option command '%s' after data command", option); + die(_("got option command '%s' after data command"), option); if (parse_one_option(option)) return; - die("This version of fast-import does not support option: %s", option); + die(_("this version of fast-import does not support option: %s"), option); } static void git_pack_config(void) @@ -3715,7 +3715,7 @@ static void parse_argv(void) break; if (!skip_prefix(a, "--", &a)) - die("unknown option %s", a); + die(_("unknown option %s"), a); if (parse_one_option(a)) continue; @@ -3728,7 +3728,7 @@ static void parse_argv(void) continue; } - die("unknown option --%s", a); + die(_("unknown option --%s"), a); } if (i != global_argc) usage(fast_import_usage); @@ -3817,7 +3817,7 @@ int cmd_fast_import(int argc, else if (starts_with(command_buf.buf, "option ")) /* ignore non-git options*/; else - die("Unsupported command: %s", command_buf.buf); + die(_("unsupported command: %s"), command_buf.buf); if (checkpoint_requested) checkpoint(); @@ -3828,7 +3828,7 @@ int cmd_fast_import(int argc, parse_argv(); if (require_explicit_termination && feof(stdin)) - die("stream ends early"); + die(_("stream ends early")); end_packfile(); diff --git a/builtin/fetch.c b/builtin/fetch.c index c7ff3480fb..7052e6ff21 100644 --- a/builtin/fetch.c +++ b/builtin/fetch.c @@ -289,13 +289,11 @@ static struct refname_hash_entry *refname_hash_add(struct hashmap *map, return ent; } -static int add_one_refname(const char *refname, const char *referent UNUSED, - const struct object_id *oid, - int flag UNUSED, void *cbdata) +static int add_one_refname(const struct reference *ref, void *cbdata) { struct hashmap *refname_map = cbdata; - (void) refname_hash_add(refname_map, refname, oid); + (void) refname_hash_add(refname_map, ref->name, ref->oid); return 0; } @@ -1416,14 +1414,11 @@ static void set_option(struct transport *transport, const char *name, const char } -static int add_oid(const char *refname UNUSED, - const char *referent UNUSED, - const struct object_id *oid, - int flags UNUSED, void *cb_data) +static int add_oid(const struct reference *ref, void *cb_data) { struct oid_array *oids = cb_data; - oid_array_append(oids, oid); + oid_array_append(oids, ref->oid); return 0; } diff --git a/builtin/fsck.c b/builtin/fsck.c index b1a650c673..c489582faa 100644 --- a/builtin/fsck.c +++ b/builtin/fsck.c @@ -530,14 +530,13 @@ static int fsck_handle_reflog(const char *logname, void *cb_data) return 0; } -static int fsck_handle_ref(const char *refname, const char *referent UNUSED, const struct object_id *oid, - int flag UNUSED, void *cb_data UNUSED) +static int fsck_handle_ref(const struct reference *ref, void *cb_data UNUSED) { struct object *obj; - obj = parse_object(the_repository, oid); + obj = parse_object(the_repository, ref->oid); if (!obj) { - if (is_promisor_object(the_repository, oid)) { + if (is_promisor_object(the_repository, ref->oid)) { /* * Increment default_refs anyway, because this is a * valid ref. @@ -546,19 +545,19 @@ static int fsck_handle_ref(const char *refname, const char *referent UNUSED, con return 0; } error(_("%s: invalid sha1 pointer %s"), - refname, oid_to_hex(oid)); + ref->name, oid_to_hex(ref->oid)); errors_found |= ERROR_REACHABLE; /* We'll continue with the rest despite the error.. */ return 0; } - if (obj->type != OBJ_COMMIT && is_branch(refname)) { - error(_("%s: not a commit"), refname); + if (obj->type != OBJ_COMMIT && is_branch(ref->name)) { + error(_("%s: not a commit"), ref->name); errors_found |= ERROR_REFS; } default_refs++; obj->flags |= USED; fsck_put_object_name(&fsck_walk_options, - oid, "%s", refname); + ref->oid, "%s", ref->name); mark_object_reachable(obj); return 0; @@ -580,13 +579,19 @@ static void get_default_heads(void) worktrees = get_worktrees(); for (p = worktrees; *p; p++) { struct worktree *wt = *p; - struct strbuf ref = STRBUF_INIT; + struct strbuf refname = STRBUF_INIT; - strbuf_worktree_ref(wt, &ref, "HEAD"); - fsck_head_link(ref.buf, &head_points_at, &head_oid); - if (head_points_at && !is_null_oid(&head_oid)) - fsck_handle_ref(ref.buf, NULL, &head_oid, 0, NULL); - strbuf_release(&ref); + strbuf_worktree_ref(wt, &refname, "HEAD"); + fsck_head_link(refname.buf, &head_points_at, &head_oid); + if (head_points_at && !is_null_oid(&head_oid)) { + struct reference ref = { + .name = refname.buf, + .oid = &head_oid, + }; + + fsck_handle_ref(&ref, NULL); + } + strbuf_release(&refname); if (include_reflogs) refs_for_each_reflog(get_worktree_ref_store(wt), diff --git a/builtin/gc.c b/builtin/gc.c index 541d7471f1..e9a76243aa 100644 --- a/builtin/gc.c +++ b/builtin/gc.c @@ -34,7 +34,9 @@ #include "pack-objects.h" #include "path.h" #include "reflog.h" +#include "repack.h" #include "rerere.h" +#include "revision.h" #include "blob.h" #include "tree.h" #include "promisor-remote.h" @@ -55,7 +57,6 @@ static const char * const builtin_gc_usage[] = { }; static timestamp_t gc_log_expire_time; -static struct strvec repack = STRVEC_INIT; static struct tempfile *pidfile; static struct lock_file log_lock; static struct string_list pack_garbage = STRING_LIST_INIT_DUP; @@ -255,6 +256,7 @@ enum maintenance_task_label { TASK_PREFETCH, TASK_LOOSE_OBJECTS, TASK_INCREMENTAL_REPACK, + TASK_GEOMETRIC_REPACK, TASK_GC, TASK_COMMIT_GRAPH, TASK_PACK_REFS, @@ -285,12 +287,26 @@ static void maintenance_run_opts_release(struct maintenance_run_opts *opts) static int pack_refs_condition(UNUSED struct gc_config *cfg) { - /* - * The auto-repacking logic for refs is handled by the ref backends and - * exposed via `git pack-refs --auto`. We thus always return truish - * here and let the backend decide for us. - */ - return 1; + struct string_list included_refs = STRING_LIST_INIT_NODUP; + struct ref_exclusions excludes = REF_EXCLUSIONS_INIT; + struct refs_optimize_opts optimize_opts = { + .exclusions = &excludes, + .includes = &included_refs, + .flags = REFS_OPTIMIZE_PRUNE | REFS_OPTIMIZE_AUTO, + }; + bool required; + + /* Check for all refs, similar to 'git refs optimize --all'. */ + string_list_append(optimize_opts.includes, "*"); + + if (refs_optimize_required(get_main_ref_store(the_repository), + &optimize_opts, &required)) + return 0; + + clear_ref_exclusions(&excludes); + string_list_clear(&included_refs, 0); + + return required; } static int maintenance_task_pack_refs(struct maintenance_run_opts *opts, @@ -448,7 +464,7 @@ out: return should_gc; } -static int too_many_loose_objects(struct gc_config *cfg) +static int too_many_loose_objects(int limit) { /* * Quickly check if a "gc" is needed, by estimating how @@ -470,7 +486,7 @@ static int too_many_loose_objects(struct gc_config *cfg) if (!dir) return 0; - auto_threshold = DIV_ROUND_UP(cfg->gc_auto_threshold, 256); + auto_threshold = DIV_ROUND_UP(limit, 256); while ((ent = readdir(dir)) != NULL) { if (strspn(ent->d_name, "0123456789abcdef") != hexsz_loose || ent->d_name[hexsz_loose] != '\0') @@ -616,48 +632,50 @@ static uint64_t estimate_repack_memory(struct gc_config *cfg, return os_cache + heap; } -static int keep_one_pack(struct string_list_item *item, void *data UNUSED) +static int keep_one_pack(struct string_list_item *item, void *data) { - strvec_pushf(&repack, "--keep-pack=%s", basename(item->string)); + struct strvec *args = data; + strvec_pushf(args, "--keep-pack=%s", basename(item->string)); return 0; } static void add_repack_all_option(struct gc_config *cfg, - struct string_list *keep_pack) + struct string_list *keep_pack, + struct strvec *args) { if (cfg->prune_expire && !strcmp(cfg->prune_expire, "now") && !(cfg->cruft_packs && cfg->repack_expire_to)) - strvec_push(&repack, "-a"); + strvec_push(args, "-a"); else if (cfg->cruft_packs) { - strvec_push(&repack, "--cruft"); + strvec_push(args, "--cruft"); if (cfg->prune_expire) - strvec_pushf(&repack, "--cruft-expiration=%s", cfg->prune_expire); + strvec_pushf(args, "--cruft-expiration=%s", cfg->prune_expire); if (cfg->max_cruft_size) - strvec_pushf(&repack, "--max-cruft-size=%lu", + strvec_pushf(args, "--max-cruft-size=%lu", cfg->max_cruft_size); if (cfg->repack_expire_to) - strvec_pushf(&repack, "--expire-to=%s", cfg->repack_expire_to); + strvec_pushf(args, "--expire-to=%s", cfg->repack_expire_to); } else { - strvec_push(&repack, "-A"); + strvec_push(args, "-A"); if (cfg->prune_expire) - strvec_pushf(&repack, "--unpack-unreachable=%s", cfg->prune_expire); + strvec_pushf(args, "--unpack-unreachable=%s", cfg->prune_expire); } if (keep_pack) - for_each_string_list(keep_pack, keep_one_pack, NULL); + for_each_string_list(keep_pack, keep_one_pack, args); if (cfg->repack_filter && *cfg->repack_filter) - strvec_pushf(&repack, "--filter=%s", cfg->repack_filter); + strvec_pushf(args, "--filter=%s", cfg->repack_filter); if (cfg->repack_filter_to && *cfg->repack_filter_to) - strvec_pushf(&repack, "--filter-to=%s", cfg->repack_filter_to); + strvec_pushf(args, "--filter-to=%s", cfg->repack_filter_to); } -static void add_repack_incremental_option(void) +static void add_repack_incremental_option(struct strvec *args) { - strvec_push(&repack, "--no-write-bitmap-index"); + strvec_push(args, "--no-write-bitmap-index"); } -static int need_to_gc(struct gc_config *cfg) +static int need_to_gc(struct gc_config *cfg, struct strvec *repack_args) { /* * Setting gc.auto to 0 or negative can disable the @@ -698,10 +716,10 @@ static int need_to_gc(struct gc_config *cfg) string_list_clear(&keep_pack, 0); } - add_repack_all_option(cfg, &keep_pack); + add_repack_all_option(cfg, &keep_pack, repack_args); string_list_clear(&keep_pack, 0); - } else if (too_many_loose_objects(cfg)) - add_repack_incremental_option(); + } else if (too_many_loose_objects(cfg->gc_auto_threshold)) + add_repack_incremental_option(repack_args); else return 0; @@ -850,6 +868,7 @@ int cmd_gc(int argc, int keep_largest_pack = -1; int skip_foreground_tasks = 0; timestamp_t dummy; + struct strvec repack_args = STRVEC_INIT; struct maintenance_run_opts opts = MAINTENANCE_RUN_OPTS_INIT; struct gc_config cfg = GC_CONFIG_INIT; const char *prune_expire_sentinel = "sentinel"; @@ -889,7 +908,7 @@ int cmd_gc(int argc, show_usage_with_options_if_asked(argc, argv, builtin_gc_usage, builtin_gc_options); - strvec_pushl(&repack, "repack", "-d", "-l", NULL); + strvec_pushl(&repack_args, "repack", "-d", "-l", NULL); gc_config(&cfg); @@ -912,14 +931,14 @@ int cmd_gc(int argc, die(_("failed to parse prune expiry value %s"), cfg.prune_expire); if (aggressive) { - strvec_push(&repack, "-f"); + strvec_push(&repack_args, "-f"); if (cfg.aggressive_depth > 0) - strvec_pushf(&repack, "--depth=%d", cfg.aggressive_depth); + strvec_pushf(&repack_args, "--depth=%d", cfg.aggressive_depth); if (cfg.aggressive_window > 0) - strvec_pushf(&repack, "--window=%d", cfg.aggressive_window); + strvec_pushf(&repack_args, "--window=%d", cfg.aggressive_window); } if (opts.quiet) - strvec_push(&repack, "-q"); + strvec_push(&repack_args, "-q"); if (opts.auto_flag) { if (cfg.detach_auto && opts.detach < 0) @@ -928,7 +947,7 @@ int cmd_gc(int argc, /* * Auto-gc should be least intrusive as possible. */ - if (!need_to_gc(&cfg)) { + if (!need_to_gc(&cfg, &repack_args)) { ret = 0; goto out; } @@ -950,7 +969,7 @@ int cmd_gc(int argc, find_base_packs(&keep_pack, cfg.big_pack_threshold); } - add_repack_all_option(&cfg, &keep_pack); + add_repack_all_option(&cfg, &keep_pack, &repack_args); string_list_clear(&keep_pack, 0); } @@ -1012,9 +1031,9 @@ int cmd_gc(int argc, repack_cmd.git_cmd = 1; repack_cmd.close_object_store = 1; - strvec_pushv(&repack_cmd.args, repack.v); + strvec_pushv(&repack_cmd.args, repack_args.v); if (run_command(&repack_cmd)) - die(FAILED_RUN, repack.v[0]); + die(FAILED_RUN, repack_args.v[0]); if (cfg.prune_expire) { struct child_process prune_cmd = CHILD_PROCESS_INIT; @@ -1053,7 +1072,7 @@ int cmd_gc(int argc, !opts.quiet && !daemonized ? COMMIT_GRAPH_WRITE_PROGRESS : 0, NULL); - if (opts.auto_flag && too_many_loose_objects(&cfg)) + if (opts.auto_flag && too_many_loose_objects(cfg.gc_auto_threshold)) warning(_("There are too many unreachable loose objects; " "run 'git prune' to remove them.")); @@ -1065,6 +1084,7 @@ int cmd_gc(int argc, out: maintenance_run_opts_release(&opts); + strvec_clear(&repack_args); gc_config_release(&cfg); return 0; } @@ -1090,32 +1110,26 @@ static int maintenance_opt_schedule(const struct option *opt, const char *arg, return 0; } -/* Remember to update object flag allocation in object.h */ -#define SEEN (1u<<0) - struct cg_auto_data { int num_not_in_graph; int limit; }; -static int dfs_on_ref(const char *refname UNUSED, - const char *referent UNUSED, - const struct object_id *oid, - int flags UNUSED, - void *cb_data) +static int dfs_on_ref(const struct reference *ref, void *cb_data) { struct cg_auto_data *data = (struct cg_auto_data *)cb_data; int result = 0; + const struct object_id *maybe_peeled = ref->oid; struct object_id peeled; struct commit_list *stack = NULL; struct commit *commit; - if (!peel_iterated_oid(the_repository, oid, &peeled)) - oid = &peeled; - if (odb_read_object_info(the_repository->objects, oid, NULL) != OBJ_COMMIT) + if (!reference_get_peeled_oid(the_repository, ref, &peeled)) + maybe_peeled = &peeled; + if (odb_read_object_info(the_repository->objects, maybe_peeled, NULL) != OBJ_COMMIT) return 0; - commit = lookup_commit(the_repository, oid); + commit = lookup_commit(the_repository, maybe_peeled); if (!commit) return 0; if (repo_parse_commit(the_repository, commit) || @@ -1267,6 +1281,19 @@ static int maintenance_task_gc_background(struct maintenance_run_opts *opts, return run_command(&child); } +static int gc_condition(struct gc_config *cfg) +{ + /* + * Note that it's fine to drop the repack arguments here, as we execute + * git-gc(1) as a separate child process anyway. So it knows to compute + * these arguments again. + */ + struct strvec repack_args = STRVEC_INIT; + int ret = need_to_gc(cfg, &repack_args); + strvec_clear(&repack_args); + return ret; +} + static int prune_packed(struct maintenance_run_opts *opts) { struct child_process child = CHILD_PROCESS_INIT; @@ -1548,6 +1575,108 @@ static int maintenance_task_incremental_repack(struct maintenance_run_opts *opts return 0; } +static int maintenance_task_geometric_repack(struct maintenance_run_opts *opts, + struct gc_config *cfg) +{ + struct pack_geometry geometry = { + .split_factor = 2, + }; + struct pack_objects_args po_args = { + .local = 1, + }; + struct existing_packs existing_packs = EXISTING_PACKS_INIT; + struct string_list kept_packs = STRING_LIST_INIT_DUP; + struct child_process child = CHILD_PROCESS_INIT; + int ret; + + repo_config_get_int(the_repository, "maintenance.geometric-repack.splitFactor", + &geometry.split_factor); + + existing_packs.repo = the_repository; + existing_packs_collect(&existing_packs, &kept_packs); + pack_geometry_init(&geometry, &existing_packs, &po_args); + pack_geometry_split(&geometry); + + child.git_cmd = 1; + + strvec_pushl(&child.args, "repack", "-d", "-l", NULL); + if (geometry.split < geometry.pack_nr) + strvec_pushf(&child.args, "--geometric=%d", + geometry.split_factor); + else + add_repack_all_option(cfg, NULL, &child.args); + if (opts->quiet) + strvec_push(&child.args, "--quiet"); + if (the_repository->settings.core_multi_pack_index) + strvec_push(&child.args, "--write-midx"); + + if (run_command(&child)) { + ret = error(_("failed to perform geometric repack")); + goto out; + } + + ret = 0; + +out: + existing_packs_release(&existing_packs); + pack_geometry_release(&geometry); + return ret; +} + +static int geometric_repack_auto_condition(struct gc_config *cfg UNUSED) +{ + struct pack_geometry geometry = { + .split_factor = 2, + }; + struct pack_objects_args po_args = { + .local = 1, + }; + struct existing_packs existing_packs = EXISTING_PACKS_INIT; + struct string_list kept_packs = STRING_LIST_INIT_DUP; + int auto_value = 100; + int ret; + + repo_config_get_int(the_repository, "maintenance.geometric-repack.auto", + &auto_value); + if (!auto_value) + return 0; + if (auto_value < 0) + return 1; + + repo_config_get_int(the_repository, "maintenance.geometric-repack.splitFactor", + &geometry.split_factor); + + existing_packs.repo = the_repository; + existing_packs_collect(&existing_packs, &kept_packs); + pack_geometry_init(&geometry, &existing_packs, &po_args); + pack_geometry_split(&geometry); + + /* + * When we'd merge at least two packs with one another we always + * perform the repack. + */ + if (geometry.split) { + ret = 1; + goto out; + } + + /* + * Otherwise, we estimate the number of loose objects to determine + * whether we want to create a new packfile or not. + */ + if (too_many_loose_objects(auto_value)) { + ret = 1; + goto out; + } + + ret = 0; + +out: + existing_packs_release(&existing_packs); + pack_geometry_release(&geometry); + return ret; +} + typedef int (*maintenance_task_fn)(struct maintenance_run_opts *opts, struct gc_config *cfg); typedef int (*maintenance_auto_fn)(struct gc_config *cfg); @@ -1590,11 +1719,16 @@ static const struct maintenance_task tasks[] = { .background = maintenance_task_incremental_repack, .auto_condition = incremental_repack_auto_condition, }, + [TASK_GEOMETRIC_REPACK] = { + .name = "geometric-repack", + .background = maintenance_task_geometric_repack, + .auto_condition = geometric_repack_auto_condition, + }, [TASK_GC] = { .name = "gc", .foreground = maintenance_task_gc_foreground, .background = maintenance_task_gc_background, - .auto_condition = need_to_gc, + .auto_condition = gc_condition, }, [TASK_COMMIT_GRAPH] = { .name = "commit-graph", @@ -1700,39 +1834,116 @@ static int maintenance_run_tasks(struct maintenance_run_opts *opts, return result; } +enum maintenance_type { + /* As invoked via `git maintenance run --schedule=`. */ + MAINTENANCE_TYPE_SCHEDULED = (1 << 0), + /* As invoked via `git maintenance run` and with `--auto`. */ + MAINTENANCE_TYPE_MANUAL = (1 << 1), +}; + struct maintenance_strategy { struct { - int enabled; + unsigned type; enum schedule_priority schedule; } tasks[TASK__COUNT]; }; static const struct maintenance_strategy none_strategy = { 0 }; -static const struct maintenance_strategy default_strategy = { + +static const struct maintenance_strategy gc_strategy = { .tasks = { - [TASK_GC].enabled = 1, + [TASK_GC] = { + .type = MAINTENANCE_TYPE_MANUAL | MAINTENANCE_TYPE_SCHEDULED, + .schedule = SCHEDULE_DAILY, + }, }, }; + static const struct maintenance_strategy incremental_strategy = { .tasks = { - [TASK_COMMIT_GRAPH].enabled = 1, - [TASK_COMMIT_GRAPH].schedule = SCHEDULE_HOURLY, - [TASK_PREFETCH].enabled = 1, - [TASK_PREFETCH].schedule = SCHEDULE_HOURLY, - [TASK_INCREMENTAL_REPACK].enabled = 1, - [TASK_INCREMENTAL_REPACK].schedule = SCHEDULE_DAILY, - [TASK_LOOSE_OBJECTS].enabled = 1, - [TASK_LOOSE_OBJECTS].schedule = SCHEDULE_DAILY, - [TASK_PACK_REFS].enabled = 1, - [TASK_PACK_REFS].schedule = SCHEDULE_WEEKLY, + [TASK_COMMIT_GRAPH] = { + .type = MAINTENANCE_TYPE_SCHEDULED, + .schedule = SCHEDULE_HOURLY, + }, + [TASK_PREFETCH] = { + .type = MAINTENANCE_TYPE_SCHEDULED, + .schedule = SCHEDULE_HOURLY, + }, + [TASK_INCREMENTAL_REPACK] = { + .type = MAINTENANCE_TYPE_SCHEDULED, + .schedule = SCHEDULE_DAILY, + }, + [TASK_LOOSE_OBJECTS] = { + .type = MAINTENANCE_TYPE_SCHEDULED, + .schedule = SCHEDULE_DAILY, + }, + [TASK_PACK_REFS] = { + .type = MAINTENANCE_TYPE_SCHEDULED, + .schedule = SCHEDULE_WEEKLY, + }, + /* + * Historically, the "incremental" strategy was only available + * in the context of scheduled maintenance when set up via + * "maintenance.strategy". We have later expanded that config + * to also cover manual maintenance. + * + * To retain backwards compatibility with the previous status + * quo we thus run git-gc(1) in case manual maintenance was + * requested. This is the same as the default strategy, which + * would have been in use beforehand. + */ + [TASK_GC] = { + .type = MAINTENANCE_TYPE_MANUAL, + }, + }, +}; + +static const struct maintenance_strategy geometric_strategy = { + .tasks = { + [TASK_COMMIT_GRAPH] = { + .type = MAINTENANCE_TYPE_SCHEDULED | MAINTENANCE_TYPE_MANUAL, + .schedule = SCHEDULE_HOURLY, + }, + [TASK_GEOMETRIC_REPACK] = { + .type = MAINTENANCE_TYPE_SCHEDULED | MAINTENANCE_TYPE_MANUAL, + .schedule = SCHEDULE_DAILY, + }, + [TASK_PACK_REFS] = { + .type = MAINTENANCE_TYPE_SCHEDULED | MAINTENANCE_TYPE_MANUAL, + .schedule = SCHEDULE_DAILY, + }, + [TASK_RERERE_GC] = { + .type = MAINTENANCE_TYPE_SCHEDULED | MAINTENANCE_TYPE_MANUAL, + .schedule = SCHEDULE_WEEKLY, + }, + [TASK_REFLOG_EXPIRE] = { + .type = MAINTENANCE_TYPE_SCHEDULED | MAINTENANCE_TYPE_MANUAL, + .schedule = SCHEDULE_WEEKLY, + }, + [TASK_WORKTREE_PRUNE] = { + .type = MAINTENANCE_TYPE_SCHEDULED | MAINTENANCE_TYPE_MANUAL, + .schedule = SCHEDULE_WEEKLY, + }, }, }; +static struct maintenance_strategy parse_maintenance_strategy(const char *name) +{ + if (!strcasecmp(name, "incremental")) + return incremental_strategy; + if (!strcasecmp(name, "gc")) + return gc_strategy; + if (!strcasecmp(name, "geometric")) + return geometric_strategy; + die(_("unknown maintenance strategy: '%s'"), name); +} + static void initialize_task_config(struct maintenance_run_opts *opts, const struct string_list *selected_tasks) { struct strbuf config_name = STRBUF_INIT; struct maintenance_strategy strategy; + enum maintenance_type type; const char *config_str; /* @@ -1760,19 +1971,20 @@ static void initialize_task_config(struct maintenance_run_opts *opts, * - Unscheduled maintenance uses our default strategy. * * Both of these are affected by the gitconfig though, which may - * override specific aspects of our strategy. + * override specific aspects of our strategy. Furthermore, both + * strategies can be overridden by setting "maintenance.strategy". */ if (opts->schedule) { strategy = none_strategy; - - if (!repo_config_get_string_tmp(the_repository, "maintenance.strategy", &config_str)) { - if (!strcasecmp(config_str, "incremental")) - strategy = incremental_strategy; - } + type = MAINTENANCE_TYPE_SCHEDULED; } else { - strategy = default_strategy; + strategy = gc_strategy; + type = MAINTENANCE_TYPE_MANUAL; } + if (!repo_config_get_string_tmp(the_repository, "maintenance.strategy", &config_str)) + strategy = parse_maintenance_strategy(config_str); + for (size_t i = 0; i < TASK__COUNT; i++) { int config_value; @@ -1780,8 +1992,8 @@ static void initialize_task_config(struct maintenance_run_opts *opts, strbuf_addf(&config_name, "maintenance.%s.enabled", tasks[i].name); if (!repo_config_get_bool(the_repository, config_name.buf, &config_value)) - strategy.tasks[i].enabled = config_value; - if (!strategy.tasks[i].enabled) + strategy.tasks[i].type = config_value ? type : 0; + if (!(strategy.tasks[i].type & type)) continue; if (opts->schedule) { @@ -3244,7 +3456,67 @@ static int maintenance_stop(int argc, const char **argv, const char *prefix, return update_background_schedule(NULL, 0); } -static const char * const builtin_maintenance_usage[] = { +static const char *const builtin_maintenance_is_needed_usage[] = { + "git maintenance is-needed [--task=<task>] [--schedule]", + NULL +}; + +static int maintenance_is_needed(int argc, const char **argv, const char *prefix, + struct repository *repo UNUSED) +{ + struct maintenance_run_opts opts = MAINTENANCE_RUN_OPTS_INIT; + struct string_list selected_tasks = STRING_LIST_INIT_DUP; + struct gc_config cfg = GC_CONFIG_INIT; + struct option options[] = { + OPT_BOOL(0, "auto", &opts.auto_flag, + N_("run tasks based on the state of the repository")), + OPT_CALLBACK_F(0, "task", &selected_tasks, N_("task"), + N_("check a specific task"), + PARSE_OPT_NONEG, task_option_parse), + OPT_END() + }; + bool is_needed = false; + + argc = parse_options(argc, argv, prefix, options, + builtin_maintenance_is_needed_usage, + PARSE_OPT_STOP_AT_NON_OPTION); + if (argc) + usage_with_options(builtin_maintenance_is_needed_usage, options); + + gc_config(&cfg); + initialize_task_config(&opts, &selected_tasks); + + if (opts.auto_flag) { + for (size_t i = 0; i < opts.tasks_nr; i++) { + if (tasks[opts.tasks[i]].auto_condition && + tasks[opts.tasks[i]].auto_condition(&cfg)) { + is_needed = true; + break; + } + } + } else { + /* + * When not using --auto we always require maintenance right now. + * + * TODO: this certainly is too eager, as some maintenance tasks may + * decide to not do anything because the data structures are already + * fully optimized. We may eventually want to extend the auto + * condition to also cover non-auto runs so that we can detect such + * cases. + */ + is_needed = true; + } + + string_list_clear(&selected_tasks, 0); + maintenance_run_opts_release(&opts); + gc_config_release(&cfg); + + if (is_needed) + return 0; + return 1; +} + +static const char *const builtin_maintenance_usage[] = { N_("git maintenance <subcommand> [<options>]"), NULL, }; @@ -3261,6 +3533,7 @@ int cmd_maintenance(int argc, OPT_SUBCOMMAND("stop", &fn, maintenance_stop), OPT_SUBCOMMAND("register", &fn, maintenance_register), OPT_SUBCOMMAND("unregister", &fn, maintenance_unregister), + OPT_SUBCOMMAND("is-needed", &fn, maintenance_is_needed), OPT_END(), }; diff --git a/builtin/last-modified.c b/builtin/last-modified.c index ae8b36a2c3..b0ecbdc540 100644 --- a/builtin/last-modified.c +++ b/builtin/last-modified.c @@ -2,26 +2,32 @@ #include "bloom.h" #include "builtin.h" #include "commit-graph.h" +#include "commit-slab.h" #include "commit.h" #include "config.h" -#include "environment.h" #include "diff.h" #include "diffcore.h" #include "environment.h" +#include "ewah/ewok.h" #include "hashmap.h" #include "hex.h" -#include "log-tree.h" #include "object-name.h" #include "object.h" #include "parse-options.h" +#include "prio-queue.h" #include "quote.h" #include "repository.h" #include "revision.h" +/* Remember to update object flag allocation in object.h */ +#define PARENT1 (1u<<16) /* used instead of SEEN */ +#define PARENT2 (1u<<17) /* used instead of BOTTOM, BOUNDARY */ + struct last_modified_entry { struct hashmap_entry hashent; struct object_id oid; struct bloom_key key; + size_t diff_idx; const char path[FLEX_ARRAY]; }; @@ -37,13 +43,45 @@ static int last_modified_entry_hashcmp(const void *unused UNUSED, return strcmp(ent1->path, path ? path : ent2->path); } +/* + * Hold a bitmap for each commit we're working with. In the bitmap, each bit + * represents a path in `lm->all_paths`. An active bit indicates the path still + * needs to be associated to a commit. + */ +define_commit_slab(active_paths_for_commit, struct bitmap *); + struct last_modified { struct hashmap paths; struct rev_info rev; bool recursive; bool show_trees; + + const char **all_paths; + size_t all_paths_nr; + struct active_paths_for_commit active_paths; + + /* 'scratch' to avoid allocating a bitmap every process_parent() */ + struct bitmap *scratch; }; +static struct bitmap *active_paths_for(struct last_modified *lm, struct commit *c) +{ + struct bitmap **bitmap = active_paths_for_commit_at(&lm->active_paths, c); + if (!*bitmap) + *bitmap = bitmap_word_alloc(lm->all_paths_nr / BITS_IN_EWORD + 1); + + return *bitmap; +} + +static void active_paths_free(struct last_modified *lm, struct commit *c) +{ + struct bitmap **bitmap = active_paths_for_commit_at(&lm->active_paths, c); + if (*bitmap) { + bitmap_free(*bitmap); + *bitmap = NULL; + } +} + static void last_modified_release(struct last_modified *lm) { struct hashmap_iter iter; @@ -54,6 +92,8 @@ static void last_modified_release(struct last_modified *lm) hashmap_clear_and_free(&lm->paths, struct last_modified_entry, hashent); release_revisions(&lm->rev); + + free(lm->all_paths); } struct last_modified_callback_data { @@ -146,7 +186,7 @@ static void mark_path(const char *path, const struct object_id *oid, * Is it arriving at a version of interest, or is it from a side branch * which did not contribute to the final state? */ - if (!oideq(oid, &ent->oid)) + if (oid && !oideq(oid, &ent->oid)) return; last_modified_emit(data->lm, path, data->commit); @@ -196,7 +236,17 @@ static void last_modified_diff(struct diff_queue_struct *q, } } -static bool maybe_changed_path(struct last_modified *lm, struct commit *origin) +static void pass_to_parent(struct bitmap *c, + struct bitmap *p, + size_t pos) +{ + bitmap_unset(c, pos); + bitmap_set(p, pos); +} + +static bool maybe_changed_path(struct last_modified *lm, + struct commit *origin, + struct bitmap *active) { struct bloom_filter *filter; struct last_modified_entry *ent; @@ -213,6 +263,9 @@ static bool maybe_changed_path(struct last_modified *lm, struct commit *origin) return true; hashmap_for_each_entry(&lm->paths, &iter, ent, hashent) { + if (active && !bitmap_get(active, ent->diff_idx)) + continue; + if (bloom_filter_contains(filter, &ent->key, lm->rev.bloom_filter_settings)) return true; @@ -220,42 +273,202 @@ static bool maybe_changed_path(struct last_modified *lm, struct commit *origin) return false; } +static void process_parent(struct last_modified *lm, + struct prio_queue *queue, + struct commit *c, struct bitmap *active_c, + struct commit *parent, int parent_i) +{ + struct bitmap *active_p; + + repo_parse_commit(lm->rev.repo, parent); + active_p = active_paths_for(lm, parent); + + /* + * The first time entering this function for this commit (i.e. first parent) + * see if Bloom filters will tell us it's worth to do the diff. + */ + if (parent_i || maybe_changed_path(lm, c, active_c)) { + diff_tree_oid(&parent->object.oid, + &c->object.oid, "", &lm->rev.diffopt); + diffcore_std(&lm->rev.diffopt); + } + + /* + * Test each path for TREESAME-ness against the parent. If a path is + * TREESAME, pass it on to this parent. + * + * First, collect all paths that are *not* TREESAME in 'scratch'. + * Then, pass paths that *are* TREESAME and active to the parent. + */ + for (int i = 0; i < diff_queued_diff.nr; i++) { + struct diff_filepair *fp = diff_queued_diff.queue[i]; + const char *path = fp->two->path; + struct last_modified_entry *ent = + hashmap_get_entry_from_hash(&lm->paths, strhash(path), path, + struct last_modified_entry, hashent); + if (ent) { + size_t k = ent->diff_idx; + if (bitmap_get(active_c, k)) + bitmap_set(lm->scratch, k); + } + } + for (size_t i = 0; i < lm->all_paths_nr; i++) { + if (bitmap_get(active_c, i) && !bitmap_get(lm->scratch, i)) + pass_to_parent(active_c, active_p, i); + } + + /* + * If parent has any active paths, put it on the queue (if not already). + */ + if (!bitmap_is_empty(active_p) && !(parent->object.flags & PARENT1)) { + parent->object.flags |= PARENT1; + prio_queue_put(queue, parent); + } + if (!(parent->object.flags & PARENT1)) + active_paths_free(lm, parent); + + memset(lm->scratch->words, 0x0, lm->scratch->word_alloc); + diff_queue_clear(&diff_queued_diff); +} + static int last_modified_run(struct last_modified *lm) { + int max_count, queue_popped = 0; + struct prio_queue queue = { compare_commits_by_gen_then_commit_date }; + struct prio_queue not_queue = { compare_commits_by_gen_then_commit_date }; + struct commit_list *list; struct last_modified_callback_data data = { .lm = lm }; lm->rev.diffopt.output_format = DIFF_FORMAT_CALLBACK; lm->rev.diffopt.format_callback = last_modified_diff; lm->rev.diffopt.format_callback_data = &data; + lm->rev.no_walk = 1; prepare_revision_walk(&lm->rev); - while (hashmap_get_size(&lm->paths)) { - data.commit = get_revision(&lm->rev); - if (!data.commit) - BUG("paths remaining beyond boundary in last-modified"); + max_count = lm->rev.max_count; + + init_active_paths_for_commit(&lm->active_paths); + lm->scratch = bitmap_word_alloc(lm->all_paths_nr); + + /* + * lm->rev.commits holds the set of boundary commits for our walk. + * + * Loop through each such commit, and place it in the appropriate queue. + */ + for (list = lm->rev.commits; list; list = list->next) { + struct commit *c = list->item; + + if (c->object.flags & BOTTOM) { + prio_queue_put(¬_queue, c); + c->object.flags |= PARENT2; + } else if (!(c->object.flags & PARENT1)) { + /* + * If the commit is a starting point (and hasn't been + * seen yet), then initialize the set of interesting + * paths, too. + */ + struct bitmap *active; + + prio_queue_put(&queue, c); + c->object.flags |= PARENT1; + + active = active_paths_for(lm, c); + for (size_t i = 0; i < lm->all_paths_nr; i++) + bitmap_set(active, i); + } + } - if (data.commit->object.flags & BOUNDARY) { + while (queue.nr) { + int parent_i; + struct commit_list *p; + struct commit *c = prio_queue_get(&queue); + struct bitmap *active_c = active_paths_for(lm, c); + + if ((0 <= max_count && max_count < ++queue_popped) || + (c->object.flags & PARENT2)) { + /* + * Either a boundary commit, or we have already seen too + * many others. Either way, stop here. + */ + c->object.flags |= PARENT2 | BOUNDARY; + data.commit = c; diff_tree_oid(lm->rev.repo->hash_algo->empty_tree, - &data.commit->object.oid, "", - &lm->rev.diffopt); + &c->object.oid, + "", &lm->rev.diffopt); diff_flush(&lm->rev.diffopt); + goto cleanup; + } - break; + /* + * Otherwise, make sure that 'c' isn't reachable from anything + * in the '--not' queue. + */ + repo_parse_commit(lm->rev.repo, c); + + while (not_queue.nr) { + struct commit_list *np; + struct commit *n = prio_queue_get(¬_queue); + + repo_parse_commit(lm->rev.repo, n); + + for (np = n->parents; np; np = np->next) { + if (!(np->item->object.flags & PARENT2)) { + prio_queue_put(¬_queue, np->item); + np->item->object.flags |= PARENT2; + } + } + + if (commit_graph_generation(n) < commit_graph_generation(c)) + break; } - if (!maybe_changed_path(lm, data.commit)) - continue; + /* + * Look at each parent and pass on each path that's TREESAME + * with that parent. Stop early when no active paths remain. + */ + for (p = c->parents, parent_i = 0; p; p = p->next, parent_i++) { + process_parent(lm, &queue, + c, active_c, + p->item, parent_i); + + if (bitmap_is_empty(active_c)) + break; + } + + /* + * Paths that remain active, or not TREESAME with any parent, + * were changed by 'c'. + */ + if (!bitmap_is_empty(active_c)) { + data.commit = c; + for (size_t i = 0; i < lm->all_paths_nr; i++) { + if (bitmap_get(active_c, i)) + mark_path(lm->all_paths[i], NULL, &data); + } + } - log_tree_commit(&lm->rev, data.commit); +cleanup: + active_paths_free(lm, c); } + if (hashmap_get_size(&lm->paths)) + BUG("paths remaining beyond boundary in last-modified"); + + clear_prio_queue(¬_queue); + clear_prio_queue(&queue); + clear_active_paths_for_commit(&lm->active_paths); + bitmap_free(lm->scratch); + return 0; } static int last_modified_init(struct last_modified *lm, struct repository *r, const char *prefix, int argc, const char **argv) { + struct hashmap_iter iter; + struct last_modified_entry *ent; + hashmap_init(&lm->paths, last_modified_entry_hashcmp, NULL, 0); repo_init_revisions(r, &lm->rev, prefix); @@ -280,6 +493,13 @@ static int last_modified_init(struct last_modified *lm, struct repository *r, if (populate_paths_from_revs(lm) < 0) return error(_("unable to setup last-modified")); + CALLOC_ARRAY(lm->all_paths, hashmap_get_size(&lm->paths)); + lm->all_paths_nr = 0; + hashmap_for_each_entry(&lm->paths, &iter, ent, hashent) { + ent->diff_idx = lm->all_paths_nr++; + lm->all_paths[ent->diff_idx] = ent->path; + } + return 0; } diff --git a/builtin/ls-remote.c b/builtin/ls-remote.c index df09000b30..fe77829557 100644 --- a/builtin/ls-remote.c +++ b/builtin/ls-remote.c @@ -156,7 +156,7 @@ int cmd_ls_remote(int argc, continue; if (!tail_match(&pattern, ref->name)) continue; - item = ref_array_push(&ref_array, ref->name, &ref->old_oid); + item = ref_array_push(&ref_array, ref->name, &ref->old_oid, NULL); item->symref = xstrdup_or_null(ref->symref); } diff --git a/builtin/name-rev.c b/builtin/name-rev.c index 74512e54a3..615f7d1aae 100644 --- a/builtin/name-rev.c +++ b/builtin/name-rev.c @@ -339,10 +339,9 @@ static int cmp_by_tag_and_age(const void *a_, const void *b_) return a->taggerdate != b->taggerdate; } -static int name_ref(const char *path, const char *referent UNUSED, const struct object_id *oid, - int flags UNUSED, void *cb_data) +static int name_ref(const struct reference *ref, void *cb_data) { - struct object *o = parse_object(the_repository, oid); + struct object *o = parse_object(the_repository, ref->oid); struct name_ref_data *data = cb_data; int can_abbreviate_output = data->tags_only && data->name_only; int deref = 0; @@ -350,14 +349,14 @@ static int name_ref(const char *path, const char *referent UNUSED, const struct struct commit *commit = NULL; timestamp_t taggerdate = TIME_MAX; - if (data->tags_only && !starts_with(path, "refs/tags/")) + if (data->tags_only && !starts_with(ref->name, "refs/tags/")) return 0; if (data->exclude_filters.nr) { struct string_list_item *item; for_each_string_list_item(item, &data->exclude_filters) { - if (subpath_matches(path, item->string) >= 0) + if (subpath_matches(ref->name, item->string) >= 0) return 0; } } @@ -378,7 +377,7 @@ static int name_ref(const char *path, const char *referent UNUSED, const struct * shouldn't stop when seeing 'refs/tags/v1.4' matches * 'refs/tags/v*'. We should show it as 'v1.4'. */ - switch (subpath_matches(path, item->string)) { + switch (subpath_matches(ref->name, item->string)) { case -1: /* did not match */ break; case 0: /* matched fully */ @@ -406,13 +405,13 @@ static int name_ref(const char *path, const char *referent UNUSED, const struct } if (o && o->type == OBJ_COMMIT) { commit = (struct commit *)o; - from_tag = starts_with(path, "refs/tags/"); + from_tag = starts_with(ref->name, "refs/tags/"); if (taggerdate == TIME_MAX) taggerdate = commit->date; } - add_to_tip_table(oid, path, can_abbreviate_output, commit, taggerdate, - from_tag, deref); + add_to_tip_table(ref->oid, ref->name, can_abbreviate_output, + commit, taggerdate, from_tag, deref); return 0; } diff --git a/builtin/pack-objects.c b/builtin/pack-objects.c index 69e80b1443..7937106ec5 100644 --- a/builtin/pack-objects.c +++ b/builtin/pack-objects.c @@ -831,15 +831,14 @@ static enum write_one_status write_one(struct hashfile *f, return WRITE_ONE_WRITTEN; } -static int mark_tagged(const char *path UNUSED, const char *referent UNUSED, const struct object_id *oid, - int flag UNUSED, void *cb_data UNUSED) +static int mark_tagged(const struct reference *ref, void *cb_data UNUSED) { struct object_id peeled; - struct object_entry *entry = packlist_find(&to_pack, oid); + struct object_entry *entry = packlist_find(&to_pack, ref->oid); if (entry) entry->tagged = 1; - if (!peel_iterated_oid(the_repository, oid, &peeled)) { + if (!reference_get_peeled_oid(the_repository, ref, &peeled)) { entry = packlist_find(&to_pack, &peeled); if (entry) entry->tagged = 1; @@ -1706,8 +1705,8 @@ static int want_object_in_pack_mtime(const struct object_id *oid, uint32_t found_mtime) { int want; + struct packfile_list_entry *e; struct odb_source *source; - struct list_head *pos; if (!exclude && local) { /* @@ -1748,12 +1747,11 @@ static int want_object_in_pack_mtime(const struct object_id *oid, } } - list_for_each(pos, packfile_store_get_packs_mru(the_repository->objects->packfiles)) { - struct packed_git *p = list_entry(pos, struct packed_git, mru); + for (e = the_repository->objects->packfiles->packs.head; e; e = e->next) { + struct packed_git *p = e->pack; want = want_object_in_pack_one(p, oid, exclude, found_pack, found_offset, found_mtime); if (!exclude && want > 0) - list_move(&p->mru, - packfile_store_get_packs_mru(the_repository->objects->packfiles)); + packfile_list_prepend(&the_repository->objects->packfiles->packs, p); if (want != -1) return want; } @@ -3306,13 +3304,13 @@ static void add_tag_chain(const struct object_id *oid) } } -static int add_ref_tag(const char *tag UNUSED, const char *referent UNUSED, const struct object_id *oid, - int flag UNUSED, void *cb_data UNUSED) +static int add_ref_tag(const struct reference *ref, void *cb_data UNUSED) { struct object_id peeled; - if (!peel_iterated_oid(the_repository, oid, &peeled) && obj_is_packed(&peeled)) - add_tag_chain(oid); + if (!reference_get_peeled_oid(the_repository, ref, &peeled) && + obj_is_packed(&peeled)) + add_tag_chain(ref->oid); return 0; } @@ -4389,27 +4387,27 @@ static void add_unreachable_loose_objects(struct rev_info *revs) static int has_sha1_pack_kept_or_nonlocal(const struct object_id *oid) { - struct packfile_store *packs = the_repository->objects->packfiles; - static struct packed_git *last_found = (void *)1; + static struct packed_git *last_found = NULL; struct packed_git *p; - p = (last_found != (void *)1) ? last_found : - packfile_store_get_packs(packs); + if (last_found && find_pack_entry_one(oid, last_found)) + return 1; - while (p) { - if ((!p->pack_local || p->pack_keep || - p->pack_keep_in_core) && - find_pack_entry_one(oid, p)) { + repo_for_each_pack(the_repository, p) { + /* + * We have already checked `last_found`, so there is no need to + * re-check here. + */ + if (p == last_found) + continue; + + if ((!p->pack_local || p->pack_keep || p->pack_keep_in_core) && + find_pack_entry_one(oid, p)) { last_found = p; return 1; } - if (p == last_found) - p = packfile_store_get_packs(packs); - else - p = p->next; - if (p == last_found) - p = p->next; } + return 0; } @@ -4528,19 +4526,16 @@ static void record_recent_commit(struct commit *commit, void *data UNUSED) oid_array_append(&recent_objects, &commit->object.oid); } -static int mark_bitmap_preferred_tip(const char *refname, - const char *referent UNUSED, - const struct object_id *oid, - int flags UNUSED, - void *data UNUSED) +static int mark_bitmap_preferred_tip(const struct reference *ref, void *data UNUSED) { + const struct object_id *maybe_peeled = ref->oid; struct object_id peeled; struct object *object; - if (!peel_iterated_oid(the_repository, oid, &peeled)) - oid = &peeled; + if (!reference_get_peeled_oid(the_repository, ref, &peeled)) + maybe_peeled = &peeled; - object = parse_object_or_die(the_repository, oid, refname); + object = parse_object_or_die(the_repository, maybe_peeled, ref->name); if (object->type == OBJ_COMMIT) object->flags |= NEEDS_BITMAP; diff --git a/builtin/receive-pack.c b/builtin/receive-pack.c index c9288a9c7e..e8ee0e7321 100644 --- a/builtin/receive-pack.c +++ b/builtin/receive-pack.c @@ -305,13 +305,12 @@ static void show_ref(const char *path, const struct object_id *oid) } } -static int show_ref_cb(const char *path_full, const char *referent UNUSED, const struct object_id *oid, - int flag UNUSED, void *data) +static int show_ref_cb(const struct reference *ref, void *data) { struct oidset *seen = data; - const char *path = strip_namespace(path_full); + const char *path = strip_namespace(ref->name); - if (ref_is_hidden(path, path_full, &hidden_refs)) + if (ref_is_hidden(path, ref->name, &hidden_refs)) return 0; /* @@ -320,13 +319,13 @@ static int show_ref_cb(const char *path_full, const char *referent UNUSED, const * transfer but will otherwise ignore them. */ if (!path) { - if (oidset_insert(seen, oid)) + if (oidset_insert(seen, ref->oid)) return 0; path = ".have"; } else { - oidset_insert(seen, oid); + oidset_insert(seen, ref->oid); } - show_ref(path, oid); + show_ref(path, ref->oid); return 0; } diff --git a/builtin/remote.c b/builtin/remote.c index 8a7ed4299a..7ffc14ba15 100644 --- a/builtin/remote.c +++ b/builtin/remote.c @@ -570,17 +570,14 @@ struct branches_for_remote { struct known_remotes *keep; }; -static int add_branch_for_removal(const char *refname, - const char *referent UNUSED, - const struct object_id *oid UNUSED, - int flags UNUSED, void *cb_data) +static int add_branch_for_removal(const struct reference *ref, void *cb_data) { struct branches_for_remote *branches = cb_data; struct refspec_item refspec; struct known_remote *kr; memset(&refspec, 0, sizeof(refspec)); - refspec.dst = (char *)refname; + refspec.dst = (char *)ref->name; if (remote_find_tracking(branches->remote, &refspec)) return 0; free(refspec.src); @@ -588,7 +585,7 @@ static int add_branch_for_removal(const char *refname, /* don't delete a branch if another remote also uses it */ for (kr = branches->keep->list; kr; kr = kr->next) { memset(&refspec, 0, sizeof(refspec)); - refspec.dst = (char *)refname; + refspec.dst = (char *)ref->name; if (!remote_find_tracking(kr->remote, &refspec)) { free(refspec.src); return 0; @@ -596,16 +593,16 @@ static int add_branch_for_removal(const char *refname, } /* don't delete non-remote-tracking refs */ - if (!starts_with(refname, "refs/remotes/")) { + if (!starts_with(ref->name, "refs/remotes/")) { /* advise user how to delete local branches */ - if (starts_with(refname, "refs/heads/")) + if (starts_with(ref->name, "refs/heads/")) string_list_append(branches->skipped, - abbrev_branch(refname)); + abbrev_branch(ref->name)); /* silently skip over other non-remote refs */ return 0; } - string_list_append(branches->branches, refname); + string_list_append(branches->branches, ref->name); return 0; } @@ -713,18 +710,18 @@ out: return error; } -static int rename_one_ref(const char *old_refname, const char *referent, - const struct object_id *oid, - int flags, void *cb_data) +static int rename_one_ref(const struct reference *ref, void *cb_data) { struct strbuf new_referent = STRBUF_INIT; struct strbuf new_refname = STRBUF_INIT; struct rename_info *rename = cb_data; + const struct object_id *oid = ref->oid; + const char *referent = ref->target; int error; - compute_renamed_ref(rename, old_refname, &new_refname); + compute_renamed_ref(rename, ref->name, &new_refname); - if (flags & REF_ISSYMREF) { + if (ref->flags & REF_ISSYMREF) { /* * Stupidly enough `referent` is not pointing to the immediate * target of a symref, but it's the recursively resolved value. @@ -732,25 +729,25 @@ static int rename_one_ref(const char *old_refname, const char *referent, * unborn symrefs don't have any value for the `referent` at all. */ referent = refs_resolve_ref_unsafe(get_main_ref_store(the_repository), - old_refname, RESOLVE_REF_NO_RECURSE, + ref->name, RESOLVE_REF_NO_RECURSE, NULL, NULL); compute_renamed_ref(rename, referent, &new_referent); oid = NULL; } - error = ref_transaction_delete(rename->transaction, old_refname, + error = ref_transaction_delete(rename->transaction, ref->name, oid, referent, REF_NO_DEREF, NULL, rename->err); if (error < 0) goto out; error = ref_transaction_update(rename->transaction, new_refname.buf, oid, null_oid(the_hash_algo), - (flags & REF_ISSYMREF) ? new_referent.buf : NULL, NULL, + (ref->flags & REF_ISSYMREF) ? new_referent.buf : NULL, NULL, REF_SKIP_CREATE_REFLOG | REF_NO_DEREF | REF_SKIP_OID_VERIFICATION, NULL, rename->err); if (error < 0) goto out; - error = rename_one_reflog(old_refname, oid, rename); + error = rename_one_reflog(ref->name, oid, rename); if (error < 0) goto out; @@ -1125,19 +1122,16 @@ static void free_remote_ref_states(struct ref_states *states) string_list_clear_func(&states->push, clear_push_info); } -static int append_ref_to_tracked_list(const char *refname, - const char *referent UNUSED, - const struct object_id *oid UNUSED, - int flags, void *cb_data) +static int append_ref_to_tracked_list(const struct reference *ref, void *cb_data) { struct ref_states *states = cb_data; struct refspec_item refspec; - if (flags & REF_ISSYMREF) + if (ref->flags & REF_ISSYMREF) return 0; memset(&refspec, 0, sizeof(refspec)); - refspec.dst = (char *)refname; + refspec.dst = (char *)ref->name; if (!remote_find_tracking(states->remote, &refspec)) { string_list_append(&states->tracked, abbrev_branch(refspec.src)); free(refspec.src); diff --git a/builtin/replace.c b/builtin/replace.c index 900b560a77..4c62c5ab58 100644 --- a/builtin/replace.c +++ b/builtin/replace.c @@ -47,30 +47,27 @@ struct show_data { enum replace_format format; }; -static int show_reference(const char *refname, - const char *referent UNUSED, - const struct object_id *oid, - int flag UNUSED, void *cb_data) +static int show_reference(const struct reference *ref, void *cb_data) { struct show_data *data = cb_data; - if (!wildmatch(data->pattern, refname, 0)) { + if (!wildmatch(data->pattern, ref->name, 0)) { if (data->format == REPLACE_FORMAT_SHORT) - printf("%s\n", refname); + printf("%s\n", ref->name); else if (data->format == REPLACE_FORMAT_MEDIUM) - printf("%s -> %s\n", refname, oid_to_hex(oid)); + printf("%s -> %s\n", ref->name, oid_to_hex(ref->oid)); else { /* data->format == REPLACE_FORMAT_LONG */ struct object_id object; enum object_type obj_type, repl_type; - if (repo_get_oid(data->repo, refname, &object)) - return error(_("failed to resolve '%s' as a valid ref"), refname); + if (repo_get_oid(data->repo, ref->name, &object)) + return error(_("failed to resolve '%s' as a valid ref"), ref->name); obj_type = odb_read_object_info(data->repo->objects, &object, NULL); - repl_type = odb_read_object_info(data->repo->objects, oid, NULL); + repl_type = odb_read_object_info(data->repo->objects, ref->oid, NULL); - printf("%s (%s) -> %s (%s)\n", refname, type_name(obj_type), - oid_to_hex(oid), type_name(repl_type)); + printf("%s (%s) -> %s (%s)\n", ref->name, type_name(obj_type), + oid_to_hex(ref->oid), type_name(repl_type)); } } diff --git a/builtin/replay.c b/builtin/replay.c index 6172c8aacc..6606a2c94b 100644 --- a/builtin/replay.c +++ b/builtin/replay.c @@ -8,6 +8,7 @@ #include "git-compat-util.h" #include "builtin.h" +#include "config.h" #include "environment.h" #include "hex.h" #include "lockfile.h" @@ -20,6 +21,11 @@ #include <oidset.h> #include <tree.h> +enum ref_action_mode { + REF_ACTION_UPDATE, + REF_ACTION_PRINT, +}; + static const char *short_commit_name(struct repository *repo, struct commit *commit) { @@ -284,6 +290,54 @@ static struct commit *pick_regular_commit(struct repository *repo, return create_commit(repo, result->tree, pickme, replayed_base); } +static enum ref_action_mode parse_ref_action_mode(const char *ref_action, const char *source) +{ + if (!ref_action || !strcmp(ref_action, "update")) + return REF_ACTION_UPDATE; + if (!strcmp(ref_action, "print")) + return REF_ACTION_PRINT; + die(_("invalid %s value: '%s'"), source, ref_action); +} + +static enum ref_action_mode get_ref_action_mode(struct repository *repo, const char *ref_action) +{ + const char *config_value = NULL; + + /* Command line option takes precedence */ + if (ref_action) + return parse_ref_action_mode(ref_action, "--ref-action"); + + /* Check config value */ + if (!repo_config_get_string_tmp(repo, "replay.refAction", &config_value)) + return parse_ref_action_mode(config_value, "replay.refAction"); + + /* Default to update mode */ + return REF_ACTION_UPDATE; +} + +static int handle_ref_update(enum ref_action_mode mode, + struct ref_transaction *transaction, + const char *refname, + const struct object_id *new_oid, + const struct object_id *old_oid, + const char *reflog_msg, + struct strbuf *err) +{ + switch (mode) { + case REF_ACTION_PRINT: + printf("update %s %s %s\n", + refname, + oid_to_hex(new_oid), + oid_to_hex(old_oid)); + return 0; + case REF_ACTION_UPDATE: + return ref_transaction_update(transaction, refname, new_oid, old_oid, + NULL, NULL, 0, reflog_msg, err); + default: + BUG("unknown ref_action_mode %d", mode); + } +} + int cmd_replay(int argc, const char **argv, const char *prefix, @@ -294,6 +348,8 @@ int cmd_replay(int argc, struct commit *onto = NULL; const char *onto_name = NULL; int contained = 0; + const char *ref_action = NULL; + enum ref_action_mode ref_mode; struct rev_info revs; struct commit *last_commit = NULL; @@ -302,12 +358,15 @@ int cmd_replay(int argc, struct merge_result result; struct strset *update_refs = NULL; kh_oid_map_t *replayed_commits; + struct ref_transaction *transaction = NULL; + struct strbuf transaction_err = STRBUF_INIT; + struct strbuf reflog_msg = STRBUF_INIT; int ret = 0; - const char * const replay_usage[] = { + const char *const replay_usage[] = { N_("(EXPERIMENTAL!) git replay " "([--contained] --onto <newbase> | --advance <branch>) " - "<revision-range>..."), + "[--ref-action[=<mode>]] <revision-range>..."), NULL }; struct option replay_options[] = { @@ -319,6 +378,9 @@ int cmd_replay(int argc, N_("replay onto given commit")), OPT_BOOL(0, "contained", &contained, N_("advance all branches contained in revision-range")), + OPT_STRING(0, "ref-action", &ref_action, + N_("mode"), + N_("control ref update behavior (update|print)")), OPT_END() }; @@ -330,9 +392,12 @@ int cmd_replay(int argc, usage_with_options(replay_usage, replay_options); } - if (advance_name_opt && contained) - die(_("options '%s' and '%s' cannot be used together"), - "--advance", "--contained"); + die_for_incompatible_opt2(!!advance_name_opt, "--advance", + contained, "--contained"); + + /* Parse ref action mode from command line or config */ + ref_mode = get_ref_action_mode(repo, ref_action); + advance_name = xstrdup_or_null(advance_name_opt); repo_init_revisions(repo, &revs, prefix); @@ -389,6 +454,24 @@ int cmd_replay(int argc, determine_replay_mode(repo, &revs.cmdline, onto_name, &advance_name, &onto, &update_refs); + /* Build reflog message */ + if (advance_name_opt) + strbuf_addf(&reflog_msg, "replay --advance %s", advance_name_opt); + else + strbuf_addf(&reflog_msg, "replay --onto %s", + oid_to_hex(&onto->object.oid)); + + /* Initialize ref transaction if using update mode */ + if (ref_mode == REF_ACTION_UPDATE) { + transaction = ref_store_transaction_begin(get_main_ref_store(repo), + 0, &transaction_err); + if (!transaction) { + ret = error(_("failed to begin ref transaction: %s"), + transaction_err.buf); + goto cleanup; + } + } + if (!onto) /* FIXME: Should handle replaying down to root commit */ die("Replaying down to root commit is not supported yet!"); @@ -434,10 +517,16 @@ int cmd_replay(int argc, if (decoration->type == DECORATION_REF_LOCAL && (contained || strset_contains(update_refs, decoration->name))) { - printf("update %s %s %s\n", - decoration->name, - oid_to_hex(&last_commit->object.oid), - oid_to_hex(&commit->object.oid)); + if (handle_ref_update(ref_mode, transaction, + decoration->name, + &last_commit->object.oid, + &commit->object.oid, + reflog_msg.buf, + &transaction_err) < 0) { + ret = error(_("failed to update ref '%s': %s"), + decoration->name, transaction_err.buf); + goto cleanup; + } } decoration = decoration->next; } @@ -445,10 +534,24 @@ int cmd_replay(int argc, /* In --advance mode, advance the target ref */ if (result.clean == 1 && advance_name) { - printf("update %s %s %s\n", - advance_name, - oid_to_hex(&last_commit->object.oid), - oid_to_hex(&onto->object.oid)); + if (handle_ref_update(ref_mode, transaction, advance_name, + &last_commit->object.oid, + &onto->object.oid, + reflog_msg.buf, + &transaction_err) < 0) { + ret = error(_("failed to update ref '%s': %s"), + advance_name, transaction_err.buf); + goto cleanup; + } + } + + /* Commit the ref transaction if we have one */ + if (transaction && result.clean == 1) { + if (ref_transaction_commit(transaction, &transaction_err)) { + ret = error(_("failed to commit ref transaction: %s"), + transaction_err.buf); + goto cleanup; + } } merge_finalize(&merge_opt, &result); @@ -460,6 +563,10 @@ int cmd_replay(int argc, ret = result.clean; cleanup: + if (transaction) + ref_transaction_free(transaction); + strbuf_release(&transaction_err); + strbuf_release(&reflog_msg); release_revisions(&revs); free(advance_name); diff --git a/builtin/repo.c b/builtin/repo.c index bbb0966f2d..f26640bd6e 100644 --- a/builtin/repo.c +++ b/builtin/repo.c @@ -3,19 +3,27 @@ #include "builtin.h" #include "environment.h" #include "parse-options.h" +#include "path-walk.h" +#include "progress.h" #include "quote.h" +#include "ref-filter.h" #include "refs.h" +#include "revision.h" #include "strbuf.h" +#include "string-list.h" #include "shallow.h" +#include "utf8.h" static const char *const repo_usage[] = { "git repo info [--format=(keyvalue|nul)] [-z] [<key>...]", + "git repo structure [--format=(table|keyvalue|nul)]", NULL }; typedef int get_value_fn(struct repository *repo, struct strbuf *buf); enum output_format { + FORMAT_TABLE, FORMAT_KEYVALUE, FORMAT_NUL_TERMINATED, }; @@ -130,14 +138,16 @@ static int parse_format_cb(const struct option *opt, *format = FORMAT_NUL_TERMINATED; else if (!strcmp(arg, "keyvalue")) *format = FORMAT_KEYVALUE; + else if (!strcmp(arg, "table")) + *format = FORMAT_TABLE; else die(_("invalid format '%s'"), arg); return 0; } -static int repo_info(int argc, const char **argv, const char *prefix, - struct repository *repo) +static int cmd_repo_info(int argc, const char **argv, const char *prefix, + struct repository *repo) { enum output_format format = FORMAT_KEYVALUE; struct option options[] = { @@ -152,16 +162,377 @@ static int repo_info(int argc, const char **argv, const char *prefix, }; argc = parse_options(argc, argv, prefix, options, repo_usage, 0); + if (format != FORMAT_KEYVALUE && format != FORMAT_NUL_TERMINATED) + die(_("unsupported output format")); return print_fields(argc, argv, repo, format); } +struct ref_stats { + size_t branches; + size_t remotes; + size_t tags; + size_t others; +}; + +struct object_stats { + size_t tags; + size_t commits; + size_t trees; + size_t blobs; +}; + +struct repo_structure { + struct ref_stats refs; + struct object_stats objects; +}; + +struct stats_table { + struct string_list rows; + + int name_col_width; + int value_col_width; +}; + +/* + * Holds column data that gets stored for each row. + */ +struct stats_table_entry { + char *value; +}; + +static void stats_table_vaddf(struct stats_table *table, + struct stats_table_entry *entry, + const char *format, va_list ap) +{ + struct strbuf buf = STRBUF_INIT; + struct string_list_item *item; + char *formatted_name; + int name_width; + + strbuf_vaddf(&buf, format, ap); + formatted_name = strbuf_detach(&buf, NULL); + name_width = utf8_strwidth(formatted_name); + + item = string_list_append_nodup(&table->rows, formatted_name); + item->util = entry; + + if (name_width > table->name_col_width) + table->name_col_width = name_width; + if (entry) { + int value_width = utf8_strwidth(entry->value); + if (value_width > table->value_col_width) + table->value_col_width = value_width; + } +} + +static void stats_table_addf(struct stats_table *table, const char *format, ...) +{ + va_list ap; + + va_start(ap, format); + stats_table_vaddf(table, NULL, format, ap); + va_end(ap); +} + +static void stats_table_count_addf(struct stats_table *table, size_t value, + const char *format, ...) +{ + struct stats_table_entry *entry; + va_list ap; + + CALLOC_ARRAY(entry, 1); + entry->value = xstrfmt("%" PRIuMAX, (uintmax_t)value); + + va_start(ap, format); + stats_table_vaddf(table, entry, format, ap); + va_end(ap); +} + +static inline size_t get_total_reference_count(struct ref_stats *stats) +{ + return stats->branches + stats->remotes + stats->tags + stats->others; +} + +static inline size_t get_total_object_count(struct object_stats *stats) +{ + return stats->tags + stats->commits + stats->trees + stats->blobs; +} + +static void stats_table_setup_structure(struct stats_table *table, + struct repo_structure *stats) +{ + struct object_stats *objects = &stats->objects; + struct ref_stats *refs = &stats->refs; + size_t object_total; + size_t ref_total; + + ref_total = get_total_reference_count(refs); + stats_table_addf(table, "* %s", _("References")); + stats_table_count_addf(table, ref_total, " * %s", _("Count")); + stats_table_count_addf(table, refs->branches, " * %s", _("Branches")); + stats_table_count_addf(table, refs->tags, " * %s", _("Tags")); + stats_table_count_addf(table, refs->remotes, " * %s", _("Remotes")); + stats_table_count_addf(table, refs->others, " * %s", _("Others")); + + object_total = get_total_object_count(objects); + stats_table_addf(table, ""); + stats_table_addf(table, "* %s", _("Reachable objects")); + stats_table_count_addf(table, object_total, " * %s", _("Count")); + stats_table_count_addf(table, objects->commits, " * %s", _("Commits")); + stats_table_count_addf(table, objects->trees, " * %s", _("Trees")); + stats_table_count_addf(table, objects->blobs, " * %s", _("Blobs")); + stats_table_count_addf(table, objects->tags, " * %s", _("Tags")); +} + +static void stats_table_print_structure(const struct stats_table *table) +{ + const char *name_col_title = _("Repository structure"); + const char *value_col_title = _("Value"); + int name_col_width = utf8_strwidth(name_col_title); + int value_col_width = utf8_strwidth(value_col_title); + struct string_list_item *item; + + if (table->name_col_width > name_col_width) + name_col_width = table->name_col_width; + if (table->value_col_width > value_col_width) + value_col_width = table->value_col_width; + + printf("| %-*s | %-*s |\n", name_col_width, name_col_title, + value_col_width, value_col_title); + printf("| "); + for (int i = 0; i < name_col_width; i++) + putchar('-'); + printf(" | "); + for (int i = 0; i < value_col_width; i++) + putchar('-'); + printf(" |\n"); + + for_each_string_list_item(item, &table->rows) { + struct stats_table_entry *entry = item->util; + const char *value = ""; + + if (entry) { + struct stats_table_entry *entry = item->util; + value = entry->value; + } + + printf("| %-*s | %*s |\n", name_col_width, item->string, + value_col_width, value); + } +} + +static void stats_table_clear(struct stats_table *table) +{ + struct stats_table_entry *entry; + struct string_list_item *item; + + for_each_string_list_item(item, &table->rows) { + entry = item->util; + if (entry) + free(entry->value); + } + + string_list_clear(&table->rows, 1); +} + +static void structure_keyvalue_print(struct repo_structure *stats, + char key_delim, char value_delim) +{ + printf("references.branches.count%c%" PRIuMAX "%c", key_delim, + (uintmax_t)stats->refs.branches, value_delim); + printf("references.tags.count%c%" PRIuMAX "%c", key_delim, + (uintmax_t)stats->refs.tags, value_delim); + printf("references.remotes.count%c%" PRIuMAX "%c", key_delim, + (uintmax_t)stats->refs.remotes, value_delim); + printf("references.others.count%c%" PRIuMAX "%c", key_delim, + (uintmax_t)stats->refs.others, value_delim); + + printf("objects.commits.count%c%" PRIuMAX "%c", key_delim, + (uintmax_t)stats->objects.commits, value_delim); + printf("objects.trees.count%c%" PRIuMAX "%c", key_delim, + (uintmax_t)stats->objects.trees, value_delim); + printf("objects.blobs.count%c%" PRIuMAX "%c", key_delim, + (uintmax_t)stats->objects.blobs, value_delim); + printf("objects.tags.count%c%" PRIuMAX "%c", key_delim, + (uintmax_t)stats->objects.tags, value_delim); + + fflush(stdout); +} + +struct count_references_data { + struct ref_stats *stats; + struct rev_info *revs; + struct progress *progress; +}; + +static int count_references(const struct reference *ref, void *cb_data) +{ + struct count_references_data *data = cb_data; + struct ref_stats *stats = data->stats; + size_t ref_count; + + switch (ref_kind_from_refname(ref->name)) { + case FILTER_REFS_BRANCHES: + stats->branches++; + break; + case FILTER_REFS_REMOTES: + stats->remotes++; + break; + case FILTER_REFS_TAGS: + stats->tags++; + break; + case FILTER_REFS_OTHERS: + stats->others++; + break; + default: + BUG("unexpected reference type"); + } + + /* + * While iterating through references for counting, also add OIDs in + * preparation for the path walk. + */ + add_pending_oid(data->revs, NULL, ref->oid, 0); + + ref_count = get_total_reference_count(stats); + display_progress(data->progress, ref_count); + + return 0; +} + +static void structure_count_references(struct ref_stats *stats, + struct rev_info *revs, + struct repository *repo, + int show_progress) +{ + struct count_references_data data = { + .stats = stats, + .revs = revs, + }; + + if (show_progress) + data.progress = start_delayed_progress(repo, + _("Counting references"), 0); + + refs_for_each_ref(get_main_ref_store(repo), count_references, &data); + stop_progress(&data.progress); +} + +struct count_objects_data { + struct object_stats *stats; + struct progress *progress; +}; + +static int count_objects(const char *path UNUSED, struct oid_array *oids, + enum object_type type, void *cb_data) +{ + struct count_objects_data *data = cb_data; + struct object_stats *stats = data->stats; + size_t object_count; + + switch (type) { + case OBJ_TAG: + stats->tags += oids->nr; + break; + case OBJ_COMMIT: + stats->commits += oids->nr; + break; + case OBJ_TREE: + stats->trees += oids->nr; + break; + case OBJ_BLOB: + stats->blobs += oids->nr; + break; + default: + BUG("invalid object type"); + } + + object_count = get_total_object_count(stats); + display_progress(data->progress, object_count); + + return 0; +} + +static void structure_count_objects(struct object_stats *stats, + struct rev_info *revs, + struct repository *repo, int show_progress) +{ + struct path_walk_info info = PATH_WALK_INFO_INIT; + struct count_objects_data data = { + .stats = stats, + }; + + info.revs = revs; + info.path_fn = count_objects; + info.path_fn_data = &data; + + if (show_progress) + data.progress = start_delayed_progress(repo, _("Counting objects"), 0); + + walk_objects_by_path(&info); + path_walk_info_clear(&info); + stop_progress(&data.progress); +} + +static int cmd_repo_structure(int argc, const char **argv, const char *prefix, + struct repository *repo) +{ + struct stats_table table = { + .rows = STRING_LIST_INIT_DUP, + }; + enum output_format format = FORMAT_TABLE; + struct repo_structure stats = { 0 }; + struct rev_info revs; + int show_progress = -1; + struct option options[] = { + OPT_CALLBACK_F(0, "format", &format, N_("format"), + N_("output format"), + PARSE_OPT_NONEG, parse_format_cb), + OPT_BOOL(0, "progress", &show_progress, N_("show progress")), + OPT_END() + }; + + argc = parse_options(argc, argv, prefix, options, repo_usage, 0); + if (argc) + usage(_("too many arguments")); + + repo_init_revisions(repo, &revs, prefix); + + if (show_progress < 0) + show_progress = isatty(2); + + structure_count_references(&stats.refs, &revs, repo, show_progress); + structure_count_objects(&stats.objects, &revs, repo, show_progress); + + switch (format) { + case FORMAT_TABLE: + stats_table_setup_structure(&table, &stats); + stats_table_print_structure(&table); + break; + case FORMAT_KEYVALUE: + structure_keyvalue_print(&stats, '=', '\n'); + break; + case FORMAT_NUL_TERMINATED: + structure_keyvalue_print(&stats, '\n', '\0'); + break; + default: + BUG("invalid output format"); + } + + stats_table_clear(&table); + release_revisions(&revs); + + return 0; +} + int cmd_repo(int argc, const char **argv, const char *prefix, struct repository *repo) { parse_opt_subcommand_fn *fn = NULL; struct option options[] = { - OPT_SUBCOMMAND("info", &fn, repo_info), + OPT_SUBCOMMAND("info", &fn, cmd_repo_info), + OPT_SUBCOMMAND("structure", &fn, cmd_repo_structure), OPT_END() }; diff --git a/builtin/rev-parse.c b/builtin/rev-parse.c index 7b3711cf34..9032cc6327 100644 --- a/builtin/rev-parse.c +++ b/builtin/rev-parse.c @@ -217,19 +217,17 @@ static int show_default(void) return 0; } -static int show_reference(const char *refname, const char *referent UNUSED, const struct object_id *oid, - int flag UNUSED, void *cb_data UNUSED) +static int show_reference(const struct reference *ref, void *cb_data UNUSED) { - if (ref_excluded(&ref_excludes, refname)) + if (ref_excluded(&ref_excludes, ref->name)) return 0; - show_rev(NORMAL, oid, refname); + show_rev(NORMAL, ref->oid, ref->name); return 0; } -static int anti_reference(const char *refname, const char *referent UNUSED, const struct object_id *oid, - int flag UNUSED, void *cb_data UNUSED) +static int anti_reference(const struct reference *ref, void *cb_data UNUSED) { - show_rev(REVERSED, oid, refname); + show_rev(REVERSED, ref->oid, ref->name); return 0; } diff --git a/builtin/show-branch.c b/builtin/show-branch.c index 441babf2e3..10475a6b5e 100644 --- a/builtin/show-branch.c +++ b/builtin/show-branch.c @@ -413,34 +413,32 @@ static int append_ref(const char *refname, const struct object_id *oid, return 0; } -static int append_head_ref(const char *refname, const char *referent UNUSED, const struct object_id *oid, - int flag UNUSED, void *cb_data UNUSED) +static int append_head_ref(const struct reference *ref, void *cb_data UNUSED) { struct object_id tmp; int ofs = 11; - if (!starts_with(refname, "refs/heads/")) + if (!starts_with(ref->name, "refs/heads/")) return 0; /* If both heads/foo and tags/foo exists, get_sha1 would * get confused. */ - if (repo_get_oid(the_repository, refname + ofs, &tmp) || !oideq(&tmp, oid)) + if (repo_get_oid(the_repository, ref->name + ofs, &tmp) || !oideq(&tmp, ref->oid)) ofs = 5; - return append_ref(refname + ofs, oid, 0); + return append_ref(ref->name + ofs, ref->oid, 0); } -static int append_remote_ref(const char *refname, const char *referent UNUSED, const struct object_id *oid, - int flag UNUSED, void *cb_data UNUSED) +static int append_remote_ref(const struct reference *ref, void *cb_data UNUSED) { struct object_id tmp; int ofs = 13; - if (!starts_with(refname, "refs/remotes/")) + if (!starts_with(ref->name, "refs/remotes/")) return 0; /* If both heads/foo and tags/foo exists, get_sha1 would * get confused. */ - if (repo_get_oid(the_repository, refname + ofs, &tmp) || !oideq(&tmp, oid)) + if (repo_get_oid(the_repository, ref->name + ofs, &tmp) || !oideq(&tmp, ref->oid)) ofs = 5; - return append_ref(refname + ofs, oid, 0); + return append_ref(ref->name + ofs, ref->oid, 0); } static int append_tag_ref(const char *refname, const struct object_id *oid, @@ -454,27 +452,26 @@ static int append_tag_ref(const char *refname, const struct object_id *oid, static const char *match_ref_pattern = NULL; static int match_ref_slash = 0; -static int append_matching_ref(const char *refname, const char *referent UNUSED, const struct object_id *oid, - int flag, void *cb_data) +static int append_matching_ref(const struct reference *ref, void *cb_data) { /* we want to allow pattern hold/<asterisk> to show all * branches under refs/heads/hold/, and v0.99.9? to show * refs/tags/v0.99.9a and friends. */ const char *tail; - int slash = count_slashes(refname); - for (tail = refname; *tail && match_ref_slash < slash; ) + int slash = count_slashes(ref->name); + for (tail = ref->name; *tail && match_ref_slash < slash; ) if (*tail++ == '/') slash--; if (!*tail) return 0; if (wildmatch(match_ref_pattern, tail, 0)) return 0; - if (starts_with(refname, "refs/heads/")) - return append_head_ref(refname, NULL, oid, flag, cb_data); - if (starts_with(refname, "refs/tags/")) - return append_tag_ref(refname, oid, flag, cb_data); - return append_ref(refname, oid, 0); + if (starts_with(ref->name, "refs/heads/")) + return append_head_ref(ref, cb_data); + if (starts_with(ref->name, "refs/tags/")) + return append_tag_ref(ref->name, ref->oid, ref->flags, cb_data); + return append_ref(ref->name, ref->oid, 0); } static void snarf_refs(int head, int remotes) diff --git a/builtin/show-ref.c b/builtin/show-ref.c index 0b6f9edf86..4d4984e4e0 100644 --- a/builtin/show-ref.c +++ b/builtin/show-ref.c @@ -31,31 +31,31 @@ struct show_one_options { }; static void show_one(const struct show_one_options *opts, - const char *refname, const struct object_id *oid) + const struct reference *ref) { const char *hex; struct object_id peeled; - if (!odb_has_object(the_repository->objects, oid, + if (!odb_has_object(the_repository->objects, ref->oid, HAS_OBJECT_RECHECK_PACKED | HAS_OBJECT_FETCH_PROMISOR)) - die("git show-ref: bad ref %s (%s)", refname, - oid_to_hex(oid)); + die("git show-ref: bad ref %s (%s)", ref->name, + oid_to_hex(ref->oid)); if (opts->quiet) return; - hex = repo_find_unique_abbrev(the_repository, oid, opts->abbrev); + hex = repo_find_unique_abbrev(the_repository, ref->oid, opts->abbrev); if (opts->hash_only) printf("%s\n", hex); else - printf("%s %s\n", hex, refname); + printf("%s %s\n", hex, ref->name); if (!opts->deref_tags) return; - if (!peel_iterated_oid(the_repository, oid, &peeled)) { + if (!reference_get_peeled_oid(the_repository, ref, &peeled)) { hex = repo_find_unique_abbrev(the_repository, &peeled, opts->abbrev); - printf("%s %s^{}\n", hex, refname); + printf("%s %s^{}\n", hex, ref->name); } } @@ -66,26 +66,25 @@ struct show_ref_data { int show_head; }; -static int show_ref(const char *refname, const char *referent UNUSED, const struct object_id *oid, - int flag UNUSED, void *cbdata) +static int show_ref(const struct reference *ref, void *cbdata) { struct show_ref_data *data = cbdata; - if (data->show_head && !strcmp(refname, "HEAD")) + if (data->show_head && !strcmp(ref->name, "HEAD")) goto match; if (data->patterns) { - int reflen = strlen(refname); + int reflen = strlen(ref->name); const char **p = data->patterns, *m; while ((m = *p++) != NULL) { int len = strlen(m); if (len > reflen) continue; - if (memcmp(m, refname + reflen - len, len)) + if (memcmp(m, ref->name + reflen - len, len)) continue; if (len == reflen) goto match; - if (refname[reflen - len - 1] == '/') + if (ref->name[reflen - len - 1] == '/') goto match; } return 0; @@ -94,18 +93,15 @@ static int show_ref(const char *refname, const char *referent UNUSED, const stru match: data->found_match++; - show_one(data->show_one_opts, refname, oid); + show_one(data->show_one_opts, ref); return 0; } -static int add_existing(const char *refname, - const char *referent UNUSED, - const struct object_id *oid UNUSED, - int flag UNUSED, void *cbdata) +static int add_existing(const struct reference *ref, void *cbdata) { struct string_list *list = (struct string_list *)cbdata; - string_list_insert(list, refname); + string_list_insert(list, ref->name); return 0; } @@ -179,12 +175,18 @@ static int cmd_show_ref__verify(const struct show_one_options *show_one_opts, if ((starts_with(*refs, "refs/") || refname_is_safe(*refs)) && !refs_read_ref(get_main_ref_store(the_repository), *refs, &oid)) { - show_one(show_one_opts, *refs, &oid); - } - else if (!show_one_opts->quiet) + struct reference ref = { + .name = *refs, + .oid = &oid, + }; + + show_one(show_one_opts, &ref); + } else if (!show_one_opts->quiet) { die("'%s' - not a valid ref", *refs); - else + } else { return 1; + } + refs++; } diff --git a/builtin/submodule--helper.c b/builtin/submodule--helper.c index fcd73abe53..35f6cf735e 100644 --- a/builtin/submodule--helper.c +++ b/builtin/submodule--helper.c @@ -593,16 +593,12 @@ static void print_status(unsigned int flags, char state, const char *path, printf("\n"); } -static int handle_submodule_head_ref(const char *refname UNUSED, - const char *referent UNUSED, - const struct object_id *oid, - int flags UNUSED, - void *cb_data) +static int handle_submodule_head_ref(const struct reference *ref, void *cb_data) { struct object_id *output = cb_data; - if (oid) - oidcpy(output, oid); + if (ref->oid) + oidcpy(output, ref->oid); return 0; } diff --git a/builtin/tag.c b/builtin/tag.c index f0665af3ac..01eba90c5c 100644 --- a/builtin/tag.c +++ b/builtin/tag.c @@ -153,7 +153,7 @@ static int verify_tag(const char *name, const char *ref UNUSED, return -1; if (format->format) - pretty_print_ref(name, oid, format); + pretty_print_ref(name, oid, NULL, format); return 0; } diff --git a/builtin/verify-tag.c b/builtin/verify-tag.c index cd6bc11095..558121eaa1 100644 --- a/builtin/verify-tag.c +++ b/builtin/verify-tag.c @@ -67,7 +67,7 @@ int cmd_verify_tag(int argc, } if (format.format) - pretty_print_ref(name, &oid, &format); + pretty_print_ref(name, &oid, NULL, &format); } return had_error; } diff --git a/builtin/worktree.c b/builtin/worktree.c index 812774a5ca..b7f323b5e4 100644 --- a/builtin/worktree.c +++ b/builtin/worktree.c @@ -635,11 +635,7 @@ static void print_preparing_worktree_line(int detach, * * Returns 0 on failure and non-zero on success. */ -static int first_valid_ref(const char *refname UNUSED, - const char *referent UNUSED, - const struct object_id *oid UNUSED, - int flags UNUSED, - void *cb_data UNUSED) +static int first_valid_ref(const struct reference *ref UNUSED, void *cb_data UNUSED) { return 1; } diff --git a/ci/install-dependencies.sh b/ci/install-dependencies.sh index 50628ee2dd..6ee8216a05 100755 --- a/ci/install-dependencies.sh +++ b/ci/install-dependencies.sh @@ -109,7 +109,7 @@ macos-*) brew link --force gettext mkdir -p "$CUSTOM_PATH" - wget -q "$P4WHENCE/bin.macosx1015x86_64/helix-core-server.tgz" && + wget -q "$P4WHENCE/bin.macosx12arm64/helix-core-server.tgz" && tar -xf helix-core-server.tgz -C "$CUSTOM_PATH" p4 p4d && sudo xattr -d com.apple.quarantine "$CUSTOM_PATH/p4" "$CUSTOM_PATH/p4d" 2>/dev/null || true rm helix-core-server.tgz diff --git a/commit-graph.c b/commit-graph.c index 474454db73..80be2ff2c3 100644 --- a/commit-graph.c +++ b/commit-graph.c @@ -1851,18 +1851,16 @@ struct refs_cb_data { struct progress *progress; }; -static int add_ref_to_set(const char *refname UNUSED, - const char *referent UNUSED, - const struct object_id *oid, - int flags UNUSED, void *cb_data) +static int add_ref_to_set(const struct reference *ref, void *cb_data) { + const struct object_id *maybe_peeled = ref->oid; struct object_id peeled; struct refs_cb_data *data = (struct refs_cb_data *)cb_data; - if (!peel_iterated_oid(data->repo, oid, &peeled)) - oid = &peeled; - if (odb_read_object_info(data->repo->objects, oid, NULL) == OBJ_COMMIT) - oidset_insert(data->commits, oid); + if (!reference_get_peeled_oid(data->repo, ref, &peeled)) + maybe_peeled = &peeled; + if (odb_read_object_info(data->repo->objects, maybe_peeled, NULL) == OBJ_COMMIT) + oidset_insert(data->commits, maybe_peeled); display_progress(data->progress, oidset_size(data->commits)); diff --git a/commit-reach.c b/commit-reach.c index a339e41aa4..cc18c86d3b 100644 --- a/commit-reach.c +++ b/commit-reach.c @@ -60,6 +60,7 @@ static int paint_down_to_common(struct repository *r, struct prio_queue queue = { compare_commits_by_gen_then_commit_date }; int i; timestamp_t last_gen = GENERATION_NUMBER_INFINITY; + struct commit_list **tail = result; if (!min_generation && !corrected_commit_dates_enabled(r)) queue.compare = compare_commits_by_commit_date; @@ -95,7 +96,7 @@ static int paint_down_to_common(struct repository *r, if (flags == (PARENT1 | PARENT2)) { if (!(commit->object.flags & RESULT)) { commit->object.flags |= RESULT; - commit_list_insert_by_date(commit, result); + tail = commit_list_append(commit, tail); } /* Mark parents of a found merge stale */ flags |= STALE; @@ -128,6 +129,7 @@ static int paint_down_to_common(struct repository *r, } clear_prio_queue(&queue); + commit_list_sort_by_date(result); return 0; } @@ -136,7 +138,7 @@ static int merge_bases_many(struct repository *r, struct commit **twos, struct commit_list **result) { - struct commit_list *list = NULL; + struct commit_list *list = NULL, **tail = result; int i; for (i = 0; i < n; i++) { @@ -171,8 +173,9 @@ static int merge_bases_many(struct repository *r, while (list) { struct commit *commit = pop_commit(&list); if (!(commit->object.flags & STALE)) - commit_list_insert_by_date(commit, result); + tail = commit_list_append(commit, tail); } + commit_list_sort_by_date(result); return 0; } @@ -425,7 +428,7 @@ static int get_merge_bases_many_0(struct repository *r, int cleanup, struct commit_list **result) { - struct commit_list *list; + struct commit_list *list, **tail = result; struct commit **rslt; size_t cnt, i; int ret; @@ -461,7 +464,8 @@ static int get_merge_bases_many_0(struct repository *r, return -1; } for (i = 0; i < cnt; i++) - commit_list_insert_by_date(rslt[i], result); + tail = commit_list_append(rslt[i], tail); + commit_list_sort_by_date(result); free(rslt); return 0; } @@ -1278,7 +1278,7 @@ int git_config_string(char **dest, const char *var, const char *value) int git_config_pathname(char **dest, const char *var, const char *value) { - int is_optional; + bool is_optional; char *path; if (!value) diff --git a/contrib/contacts/meson.build b/contrib/contacts/meson.build index c8fdb35ed9..4ae6b32a03 100644 --- a/contrib/contacts/meson.build +++ b/contrib/contacts/meson.build @@ -50,6 +50,6 @@ if get_option('docs').contains('html') input: 'git-contacts.adoc', output: 'git-contacts.html', install: true, - install_dir: get_option('datadir') / 'doc/git-doc', + install_dir: htmldir, ) endif diff --git a/contrib/credential/libsecret/Makefile b/contrib/credential/libsecret/Makefile index 7cacc57681..9309cfb78c 100644 --- a/contrib/credential/libsecret/Makefile +++ b/contrib/credential/libsecret/Makefile @@ -10,6 +10,7 @@ gitexecdir ?= $(prefix)/libexec/git-core CC ?= gcc CFLAGS ?= -g -O2 -Wall PKG_CONFIG ?= pkg-config +INSTALL ?= install RM ?= rm -f INCS:=$(shell $(PKG_CONFIG) --cflags libsecret-1 glib-2.0) @@ -21,7 +22,11 @@ LIBS:=$(shell $(PKG_CONFIG) --libs libsecret-1 glib-2.0) git-credential-libsecret: git-credential-libsecret.o $(CC) $(CFLAGS) -o $@ $^ $(LDFLAGS) $(LIBS) +install: git-credential-libsecret + $(INSTALL) -d -m 755 $(DESTDIR)$(gitexecdir) + $(INSTALL) -m 755 $< $(DESTDIR)$(gitexecdir) + clean: $(RM) git-credential-libsecret git-credential-libsecret.o -.PHONY: all clean +.PHONY: all install clean diff --git a/contrib/credential/osxkeychain/Makefile b/contrib/credential/osxkeychain/Makefile index c7d9121022..9680717abe 100644 --- a/contrib/credential/osxkeychain/Makefile +++ b/contrib/credential/osxkeychain/Makefile @@ -9,6 +9,7 @@ gitexecdir ?= $(prefix)/libexec/git-core CC ?= gcc CFLAGS ?= -g -O2 -Wall +INSTALL ?= install RM ?= rm -f %.o: %.c @@ -18,7 +19,11 @@ git-credential-osxkeychain: git-credential-osxkeychain.o $(CC) $(CFLAGS) -o $@ $^ $(LDFLAGS) \ -framework Security -framework CoreFoundation +install: git-credential-osxkeychain + $(INSTALL) -d -m 755 $(DESTDIR)$(gitexecdir) + $(INSTALL) -m 755 $< $(DESTDIR)$(gitexecdir) + clean: $(RM) git-credential-osxkeychain git-credential-osxkeychain.o -.PHONY: all clean +.PHONY: all install clean diff --git a/contrib/credential/wincred/Makefile b/contrib/credential/wincred/Makefile index 5b795fc9fe..d92e721e24 100644 --- a/contrib/credential/wincred/Makefile +++ b/contrib/credential/wincred/Makefile @@ -4,20 +4,22 @@ all:: git-credential-wincred.exe -include ../../../config.mak.autogen -include ../../../config.mak -CC ?= gcc -RM ?= rm -f -CFLAGS ?= -O2 -Wall - prefix ?= /usr/local -libexecdir ?= $(prefix)/libexec/git-core +gitexecdir ?= $(prefix)/libexec/git-core +CC ?= gcc +CFLAGS ?= -O2 -Wall INSTALL ?= install +RM ?= rm -f -git-credential-wincred.exe : git-credential-wincred.c - $(LINK.c) $^ $(LOADLIBES) $(LDLIBS) -o $@ +git-credential-wincred.exe: git-credential-wincred.c + $(LINK.c) -o $@ $^ $(LDFLAGS) $(LDLIBS) install: git-credential-wincred.exe - $(INSTALL) -m 755 $^ $(libexecdir) + $(INSTALL) -d -m 755 $(DESTDIR)$(gitexecdir) + $(INSTALL) -m 755 $< $(DESTDIR)$(gitexecdir) clean: $(RM) git-credential-wincred.exe + +.PHONY: all install clean diff --git a/contrib/subtree/meson.build b/contrib/subtree/meson.build index 46cdbcc30c..161435abeb 100644 --- a/contrib/subtree/meson.build +++ b/contrib/subtree/meson.build @@ -68,6 +68,6 @@ if get_option('docs').contains('html') input: 'git-subtree.adoc', output: 'git-subtree.html', install: true, - install_dir: get_option('datadir') / 'doc/git-doc', + install_dir: htmldir, ) endif diff --git a/delta-islands.c b/delta-islands.c index 36c94799d6..7cfebc4162 100644 --- a/delta-islands.c +++ b/delta-islands.c @@ -390,8 +390,7 @@ static void add_ref_to_island(kh_str_t *remote_islands, const char *island_name, rl->hash += sha_core; } -static int find_island_for_ref(const char *refname, const char *referent UNUSED, const struct object_id *oid, - int flags UNUSED, void *cb) +static int find_island_for_ref(const struct reference *ref, void *cb) { struct island_load_data *ild = cb; @@ -406,7 +405,7 @@ static int find_island_for_ref(const char *refname, const char *referent UNUSED, /* walk backwards to get last-one-wins ordering */ for (i = ild->nr - 1; i >= 0; i--) { - if (!regexec(&ild->rx[i], refname, + if (!regexec(&ild->rx[i], ref->name, ARRAY_SIZE(matches), matches, 0)) break; } @@ -428,10 +427,10 @@ static int find_island_for_ref(const char *refname, const char *referent UNUSED, if (island_name.len) strbuf_addch(&island_name, '-'); - strbuf_add(&island_name, refname + match->rm_so, match->rm_eo - match->rm_so); + strbuf_add(&island_name, ref->name + match->rm_so, match->rm_eo - match->rm_so); } - add_ref_to_island(ild->remote_islands, island_name.buf, oid); + add_ref_to_island(ild->remote_islands, island_name.buf, ref->oid); strbuf_release(&island_name); return 0; } @@ -1351,7 +1351,7 @@ static void emit_diff_symbol_from_struct(struct diff_options *o, int len = eds->len; unsigned flags = eds->flags; - if (o->dry_run) + if (!o->file) return; switch (s) { @@ -3765,9 +3765,9 @@ static void builtin_diff(const char *name_a, if (o->word_diff) init_diff_words_data(&ecbdata, o, one, two); - if (o->dry_run) { + if (!o->file) { /* - * Unlike the !dry_run case, we need to ignore the + * Unlike the normal output case, we need to ignore the * return value from xdi_diff_outf() here, because * xdi_diff_outf() takes non-zero return from its * callback function as a sign of error and returns @@ -4423,7 +4423,6 @@ static void run_external_diff(const struct external_diff *pgm, { struct child_process cmd = CHILD_PROCESS_INIT; struct diff_queue_struct *q = &diff_queued_diff; - int quiet = !(o->output_format & DIFF_FORMAT_PATCH) || o->dry_run; int rc; /* @@ -4432,7 +4431,7 @@ static void run_external_diff(const struct external_diff *pgm, * external diff program lacks the ability to tell us whether * it's empty then we consider it non-empty without even asking. */ - if (!pgm->trust_exit_code && quiet) { + if (!pgm->trust_exit_code && !o->file) { o->found_changes = 1; return; } @@ -4457,7 +4456,10 @@ static void run_external_diff(const struct external_diff *pgm, diff_free_filespec_data(one); diff_free_filespec_data(two); cmd.use_shell = 1; - cmd.no_stdout = quiet; + if (!o->file) + cmd.no_stdout = 1; + else if (o->file != stdout) + cmd.out = xdup(fileno(o->file)); rc = run_command(&cmd); if (!pgm->trust_exit_code && rc == 0) o->found_changes = 1; @@ -4618,7 +4620,7 @@ static void run_diff_cmd(const struct external_diff *pgm, p->status == DIFF_STATUS_RENAMED) o->found_changes = 1; } else { - if (!o->dry_run) + if (o->file) fprintf(o->file, "* Unmerged path %s\n", name); o->found_changes = 1; } @@ -4985,6 +4987,8 @@ void diff_setup_done(struct diff_options *options) if (options->flags.quick) { options->output_format = DIFF_FORMAT_NO_OUTPUT; options->flags.exit_with_status = 1; + options->detect_rename = 0; + options->flags.find_copies_harder = 0; } /* @@ -6196,15 +6200,15 @@ static void diff_flush_patch(struct diff_filepair *p, struct diff_options *o) /* return 1 if any change is found; otherwise, return 0 */ static int diff_flush_patch_quietly(struct diff_filepair *p, struct diff_options *o) { - int saved_dry_run = o->dry_run; + FILE *saved_file = o->file; int saved_found_changes = o->found_changes; int ret; - o->dry_run = 1; + o->file = NULL; o->found_changes = 0; diff_flush_patch(p, o); ret = o->found_changes; - o->dry_run = saved_dry_run; + o->file = saved_file; o->found_changes |= saved_found_changes; return ret; } @@ -6832,38 +6836,18 @@ void diff_flush(struct diff_options *options) DIFF_FORMAT_NAME | DIFF_FORMAT_NAME_STATUS | DIFF_FORMAT_CHECKDIFF)) { - /* - * make sure diff_Flush_patch_quietly() to be silent. - */ - FILE *dev_null = NULL; - int saved_color_moved = options->color_moved; - - if (options->flags.diff_from_contents) { - dev_null = xfopen("/dev/null", "w"); - options->color_moved = 0; - } for (i = 0; i < q->nr; i++) { struct diff_filepair *p = q->queue[i]; if (!check_pair_status(p)) continue; - if (options->flags.diff_from_contents) { - FILE *saved_file = options->file; - int found_changes; + if (options->flags.diff_from_contents && + !diff_flush_patch_quietly(p, options)) + continue; - options->file = dev_null; - found_changes = diff_flush_patch_quietly(p, options); - options->file = saved_file; - if (!found_changes) - continue; - } flush_one_pair(p, options); } - if (options->flags.diff_from_contents) { - fclose(dev_null); - options->color_moved = saved_color_moved; - } separator++; } @@ -6914,15 +6898,6 @@ void diff_flush(struct diff_options *options) if (output_format & DIFF_FORMAT_NO_OUTPUT && options->flags.exit_with_status && options->flags.diff_from_contents) { - /* - * run diff_flush_patch for the exit status. setting - * options->file to /dev/null should be safe, because we - * aren't supposed to produce any output anyway. - */ - diff_free_file(options); - options->file = xfopen("/dev/null", "w"); - options->close_file = 1; - options->color_moved = 0; for (i = 0; i < q->nr; i++) { struct diff_filepair *p = q->queue[i]; if (check_pair_status(p)) @@ -408,8 +408,6 @@ struct diff_options { #define COLOR_MOVED_WS_ERROR (1<<0) unsigned color_moved_ws_handling; - bool dry_run; - struct repository *repo; struct strmap *additional_path_headers; @@ -1388,18 +1388,25 @@ int match_pathname(const char *pathname, int pathlen, if (fspathncmp(pattern, name, prefix)) return 0; - pattern += prefix; - patternlen -= prefix; - name += prefix; - namelen -= prefix; /* * If the whole pattern did not have a wildcard, * then our prefix match is all we need; we * do not need to call fnmatch at all. */ - if (!patternlen && !namelen) + if (patternlen == prefix && namelen == prefix) return 1; + + /* + * Retain one character of the prefix to + * pass to fnmatch, which lets it distinguish + * the start of a directory component correctly. + */ + prefix--; + pattern += prefix; + patternlen -= prefix; + name += prefix; + namelen -= prefix; } return fnmatch_icase_mem(pattern, patternlen, diff --git a/fetch-pack.c b/fetch-pack.c index fe7a84bf2f..78c45d4a15 100644 --- a/fetch-pack.c +++ b/fetch-pack.c @@ -188,13 +188,9 @@ static int rev_list_insert_ref(struct fetch_negotiator *negotiator, return 0; } -static int rev_list_insert_ref_oid(const char *refname UNUSED, - const char *referent UNUSED, - const struct object_id *oid, - int flag UNUSED, - void *cb_data) +static int rev_list_insert_ref_oid(const struct reference *ref, void *cb_data) { - return rev_list_insert_ref(cb_data, oid); + return rev_list_insert_ref(cb_data, ref->oid); } enum ack_type { @@ -616,13 +612,9 @@ static int mark_complete(const struct object_id *oid) return 0; } -static int mark_complete_oid(const char *refname UNUSED, - const char *referent UNUSED, - const struct object_id *oid, - int flag UNUSED, - void *cb_data UNUSED) +static int mark_complete_oid(const struct reference *ref, void *cb_data UNUSED) { - return mark_complete(oid); + return mark_complete(ref->oid); } static void mark_recent_complete_commits(struct fetch_pack_args *args, diff --git a/generate-perl.sh b/generate-perl.sh index 65f122ebfc..796d835932 100755 --- a/generate-perl.sh +++ b/generate-perl.sh @@ -30,7 +30,7 @@ sed -e '1{' \ "$INPUT" >"$OUTPUT" case "$INPUT" in -*.perl) +*.perl|*git-contacts) chmod a+x "$OUTPUT";; *) ;; diff --git a/gpg-interface.c b/gpg-interface.c index d1e88da8c1..f680ed38c0 100644 --- a/gpg-interface.c +++ b/gpg-interface.c @@ -443,7 +443,7 @@ static void parse_ssh_output(struct signature_check *sigc) key = strstr(line, "key "); if (key) { - sigc->fingerprint = xstrdup(strstr(line, "key ") + 4); + sigc->fingerprint = xstrdup(key + 4); sigc->key = xstrdup(sigc->fingerprint); } else { /* @@ -879,7 +879,7 @@ static char *get_default_ssh_signing_key(void) n = split_cmdline(key_command, &argv); if (n < 0) - die("malformed build-time gpg.ssh.defaultKeyCommand: %s", + die(_("malformed build-time gpg.ssh.defaultKeyCommand: %s"), split_cmdline_strerror(n)); strvec_pushv(&ssh_default_key.args, argv); diff --git a/gpg-interface.h b/gpg-interface.h index 50487aa148..ead1ed6967 100644 --- a/gpg-interface.h +++ b/gpg-interface.h @@ -3,9 +3,9 @@ struct strbuf; -#define GPG_VERIFY_VERBOSE 1 -#define GPG_VERIFY_RAW 2 -#define GPG_VERIFY_OMIT_STATUS 4 +#define GPG_VERIFY_VERBOSE (1<<0) +#define GPG_VERIFY_RAW (1<<1) +#define GPG_VERIFY_OMIT_STATUS (1<<2) enum signature_trust_level { TRUST_UNDEFINED, @@ -851,18 +851,16 @@ struct similar_ref_cb { struct string_list *similar_refs; }; -static int append_similar_ref(const char *refname, const char *referent UNUSED, - const struct object_id *oid UNUSED, - int flags UNUSED, void *cb_data) +static int append_similar_ref(const struct reference *ref, void *cb_data) { struct similar_ref_cb *cb = (struct similar_ref_cb *)(cb_data); - char *branch = strrchr(refname, '/') + 1; + char *branch = strrchr(ref->name, '/') + 1; /* A remote branch of the same name is deemed similar */ - if (starts_with(refname, "refs/remotes/") && + if (starts_with(ref->name, "refs/remotes/") && !strcmp(branch, cb->base_ref)) string_list_append_nodup(cb->similar_refs, - refs_shorten_unambiguous_ref(get_main_ref_store(the_repository), refname, 1)); + refs_shorten_unambiguous_ref(get_main_ref_store(the_repository), ref->name, 1)); return 0; } diff --git a/http-backend.c b/http-backend.c index 52f0483dd3..273ed7266f 100644 --- a/http-backend.c +++ b/http-backend.c @@ -513,18 +513,17 @@ static void run_service(const char **argv, int buffer_input) exit(1); } -static int show_text_ref(const char *name, const char *referent UNUSED, const struct object_id *oid, - int flag UNUSED, void *cb_data) +static int show_text_ref(const struct reference *ref, void *cb_data) { - const char *name_nons = strip_namespace(name); + const char *name_nons = strip_namespace(ref->name); struct strbuf *buf = cb_data; - struct object *o = parse_object(the_repository, oid); + struct object *o = parse_object(the_repository, ref->oid); if (!o) return 0; - strbuf_addf(buf, "%s\t%s\n", oid_to_hex(oid), name_nons); + strbuf_addf(buf, "%s\t%s\n", oid_to_hex(ref->oid), name_nons); if (o->type == OBJ_TAG) { - o = deref_tag(the_repository, o, name, 0); + o = deref_tag(the_repository, o, ref->name, 0); if (!o) return 0; strbuf_addf(buf, "%s\t%s^{}\n", oid_to_hex(&o->oid), @@ -569,21 +568,20 @@ static void get_info_refs(struct strbuf *hdr, char *arg UNUSED) strbuf_release(&buf); } -static int show_head_ref(const char *refname, const char *referent UNUSED, const struct object_id *oid, - int flag, void *cb_data) +static int show_head_ref(const struct reference *ref, void *cb_data) { struct strbuf *buf = cb_data; - if (flag & REF_ISSYMREF) { + if (ref->flags & REF_ISSYMREF) { const char *target = refs_resolve_ref_unsafe(get_main_ref_store(the_repository), - refname, + ref->name, RESOLVE_REF_READING, NULL, NULL); if (target) strbuf_addf(buf, "ref: %s\n", strip_namespace(target)); } else { - strbuf_addf(buf, "%s\n", oid_to_hex(oid)); + strbuf_addf(buf, "%s\n", oid_to_hex(ref->oid)); } return 0; diff --git a/http-push.c b/http-push.c index a1c01e3b9b..d86ce77119 100644 --- a/http-push.c +++ b/http-push.c @@ -104,7 +104,7 @@ struct repo { int has_info_refs; int can_update_info_refs; int has_info_packs; - struct packed_git *packs; + struct packfile_list packs; struct remote_lock *locks; }; @@ -311,7 +311,7 @@ static void start_fetch_packed(struct transfer_request *request) struct transfer_request *check_request = request_queue_head; struct http_pack_request *preq; - target = find_oid_pack(&request->obj->oid, repo->packs); + target = packfile_list_find_oid(repo->packs.head, &request->obj->oid); if (!target) { fprintf(stderr, "Unable to fetch %s, will not be able to update server info refs\n", oid_to_hex(&request->obj->oid)); repo->can_update_info_refs = 0; @@ -683,7 +683,7 @@ static int add_send_request(struct object *obj, struct remote_lock *lock) get_remote_object_list(obj->oid.hash[0]); if (obj->flags & (REMOTE | PUSHING)) return 0; - target = find_oid_pack(&obj->oid, repo->packs); + target = packfile_list_find_oid(repo->packs.head, &obj->oid); if (target) { obj->flags |= REMOTE; return 0; diff --git a/http-walker.c b/http-walker.c index 0f7ae46d7f..e886e64866 100644 --- a/http-walker.c +++ b/http-walker.c @@ -15,7 +15,7 @@ struct alt_base { char *base; int got_indices; - struct packed_git *packs; + struct packfile_list packs; struct alt_base *next; }; @@ -324,11 +324,8 @@ static void process_alternates_response(void *callback_data) } else if (is_alternate_allowed(target.buf)) { warning("adding alternate object store: %s", target.buf); - newalt = xmalloc(sizeof(*newalt)); - newalt->next = NULL; + CALLOC_ARRAY(newalt, 1); newalt->base = strbuf_detach(&target, NULL); - newalt->got_indices = 0; - newalt->packs = NULL; while (tail->next != NULL) tail = tail->next; @@ -435,7 +432,7 @@ static int http_fetch_pack(struct walker *walker, struct alt_base *repo, if (fetch_indices(walker, repo)) return -1; - target = find_oid_pack(oid, repo->packs); + target = packfile_list_find_oid(repo->packs.head, oid); if (!target) return -1; close_pack_index(target); @@ -584,17 +581,15 @@ static void cleanup(struct walker *walker) if (data) { alt = data->alt; while (alt) { - struct packed_git *pack; + struct packfile_list_entry *e; alt_next = alt->next; - pack = alt->packs; - while (pack) { - struct packed_git *pack_next = pack->next; - close_pack(pack); - free(pack); - pack = pack_next; + for (e = alt->packs.head; e; e = e->next) { + close_pack(e->pack); + free(e->pack); } + packfile_list_clear(&alt->packs); free(alt->base); free(alt); @@ -612,14 +607,11 @@ struct walker *get_http_walker(const char *url) struct walker_data *data = xmalloc(sizeof(struct walker_data)); struct walker *walker = xmalloc(sizeof(struct walker)); - data->alt = xmalloc(sizeof(*data->alt)); + CALLOC_ARRAY(data->alt, 1); data->alt->base = xstrdup(url); for (s = data->alt->base + strlen(data->alt->base) - 1; *s == '/'; --s) *s = 0; - data->alt->got_indices = 0; - data->alt->packs = NULL; - data->alt->next = NULL; data->got_alternates = -1; walker->corrupt_object_found = 0; @@ -2413,8 +2413,9 @@ static char *fetch_pack_index(unsigned char *hash, const char *base_url) return tmp; } -static int fetch_and_setup_pack_index(struct packed_git **packs_head, - unsigned char *sha1, const char *base_url) +static int fetch_and_setup_pack_index(struct packfile_list *packs, + unsigned char *sha1, + const char *base_url) { struct packed_git *new_pack, *p; char *tmp_idx = NULL; @@ -2448,12 +2449,11 @@ static int fetch_and_setup_pack_index(struct packed_git **packs_head, if (ret) return -1; - new_pack->next = *packs_head; - *packs_head = new_pack; + packfile_list_prepend(packs, new_pack); return 0; } -int http_get_info_packs(const char *base_url, struct packed_git **packs_head) +int http_get_info_packs(const char *base_url, struct packfile_list *packs) { struct http_get_options options = {0}; int ret = 0; @@ -2477,7 +2477,7 @@ int http_get_info_packs(const char *base_url, struct packed_git **packs_head) !parse_oid_hex(data, &oid, &data) && skip_prefix(data, ".pack", &data) && (*data == '\n' || *data == '\0')) { - fetch_and_setup_pack_index(packs_head, oid.hash, base_url); + fetch_and_setup_pack_index(packs, oid.hash, base_url); } else { data = strchrnul(data, '\n'); } @@ -2541,14 +2541,9 @@ cleanup: } void http_install_packfile(struct packed_git *p, - struct packed_git **list_to_remove_from) + struct packfile_list *list_to_remove_from) { - struct packed_git **lst = list_to_remove_from; - - while (*lst != p) - lst = &((*lst)->next); - *lst = (*lst)->next; - + packfile_list_remove(list_to_remove_from, p); packfile_store_add_pack(the_repository->objects->packfiles, p); } @@ -2,6 +2,7 @@ #define HTTP_H struct packed_git; +struct packfile_list; #include "git-zlib.h" @@ -190,7 +191,7 @@ struct curl_slist *http_append_auth_header(const struct credential *c, /* Helpers for fetching packs */ int http_get_info_packs(const char *base_url, - struct packed_git **packs_head); + struct packfile_list *packs); /* Helper for getting Accept-Language header */ const char *http_get_accept_language_header(void); @@ -226,7 +227,7 @@ void release_http_pack_request(struct http_pack_request *preq); * from http_get_info_packs() and have chosen a specific pack to fetch. */ void http_install_packfile(struct packed_git *p, - struct packed_git **list_to_remove_from); + struct packfile_list *list_to_remove_from); /* Helpers for fetching object */ struct http_object_request { diff --git a/log-tree.c b/log-tree.c index 7d917f2a83..1729b0c201 100644 --- a/log-tree.c +++ b/log-tree.c @@ -147,9 +147,7 @@ static int ref_filter_match(const char *refname, return 1; } -static int add_ref_decoration(const char *refname, const char *referent UNUSED, const struct object_id *oid, - int flags UNUSED, - void *cb_data) +static int add_ref_decoration(const struct reference *ref, void *cb_data) { int i; struct object *obj; @@ -158,16 +156,16 @@ static int add_ref_decoration(const char *refname, const char *referent UNUSED, struct decoration_filter *filter = (struct decoration_filter *)cb_data; const char *git_replace_ref_base = ref_namespace[NAMESPACE_REPLACE].ref; - if (filter && !ref_filter_match(refname, filter)) + if (filter && !ref_filter_match(ref->name, filter)) return 0; - if (starts_with(refname, git_replace_ref_base)) { + if (starts_with(ref->name, git_replace_ref_base)) { struct object_id original_oid; if (!replace_refs_enabled(the_repository)) return 0; - if (get_oid_hex(refname + strlen(git_replace_ref_base), + if (get_oid_hex(ref->name + strlen(git_replace_ref_base), &original_oid)) { - warning("invalid replace ref %s", refname); + warning("invalid replace ref %s", ref->name); return 0; } obj = parse_object(the_repository, &original_oid); @@ -176,10 +174,10 @@ static int add_ref_decoration(const char *refname, const char *referent UNUSED, return 0; } - objtype = odb_read_object_info(the_repository->objects, oid, NULL); + objtype = odb_read_object_info(the_repository->objects, ref->oid, NULL); if (objtype < 0) return 0; - obj = lookup_object_by_type(the_repository, oid, objtype); + obj = lookup_object_by_type(the_repository, ref->oid, objtype); for (i = 0; i < ARRAY_SIZE(ref_namespace); i++) { struct ref_namespace_info *info = &ref_namespace[i]; @@ -187,24 +185,24 @@ static int add_ref_decoration(const char *refname, const char *referent UNUSED, if (!info->decoration) continue; if (info->exact) { - if (!strcmp(refname, info->ref)) { + if (!strcmp(ref->name, info->ref)) { deco_type = info->decoration; break; } - } else if (starts_with(refname, info->ref)) { + } else if (starts_with(ref->name, info->ref)) { deco_type = info->decoration; break; } } - add_name_decoration(deco_type, refname, obj); + add_name_decoration(deco_type, ref->name, obj); while (obj->type == OBJ_TAG) { if (!obj->parsed) parse_object(the_repository, &obj->oid); obj = ((struct tag *)obj)->tagged; if (!obj) break; - add_name_decoration(DECORATION_REF_TAG, refname, obj); + add_name_decoration(DECORATION_REF_TAG, ref->name, obj); } return 0; } @@ -75,42 +75,42 @@ struct ls_refs_data { unsigned unborn : 1; }; -static int send_ref(const char *refname, const char *referent UNUSED, const struct object_id *oid, - int flag, void *cb_data) +static int send_ref(const struct reference *ref, void *cb_data) { struct ls_refs_data *data = cb_data; - const char *refname_nons = strip_namespace(refname); + const char *refname_nons = strip_namespace(ref->name); strbuf_reset(&data->buf); - if (ref_is_hidden(refname_nons, refname, &data->hidden_refs)) + if (ref_is_hidden(refname_nons, ref->name, &data->hidden_refs)) return 0; if (!ref_match(&data->prefixes, refname_nons)) return 0; - if (oid) - strbuf_addf(&data->buf, "%s %s", oid_to_hex(oid), refname_nons); + if (ref->oid) + strbuf_addf(&data->buf, "%s %s", oid_to_hex(ref->oid), refname_nons); else strbuf_addf(&data->buf, "unborn %s", refname_nons); - if (data->symrefs && flag & REF_ISSYMREF) { + if (data->symrefs && ref->flags & REF_ISSYMREF) { + int unused_flag; struct object_id unused; const char *symref_target = refs_resolve_ref_unsafe(get_main_ref_store(the_repository), - refname, + ref->name, 0, &unused, - &flag); + &unused_flag); if (!symref_target) - die("'%s' is a symref but it is not?", refname); + die("'%s' is a symref but it is not?", ref->name); strbuf_addf(&data->buf, " symref-target:%s", strip_namespace(symref_target)); } - if (data->peel && oid) { + if (data->peel && ref->oid) { struct object_id peeled; - if (!peel_iterated_oid(the_repository, oid, &peeled)) + if (!reference_get_peeled_oid(the_repository, ref, &peeled)) strbuf_addf(&data->buf, " peeled:%s", oid_to_hex(&peeled)); } @@ -131,9 +131,17 @@ static void send_possibly_unborn_head(struct ls_refs_data *data) if (!refs_resolve_ref_unsafe(get_main_ref_store(the_repository), namespaced.buf, 0, &oid, &flag)) return; /* bad ref */ oid_is_null = is_null_oid(&oid); + if (!oid_is_null || - (data->unborn && data->symrefs && (flag & REF_ISSYMREF))) - send_ref(namespaced.buf, NULL, oid_is_null ? NULL : &oid, flag, data); + (data->unborn && data->symrefs && (flag & REF_ISSYMREF))) { + struct reference ref = { + .name = namespaced.buf, + .oid = oid_is_null ? NULL : &oid, + .flags = flag, + }; + + send_ref(&ref, data); + } strbuf_release(&namespaced); } diff --git a/meson.build b/meson.build index 2b763f7c53..1f95a06edb 100644 --- a/meson.build +++ b/meson.build @@ -768,13 +768,18 @@ if test_output_directory == '' test_output_directory = meson.project_build_root() / 'test-output' endif +htmldir = get_option('htmldir') +if htmldir == '' + htmldir = get_option('datadir') / 'doc/git-doc' +endif + # These variables are used for building libgit.a. libgit_c_args = [ '-DBINDIR="' + get_option('bindir') + '"', '-DDEFAULT_GIT_TEMPLATE_DIR="' + get_option('datadir') / 'git-core/templates' + '"', '-DFALLBACK_RUNTIME_PREFIX="' + get_option('prefix') + '"', '-DGIT_HOST_CPU="' + host_machine.cpu_family() + '"', - '-DGIT_HTML_PATH="' + get_option('datadir') / 'doc/git-doc"', + '-DGIT_HTML_PATH="' + htmldir + '"', '-DGIT_INFO_PATH="' + get_option('infodir') + '"', '-DGIT_LOCALE_PATH="' + get_option('localedir') + '"', '-DGIT_MAN_PATH="' + get_option('mandir') + '"', diff --git a/meson_options.txt b/meson_options.txt index 143dee9237..e0be260ae1 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -1,4 +1,6 @@ # Configuration for Git installation +option('htmldir', type: 'string', value: '', + description: 'Directory to install HTML docs to. Defaults to <datadir>/doc/git-doc') option('perllibdir', type: 'string', value: '', description: 'Directory to install perl lib to. Defaults to <datadir>/perl5') diff --git a/midx-write.c b/midx-write.c index c73010df6d..23e61cb000 100644 --- a/midx-write.c +++ b/midx-write.c @@ -697,28 +697,27 @@ static void prepare_midx_packing_data(struct packing_data *pdata, trace2_region_leave("midx", "prepare_midx_packing_data", ctx->repo); } -static int add_ref_to_pending(const char *refname, const char *referent UNUSED, - const struct object_id *oid, - int flag, void *cb_data) +static int add_ref_to_pending(const struct reference *ref, void *cb_data) { struct rev_info *revs = (struct rev_info*)cb_data; + const struct object_id *maybe_peeled = ref->oid; struct object_id peeled; struct object *object; - if ((flag & REF_ISSYMREF) && (flag & REF_ISBROKEN)) { - warning("symbolic ref is dangling: %s", refname); + if ((ref->flags & REF_ISSYMREF) && (ref->flags & REF_ISBROKEN)) { + warning("symbolic ref is dangling: %s", ref->name); return 0; } - if (!peel_iterated_oid(revs->repo, oid, &peeled)) - oid = &peeled; + if (!reference_get_peeled_oid(revs->repo, ref, &peeled)) + maybe_peeled = &peeled; - object = parse_object_or_die(revs->repo, oid, refname); + object = parse_object_or_die(revs->repo, maybe_peeled, ref->name); if (object->type != OBJ_COMMIT) return 0; add_pending_object(revs, object, ""); - if (bitmap_is_preferred_refname(revs->repo, refname)) + if (bitmap_is_preferred_refname(revs->repo, ref->name)) object->flags |= NEEDS_BITMAP; return 0; } @@ -462,8 +462,6 @@ int prepare_midx_pack(struct multi_pack_index *m, m->pack_names[pack_int_id]); p = packfile_store_load_pack(r->objects->packfiles, pack_name.buf, m->source->local); - if (p) - list_add_tail(&p->mru, &r->objects->packfiles->mru); strbuf_release(&pack_name); if (!p) { diff --git a/negotiator/default.c b/negotiator/default.c index c479da9b09..116dedcf83 100644 --- a/negotiator/default.c +++ b/negotiator/default.c @@ -38,11 +38,10 @@ static void rev_list_push(struct negotiation_state *ns, } } -static int clear_marks(const char *refname, const char *referent UNUSED, const struct object_id *oid, - int flag UNUSED, - void *cb_data UNUSED) +static int clear_marks(const struct reference *ref, void *cb_data UNUSED) { - struct object *o = deref_tag(the_repository, parse_object(the_repository, oid), refname, 0); + struct object *o = deref_tag(the_repository, parse_object(the_repository, ref->oid), + ref->name, 0); if (o && o->type == OBJ_COMMIT) clear_commit_marks((struct commit *)o, diff --git a/negotiator/skipping.c b/negotiator/skipping.c index 616df6bf3a..0a272130fb 100644 --- a/negotiator/skipping.c +++ b/negotiator/skipping.c @@ -75,11 +75,10 @@ static struct entry *rev_list_push(struct data *data, struct commit *commit, int return entry; } -static int clear_marks(const char *refname, const char *referent UNUSED, const struct object_id *oid, - int flag UNUSED, - void *cb_data UNUSED) +static int clear_marks(const struct reference *ref, void *cb_data UNUSED) { - struct object *o = deref_tag(the_repository, parse_object(the_repository, oid), refname, 0); + struct object *o = deref_tag(the_repository, parse_object(the_repository, ref->oid), + ref->name, 0); if (o && o->type == OBJ_COMMIT) clear_commit_marks((struct commit *)o, @@ -938,13 +938,11 @@ out: return ret; } -static int string_list_add_one_ref(const char *refname, const char *referent UNUSED, - const struct object_id *oid UNUSED, - int flag UNUSED, void *cb) +static int string_list_add_one_ref(const struct reference *ref, void *cb) { struct string_list *refs = cb; - if (!unsorted_string_list_has_string(refs, refname)) - string_list_append(refs, refname); + if (!unsorted_string_list_has_string(refs, ref->name)) + string_list_append(refs, ref->name); return 0; } diff --git a/object-file.c b/object-file.c index 811c569ed3..84c9249dab 100644 --- a/object-file.c +++ b/object-file.c @@ -1620,7 +1620,11 @@ int index_path(struct index_state *istate, struct object_id *oid, strbuf_release(&sb); break; case S_IFDIR: - return repo_resolve_gitlink_ref(istate->repo, path, "HEAD", oid); + if (repo_resolve_gitlink_ref(istate->repo, path, "HEAD", oid)) + return error(_("'%s' does not have a commit checked out"), path); + if (&hash_algos[oid->algo] != istate->repo->hash_algo) + return error(_("cannot add a submodule of a different hash algorithm")); + break; default: return error(_("%s: unsupported file type"), path); } diff --git a/object-name.c b/object-name.c index 8ce0ef7c23..fed5de5153 100644 --- a/object-name.c +++ b/object-name.c @@ -1446,18 +1446,16 @@ struct handle_one_ref_cb { struct commit_list **list; }; -static int handle_one_ref(const char *path, const char *referent UNUSED, const struct object_id *oid, - int flag UNUSED, - void *cb_data) +static int handle_one_ref(const struct reference *ref, void *cb_data) { struct handle_one_ref_cb *cb = cb_data; struct commit_list **list = cb->list; - struct object *object = parse_object(cb->repo, oid); + struct object *object = parse_object(cb->repo, ref->oid); if (!object) return 0; if (object->type == OBJ_TAG) { - object = deref_tag(cb->repo, object, path, - strlen(path)); + object = deref_tag(cb->repo, object, ref->name, + strlen(ref->name)); if (!object) return 0; } @@ -209,7 +209,8 @@ struct object *lookup_object_by_type(struct repository *r, enum peel_status peel_object(struct repository *r, const struct object_id *name, - struct object_id *oid) + struct object_id *oid, + unsigned flags) { struct object *o = lookup_unknown_object(r, name); @@ -222,7 +223,20 @@ enum peel_status peel_object(struct repository *r, if (o->type != OBJ_TAG) return PEEL_NON_TAG; - o = deref_tag_noverify(r, o); + while (o && o->type == OBJ_TAG) { + o = parse_object(r, &o->oid); + if (o && o->type == OBJ_TAG && ((struct tag *)o)->tagged) { + o = ((struct tag *)o)->tagged; + + if (flags & PEEL_OBJECT_VERIFY_TAGGED_OBJECT_TYPE) { + int type = odb_read_object_info(r->objects, &o->oid, NULL); + if (type < 0 || !object_as_type(o, type, 0)) + return PEEL_INVALID; + } + } else { + o = NULL; + } + } if (!o) return PEEL_INVALID; @@ -75,11 +75,11 @@ void object_array_init(struct object_array *array); * http-push.c: 11-----14 * commit-graph.c: 15 * commit-reach.c: 16-----19 + * builtin/last-modified.c: 1617 * sha1-name.c: 20 * list-objects-filter.c: 21 * bloom.c: 2122 * builtin/fsck.c: 0--3 - * builtin/gc.c: 0 * builtin/index-pack.c: 2021 * reflog.c: 10--12 * builtin/show-branch.c: 0-------------------------------------------26 @@ -287,6 +287,17 @@ enum peel_status { PEEL_BROKEN = -4 }; +enum peel_object_flags { + /* + * Always verify the object type of the tagged object, even in the case + * where the looked-up object already has an object type. This can be + * useful when the tagged object type may be invalid. One such case is + * when looking up objects via tags, where we blindly trust the object + * type declared by the tag. + */ + PEEL_OBJECT_VERIFY_TAGGED_OBJECT_TYPE = (1 << 0), +}; + /* * Peel the named object; i.e., if the object is a tag, resolve the * tag recursively until a non-tag is found. If successful, store the @@ -295,7 +306,9 @@ enum peel_status { * and leave oid unchanged. */ enum peel_status peel_object(struct repository *r, - const struct object_id *name, struct object_id *oid); + const struct object_id *name, + struct object_id *oid, + unsigned flags); struct object_list *object_list_insert(struct object *item, struct object_list **list_p); diff --git a/pack-refs.c b/pack-refs.c index 1a5e07d8b8..eb6b2ba2c2 100644 --- a/pack-refs.c +++ b/pack-refs.c @@ -14,10 +14,10 @@ int pack_refs_core(int argc, { struct ref_exclusions excludes = REF_EXCLUSIONS_INIT; struct string_list included_refs = STRING_LIST_INIT_NODUP; - struct pack_refs_opts pack_refs_opts = { + struct refs_optimize_opts optimize_opts = { .exclusions = &excludes, .includes = &included_refs, - .flags = PACK_REFS_PRUNE, + .flags = REFS_OPTIMIZE_PRUNE, }; struct string_list option_excluded_refs = STRING_LIST_INIT_NODUP; struct string_list_item *item; @@ -26,9 +26,9 @@ int pack_refs_core(int argc, struct option opts[] = { OPT_BOOL(0, "all", &pack_all, N_("pack everything")), - OPT_BIT(0, "prune", &pack_refs_opts.flags, N_("prune loose refs (default)"), PACK_REFS_PRUNE), - OPT_BIT(0, "auto", &pack_refs_opts.flags, N_("auto-pack refs as needed"), PACK_REFS_AUTO), - OPT_STRING_LIST(0, "include", pack_refs_opts.includes, N_("pattern"), + OPT_BIT(0, "prune", &optimize_opts.flags, N_("prune loose refs (default)"), REFS_OPTIMIZE_PRUNE), + OPT_BIT(0, "auto", &optimize_opts.flags, N_("auto-pack refs as needed"), REFS_OPTIMIZE_AUTO), + OPT_STRING_LIST(0, "include", optimize_opts.includes, N_("pattern"), N_("references to include")), OPT_STRING_LIST(0, "exclude", &option_excluded_refs, N_("pattern"), N_("references to exclude")), @@ -39,15 +39,15 @@ int pack_refs_core(int argc, usage_with_options(usage_opts, opts); for_each_string_list_item(item, &option_excluded_refs) - add_ref_exclusion(pack_refs_opts.exclusions, item->string); + add_ref_exclusion(optimize_opts.exclusions, item->string); if (pack_all) - string_list_append(pack_refs_opts.includes, "*"); + string_list_append(optimize_opts.includes, "*"); - if (!pack_refs_opts.includes->nr) - string_list_append(pack_refs_opts.includes, "refs/tags/*"); + if (!optimize_opts.includes->nr) + string_list_append(optimize_opts.includes, "refs/tags/*"); - ret = refs_optimize(get_main_ref_store(repo), &pack_refs_opts); + ret = refs_optimize(get_main_ref_store(repo), &optimize_opts); clear_ref_exclusions(&excludes); string_list_clear(&included_refs, 0); diff --git a/packfile.c b/packfile.c index 40f733dd23..9cc11b6dc5 100644 --- a/packfile.c +++ b/packfile.c @@ -47,6 +47,89 @@ static size_t pack_mapped; #define SZ_FMT PRIuMAX static inline uintmax_t sz_fmt(size_t s) { return s; } +void packfile_list_clear(struct packfile_list *list) +{ + struct packfile_list_entry *e, *next; + + for (e = list->head; e; e = next) { + next = e->next; + free(e); + } + + list->head = list->tail = NULL; +} + +static struct packfile_list_entry *packfile_list_remove_internal(struct packfile_list *list, + struct packed_git *pack) +{ + struct packfile_list_entry *e, *prev; + + for (e = list->head, prev = NULL; e; prev = e, e = e->next) { + if (e->pack != pack) + continue; + + if (prev) + prev->next = e->next; + if (list->head == e) + list->head = e->next; + if (list->tail == e) + list->tail = prev; + + return e; + } + + return NULL; +} + +void packfile_list_remove(struct packfile_list *list, struct packed_git *pack) +{ + free(packfile_list_remove_internal(list, pack)); +} + +void packfile_list_prepend(struct packfile_list *list, struct packed_git *pack) +{ + struct packfile_list_entry *entry; + + entry = packfile_list_remove_internal(list, pack); + if (!entry) { + entry = xmalloc(sizeof(*entry)); + entry->pack = pack; + } + entry->next = list->head; + + list->head = entry; + if (!list->tail) + list->tail = entry; +} + +void packfile_list_append(struct packfile_list *list, struct packed_git *pack) +{ + struct packfile_list_entry *entry; + + entry = packfile_list_remove_internal(list, pack); + if (!entry) { + entry = xmalloc(sizeof(*entry)); + entry->pack = pack; + } + entry->next = NULL; + + if (list->tail) { + list->tail->next = entry; + list->tail = entry; + } else { + list->head = list->tail = entry; + } +} + +struct packed_git *packfile_list_find_oid(struct packfile_list_entry *packs, + const struct object_id *oid) +{ + for (; packs; packs = packs->next) + if (find_pack_entry_one(oid, packs->pack)) + return packs->pack; + return NULL; +} + void pack_report(struct repository *repo) { fprintf(stderr, @@ -273,13 +356,14 @@ static void scan_windows(struct packed_git *p, static int unuse_one_window(struct packed_git *current) { - struct packed_git *p, *lru_p = NULL; + struct packfile_list_entry *e; + struct packed_git *lru_p = NULL; struct pack_window *lru_w = NULL, *lru_l = NULL; if (current) scan_windows(current, &lru_p, &lru_w, &lru_l); - for (p = current->repo->objects->packfiles->packs; p; p = p->next) - scan_windows(p, &lru_p, &lru_w, &lru_l); + for (e = current->repo->objects->packfiles->packs.head; e; e = e->next) + scan_windows(e->pack, &lru_p, &lru_w, &lru_l); if (lru_p) { munmap(lru_w->base, lru_w->len); pack_mapped -= lru_w->len; @@ -459,14 +543,15 @@ static void find_lru_pack(struct packed_git *p, struct packed_git **lru_p, struc static int close_one_pack(struct repository *r) { - struct packed_git *p, *lru_p = NULL; + struct packfile_list_entry *e; + struct packed_git *lru_p = NULL; struct pack_window *mru_w = NULL; int accept_windows_inuse = 1; - for (p = r->objects->packfiles->packs; p; p = p->next) { - if (p->pack_fd == -1) + for (e = r->objects->packfiles->packs.head; e; e = e->next) { + if (e->pack->pack_fd == -1) continue; - find_lru_pack(p, &lru_p, &mru_w, &accept_windows_inuse); + find_lru_pack(e->pack, &lru_p, &mru_w, &accept_windows_inuse); } if (lru_p) @@ -785,11 +870,8 @@ void packfile_store_add_pack(struct packfile_store *store, if (pack->pack_fd != -1) pack_open_fds++; - pack->next = store->packs; - store->packs = pack; - - hashmap_entry_init(&pack->packmap_ent, strhash(pack->pack_name)); - hashmap_add(&store->map, &pack->packmap_ent); + packfile_list_append(&store->packs, pack); + strmap_put(&store->packs_by_path, pack->pack_name, pack); } struct packed_git *packfile_store_load_pack(struct packfile_store *store, @@ -806,8 +888,7 @@ struct packed_git *packfile_store_load_pack(struct packfile_store *store, strbuf_strip_suffix(&key, ".idx"); strbuf_addstr(&key, ".pack"); - p = hashmap_get_entry_from_hash(&store->map, strhash(key.buf), key.buf, - struct packed_git, packmap_ent); + p = strmap_get(&store->packs_by_path, key.buf); if (!p) { p = add_packed_git(store->odb->repo, idx_path, strlen(idx_path), local); @@ -981,9 +1062,10 @@ static void prepare_packed_git_one(struct odb_source *source) string_list_clear(data.garbage, 0); } -DEFINE_LIST_SORT(static, sort_packs, struct packed_git, next); +DEFINE_LIST_SORT(static, sort_packs, struct packfile_list_entry, next); -static int sort_pack(const struct packed_git *a, const struct packed_git *b) +static int sort_pack(const struct packfile_list_entry *a, + const struct packfile_list_entry *b) { int st; @@ -993,7 +1075,7 @@ static int sort_pack(const struct packed_git *a, const struct packed_git *b) * remote ones could be on a network mounted filesystem. * Favor local ones for these reasons. */ - st = a->pack_local - b->pack_local; + st = a->pack->pack_local - b->pack->pack_local; if (st) return -st; @@ -1002,23 +1084,13 @@ static int sort_pack(const struct packed_git *a, const struct packed_git *b) * and more recent objects tend to get accessed more * often. */ - if (a->mtime < b->mtime) + if (a->pack->mtime < b->pack->mtime) return 1; - else if (a->mtime == b->mtime) + else if (a->pack->mtime == b->pack->mtime) return 0; return -1; } -static void packfile_store_prepare_mru(struct packfile_store *store) -{ - struct packed_git *p; - - INIT_LIST_HEAD(&store->mru); - - for (p = store->packs; p; p = p->next) - list_add_tail(&p->mru, &store->mru); -} - void packfile_store_prepare(struct packfile_store *store) { struct odb_source *source; @@ -1031,9 +1103,12 @@ void packfile_store_prepare(struct packfile_store *store) prepare_multi_pack_index_one(source); prepare_packed_git_one(source); } - sort_packs(&store->packs, sort_pack); - packfile_store_prepare_mru(store); + sort_packs(&store->packs.head, sort_pack); + for (struct packfile_list_entry *e = store->packs.head; e; e = e->next) + if (!e->next) + store->packs.tail = e; + store->initialized = true; } @@ -1043,7 +1118,7 @@ void packfile_store_reprepare(struct packfile_store *store) packfile_store_prepare(store); } -struct packed_git *packfile_store_get_packs(struct packfile_store *store) +struct packfile_list_entry *packfile_store_get_packs(struct packfile_store *store) { packfile_store_prepare(store); @@ -1055,13 +1130,7 @@ struct packed_git *packfile_store_get_packs(struct packfile_store *store) prepare_midx_pack(m, i); } - return store->packs; -} - -struct list_head *packfile_store_get_packs_mru(struct packfile_store *store) -{ - packfile_store_prepare(store); - return &store->mru; + return store->packs.head; } /* @@ -1078,16 +1147,16 @@ unsigned long repo_approximate_object_count(struct repository *r) unsigned long count = 0; struct packed_git *p; - packfile_store_prepare(r->objects->packfiles); + odb_prepare_alternates(r->objects); for (source = r->objects->sources; source; source = source->next) { struct multi_pack_index *m = get_multi_pack_index(source); if (m) - count += m->num_objects; + count += m->num_objects + m->num_objects_in_base; } - for (p = r->objects->packfiles->packs; p; p = p->next) { - if (open_pack_index(p)) + repo_for_each_pack(r, p) { + if (p->multi_pack_index || open_pack_index(p)) continue; count += p->num_objects; } @@ -1211,11 +1280,11 @@ void mark_bad_packed_object(struct packed_git *p, const struct object_id *oid) const struct packed_git *has_packed_and_bad(struct repository *r, const struct object_id *oid) { - struct packed_git *p; + struct packfile_list_entry *e; - for (p = r->objects->packfiles->packs; p; p = p->next) - if (oidset_contains(&p->bad_objects, oid)) - return p; + for (e = r->objects->packfiles->packs.head; e; e = e->next) + if (oidset_contains(&e->pack->bad_objects, oid)) + return e->pack; return NULL; } @@ -2023,19 +2092,6 @@ int is_pack_valid(struct packed_git *p) return !open_packed_git(p); } -struct packed_git *find_oid_pack(const struct object_id *oid, - struct packed_git *packs) -{ - struct packed_git *p; - - for (p = packs; p; p = p->next) { - if (find_pack_entry_one(oid, p)) - return p; - } - return NULL; - -} - static int fill_pack_entry(const struct object_id *oid, struct pack_entry *e, struct packed_git *p) @@ -2066,7 +2122,7 @@ static int fill_pack_entry(const struct object_id *oid, int find_pack_entry(struct repository *r, const struct object_id *oid, struct pack_entry *e) { - struct list_head *pos; + struct packfile_list_entry *l; packfile_store_prepare(r->objects->packfiles); @@ -2074,13 +2130,15 @@ int find_pack_entry(struct repository *r, const struct object_id *oid, struct pa if (source->midx && fill_midx_entry(source->midx, oid, e)) return 1; - if (!r->objects->packfiles->packs) + if (!r->objects->packfiles->packs.head) return 0; - list_for_each(pos, &r->objects->packfiles->mru) { - struct packed_git *p = list_entry(pos, struct packed_git, mru); + for (l = r->objects->packfiles->packs.head; l; l = l->next) { + struct packed_git *p = l->pack; + if (!p->multi_pack_index && fill_pack_entry(oid, e, p)) { - list_move(&p->mru, &r->objects->packfiles->mru); + if (!r->objects->packfiles->skip_mru_updates) + packfile_list_prepend(&r->objects->packfiles->packs, p); return 1; } } @@ -2212,6 +2270,7 @@ int for_each_packed_object(struct repository *repo, each_packed_object_fn cb, int r = 0; int pack_errors = 0; + repo->objects->packfiles->skip_mru_updates = true; repo_for_each_pack(repo, p) { if ((flags & FOR_EACH_OBJECT_LOCAL_ONLY) && !p->pack_local) continue; @@ -2232,6 +2291,8 @@ int for_each_packed_object(struct repository *repo, each_packed_object_fn cb, if (r) break; } + repo->objects->packfiles->skip_mru_updates = false; + return r ? r : pack_errors; } @@ -2327,45 +2388,30 @@ int parse_pack_header_option(const char *in, unsigned char *out, unsigned int *l return 0; } -static int pack_map_entry_cmp(const void *cmp_data UNUSED, - const struct hashmap_entry *entry, - const struct hashmap_entry *entry2, - const void *keydata) -{ - const char *key = keydata; - const struct packed_git *pg1, *pg2; - - pg1 = container_of(entry, const struct packed_git, packmap_ent); - pg2 = container_of(entry2, const struct packed_git, packmap_ent); - - return strcmp(pg1->pack_name, key ? key : pg2->pack_name); -} - struct packfile_store *packfile_store_new(struct object_database *odb) { struct packfile_store *store; CALLOC_ARRAY(store, 1); store->odb = odb; - INIT_LIST_HEAD(&store->mru); - hashmap_init(&store->map, pack_map_entry_cmp, NULL, 0); + strmap_init(&store->packs_by_path); return store; } void packfile_store_free(struct packfile_store *store) { - for (struct packed_git *p = store->packs, *next; p; p = next) { - next = p->next; - free(p); - } - hashmap_clear(&store->map); + for (struct packfile_list_entry *e = store->packs.head; e; e = e->next) + free(e->pack); + packfile_list_clear(&store->packs); + + strmap_clear(&store->packs_by_path, 0); free(store); } void packfile_store_close(struct packfile_store *store) { - for (struct packed_git *p = store->packs; p; p = p->next) { - if (p->do_not_close) + for (struct packfile_list_entry *e = store->packs.head; e; e = e->next) { + if (e->pack->do_not_close) BUG("want to close pack marked 'do-not-close'"); - close_pack(p); + close_pack(e->pack); } } diff --git a/packfile.h b/packfile.h index 58fcc88e20..0e178fb279 100644 --- a/packfile.h +++ b/packfile.h @@ -5,14 +5,12 @@ #include "object.h" #include "odb.h" #include "oidset.h" +#include "strmap.h" /* in odb.h */ struct object_info; struct packed_git { - struct hashmap_entry packmap_ent; - struct packed_git *next; - struct list_head mru; struct pack_window *windows; off_t pack_size; const void *index_data; @@ -52,6 +50,28 @@ struct packed_git { char pack_name[FLEX_ARRAY]; /* more */ }; +struct packfile_list { + struct packfile_list_entry *head, *tail; +}; + +struct packfile_list_entry { + struct packfile_list_entry *next; + struct packed_git *pack; +}; + +void packfile_list_clear(struct packfile_list *list); +void packfile_list_remove(struct packfile_list *list, struct packed_git *pack); +void packfile_list_prepend(struct packfile_list *list, struct packed_git *pack); +void packfile_list_append(struct packfile_list *list, struct packed_git *pack); + +/* + * Find the pack within the "packs" list whose index contains the object + * "oid". For general object lookups, you probably don't want this; use + * find_pack_entry() instead. + */ +struct packed_git *packfile_list_find_oid(struct packfile_list_entry *packs, + const struct object_id *oid); + /* * A store that manages packfiles for a given object database. */ @@ -59,10 +79,10 @@ struct packfile_store { struct object_database *odb; /* - * The list of packfiles in the order in which they are being added to - * the store. + * The list of packfiles in the order in which they have been most + * recently used. */ - struct packed_git *packs; + struct packfile_list packs; /* * Cache of packfiles which are marked as "kept", either because there @@ -78,20 +98,32 @@ struct packfile_store { unsigned flags; } kept_cache; - /* A most-recently-used ordered version of the packs list. */ - struct list_head mru; - /* * A map of packfile names to packed_git structs for tracking which * packs have been loaded already. */ - struct hashmap map; + struct strmap packs_by_path; /* * Whether packfiles have already been populated with this store's * packs. */ bool initialized; + + /* + * Usually, packfiles will be reordered to the front of the `packs` + * list whenever an object is looked up via them. This has the effect + * that packs that contain a lot of accessed objects will be located + * towards the front. + * + * This is usually desireable, but there are exceptions. One exception + * is when the looking up multiple objects in a loop for each packfile. + * In that case, we may easily end up with an infinite loop as the + * packfiles get reordered to the front repeatedly. + * + * Setting this field to `true` thus disables these reorderings. + */ + bool skip_mru_updates; }; /* @@ -142,18 +174,14 @@ void packfile_store_add_pack(struct packfile_store *store, * repository. */ #define repo_for_each_pack(repo, p) \ - for (p = packfile_store_get_packs(repo->objects->packfiles); p; p = p->next) + for (struct packfile_list_entry *e = packfile_store_get_packs(repo->objects->packfiles); \ + ((p) = (e ? e->pack : NULL)); e = e->next) /* * Get all packs managed by the given store, including packfiles that are * referenced by multi-pack indices. */ -struct packed_git *packfile_store_get_packs(struct packfile_store *store); - -/* - * Get all packs in most-recently-used order. - */ -struct list_head *packfile_store_get_packs_mru(struct packfile_store *store); +struct packfile_list_entry *packfile_store_get_packs(struct packfile_store *store); /* * Open the packfile and add it to the store if it isn't yet known. Returns @@ -248,14 +276,6 @@ extern void (*report_garbage)(unsigned seen_bits, const char *path); */ unsigned long repo_approximate_object_count(struct repository *r); -/* - * Find the pack within the "packs" list whose index contains the object "oid". - * For general object lookups, you probably don't want this; use - * find_pack_entry() instead. - */ -struct packed_git *find_oid_pack(const struct object_id *oid, - struct packed_git *packs); - void pack_report(struct repository *repo); /* diff --git a/parse-options.c b/parse-options.c index 5933468c19..c9cafc21b9 100644 --- a/parse-options.c +++ b/parse-options.c @@ -208,12 +208,12 @@ static enum parse_opt_result do_get_value(struct parse_opt_ctx_t *p, case OPTION_FILENAME: { const char *value; - int is_optional; + bool is_optional; if (unset) value = NULL; else if (opt->flags & PARSE_OPT_OPTARG && !p->opt) - value = (char *)opt->defval; + value = (const char *)opt->defval; else { int err = get_arg(p, opt, flags, &value); if (err) @@ -223,10 +223,8 @@ static enum parse_opt_result do_get_value(struct parse_opt_ctx_t *p, return 0; is_optional = skip_prefix(value, ":(optional)", &value); - if (!value) - is_optional = 0; value = fix_filename(p->prefix, value); - if (is_optional && is_empty_or_missing_file(value)) { + if (is_optional && is_missing_file(value)) { free((char *)value); } else { FREE_AND_NULL(*(char **)opt->value); @@ -239,7 +239,11 @@ # score оценка за Ñъвпадение # raw необработен # mbox файл Ñ Ð¿Ð¾Ñ‰Ð° -# +# cost цена +# nominated отбелÑзан +# initial branch първоначален клон +# garbage повредени данни +# keep file файл за запазване на Ð´Ð¸Ñ€ÐµÐºÑ‚Ð¾Ñ€Ð¸Ñ # # ------------------------ # „$var“ - може да не Ñработва за shell има gettext и eval_gettext - проверка - намират Ñе леÑно по „$ @@ -266,17 +270,17 @@ # for i in `sort -u FILES`; do cnt=`grep $i FILES | wc -l`; echo $cnt $i ;done | sort -n msgid "" msgstr "" -"Project-Id-Version: git 2.48\n" +"Project-Id-Version: git v2.52.0-rc1\n" "Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n" -"POT-Creation-Date: 2025-08-13 22:06+0200\n" -"PO-Revision-Date: 2025-08-13 22:07+0200\n" +"POT-Creation-Date: 2025-11-06 23:58+0000\n" +"PO-Revision-Date: 2025-11-09 18:23+0100\n" "Last-Translator: Alexander Shopov <ash@kambanaria.org>\n" "Language-Team: Bulgarian <dict@fsa-bg.org>\n" -"Language: bg\n" +"Language: bg\\n\"\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" +"Plural-Forms: Plural-Forms: nplurals=2; plural=(n != 1);\n" #, c-format msgid "%s cannot be negative" @@ -821,21 +825,24 @@ msgid "Nothing was applied.\n" msgstr "Ðищо не е приложено.\n" msgid "" -"j - leave this hunk undecided, see next undecided hunk\n" -"J - leave this hunk undecided, see next hunk\n" -"k - leave this hunk undecided, see previous undecided hunk\n" -"K - leave this hunk undecided, see previous hunk\n" +"j - go to the next undecided hunk, roll over at the bottom\n" +"J - go to the next hunk, roll over at the bottom\n" +"k - go to the previous undecided hunk, roll over at the top\n" +"K - go to the previous hunk, roll over at the top\n" "g - select a hunk to go to\n" "/ - search for a hunk matching the given regex\n" "s - split the current hunk into smaller hunks\n" "e - manually edit the current hunk\n" -"p - print the current hunk, 'P' to use the pager\n" +"p - print the current hunk\n" +"P - print the current hunk using the pager\n" "? - print help\n" msgstr "" -"j — без решение за парчето, към Ñледващото парче без решение\n" -"J — без решение за парчето, към Ñледващото парче\n" -"k — без решение за парчето, към предишното парче без решение\n" -"K — без решение за парчето, към предишното парче\n" +"j — без решение за парчето, към Ñледващото парче без решение, превъртане " +"Ñлед краÑ\n" +"J — без решение за парчето, към Ñледващото парче, превъртане Ñлед краÑ\n" +"k — без решение за парчето, към предишното парче без решение, превъртане " +"Ñлед началото\n" +"K — без решение за парчето, към предишното парче, превъртане Ñлед началото\n" "g — избор към кое парче да Ñе премине\n" "/ — Ñ‚ÑŠÑ€Ñене на парче, напаÑващо към даден регулÑрен израз\n" "s — разделÑне на текущото парче на по-малки\n" @@ -848,11 +855,11 @@ msgstr "" msgid "Only one letter is expected, got '%s'" msgstr "Очаква Ñе Ñамо един знак, а не „%s“" -msgid "No previous hunk" -msgstr "ÐÑма друго парче преди това" +msgid "No other hunk" +msgstr "ÐÑма друго парче" -msgid "No next hunk" -msgstr "ÐÑма друго парче Ñлед това" +msgid "No other undecided hunk" +msgstr "ÐÑма друго парче без решение" msgid "No other hunks to goto" msgstr "ÐÑма други парчета" @@ -2683,15 +2690,20 @@ msgid "Restrict the missing objects to the current sparse-checkout" msgstr "Ограничаване на липÑващите обекти до текущото чаÑтично хранилище" msgid "" -"git bisect start [--term-(new|bad)=<term> --term-(old|good)=<term>] [--no-" -"checkout] [--first-parent] [<bad> [<good>...]] [--] [<pathspec>...]" +"git bisect start [--term-(bad|new)=<term-new> --term-(good|old)=<term-old>]\n" +" [--no-checkout] [--first-parent] [<bad> [<good>...]] [--] " +"[<pathspec>...]" msgstr "" -"git bisect start [--term-(new,bad)=УПРÐВЛЯВÐЩÐ_ДУМР--term-" -"(old,good)=УПРÐВЛЯВÐЩÐ_ДУМÐ] [--no-checkout] [--first-parent] [ЛОШО " -"[ДОБРО…]] [--] [ШÐБЛОÐ_ЗÐ_ПЪТИЩÐ…]" +"git bisect start [--term-(bad|new)=УПРÐВЛЯВÐЩÐ_ДУМР--term-(good|" +"old)=УПРÐВЛЯВÐЩÐ_ДУМÐ]\n" +" [--no-checkout] [--first-parent] [ЛОШО [ДОБРО…]]\n" +" [--] [ШÐБЛОÐ_ЗÐ_ПЪТИЩÐ…]" + +msgid "git bisect (bad|new|<term-new>) [<rev>]" +msgstr "git bisect (bad|new|УПРÐВЛЯВÐЩÐ_ДУМÐ) [ВЕРСИЯ]" -msgid "git bisect (good|bad) [<rev>...]" -msgstr "git bisect (good|bad) [ВЕРСИЯ…]" +msgid "git bisect (good|old|<term-old>) [<rev>...]" +msgstr "git bisect (good|old|УПРÐВЛЯВÐЩÐ_ДУМÐ) [ВЕРСИЯ…]" msgid "git bisect skip [(<rev>|<range>)...]" msgstr "git bisect skip [(ВЕРСИЯ|ДИÐПÐЗОÐ)…]" @@ -2993,7 +3005,7 @@ msgstr "" "изключена)" msgid "show work cost statistics" -msgstr "извеждане на ÑтатиÑтика за извършените дейÑтвиÑ" +msgstr "извеждане на ÑтатиÑтика за цената на извършените дейÑтвиÑ" msgid "force progress reporting" msgstr "извеждане на напредъка" @@ -6001,6 +6013,14 @@ msgid "found %i tags; gave up search at %s\n" msgstr "открити Ñа %i етикета. ТърÑенето приключи при „%s“\n" #, c-format +msgid "cannot search for blob '%s' on an unborn branch" +msgstr "обектът-BLOB „%s“ не може да Ñе Ñ‚ÑŠÑ€Ñи в неродѐн клон" + +#, c-format +msgid "blob '%s' not reachable from HEAD" +msgstr "обектът-BLOB „%s“ е недоÑтежим от HEAD" + +#, c-format msgid "describe %s\n" msgstr "опиÑание на „%s“\n" @@ -6143,6 +6163,9 @@ msgstr "неправилна опциÑ: %s" msgid "%s...%s: no merge base" msgstr "„%s..%s“: липÑва база за Ñливане" +msgid "cannot come back to cwd" +msgstr "процеÑÑŠÑ‚ не може да Ñе върне към предишната работна директориÑ" + msgid "Not a git repository" msgstr "Ðе е хранилище на Git" @@ -6254,9 +6277,139 @@ msgstr "не е зададена команда за „--extcmd=КОМÐÐДÐâ msgid "git fast-export [<rev-list-opts>]" msgstr "git fast-export [ОПЦИЯ_ЗÐ_СПИСЪКÐ_С_ВЕРСИИ…]" -msgid "Error: Cannot export nested tags unless --mark-tags is specified." +#, c-format +msgid "unknown %s mode: %s" +msgstr "непознат режим за „%s“: %s" + +#, c-format +msgid "unknown tag-of-filtered mode: %s" +msgstr "непознат режим за „tag-of-filtered“: „%s“" + +#, c-format +msgid "unknown reencoding mode: %s" +msgstr "непознат режим за прекодиране: %s" + +#, c-format +msgid "could not read blob %s" +msgstr "обектът-BLOB не може да Ñе прочете: %s" + +#, c-format +msgid "oid mismatch in blob %s" +msgstr "разлика в идентификатор в BLOB „%s“" + +#, c-format +msgid "could not write blob '%s'" +msgstr "обектът-BLOB „%s“ не може да Ñе запази" + +#, c-format +msgid "unexpected comparison status '%c' for %s, %s" +msgstr "неочакван изходен код при Ñравнение '%c' за %s, %s" + +msgid "none" +msgstr "нищо" + +#, c-format +msgid "could not find author in commit %s" +msgstr "липÑва автор в подаването „%s“" + +#, c-format +msgid "could not find committer in commit %s" +msgstr "липÑва подаващ в подаването „%s“" + +#, c-format +msgid "" +"encountered commit-specific encoding %.*s in commit %s; use --reencode=[yes|" +"no] to handle it" +msgstr "" +"получено е кодиране „%.*s“ Ñпецифично за подаване„%s“ — ползвайте „--" +"reencode=[yes|no]“ за обработка" + +#, c-format +msgid "encountered signed commit %s; use --signed-commits=<mode> to handle it" msgstr "" -"ГРЕШКÐ: непреките етикети не Ñе изнаÑÑÑ‚, оÑвен ако не зададете „--mark-tags“." +"получено е подпиÑано подаване „%s“ — ползвайте „--signed-commits=РЕЖИМ“ за " +"обработка" + +#, c-format +msgid "exporting %<PRIuMAX> signature(s) for commit %s" +msgstr "изнаÑÑÑ‚ Ñе %<PRIuMAX> подпиÑ(а) за подаването „%s“" + +#, c-format +msgid "stripping signature(s) from commit %s" +msgstr "пропуÑкане на подпиÑите към подаването „%s“" + +#, c-format +msgid "" +"omitting tag %s,\n" +"since tags of trees (or tags of tags of trees, etc.) are not supported." +msgstr "" +"пропуÑкане на етикета „%s“,\n" +"защото не Ñе поддържат етикети на дървета (както и етикети на етикети на " +"дървета и Ñ‚.н.)" + +#, c-format +msgid "could not read tag %s" +msgstr "етикетът „%s“ не може да Ñе прочете" + +#, c-format +msgid "encountered signed tag %s; use --signed-tags=<mode> to handle it" +msgstr "" +"получен е подпиÑан етикет „%s“ — ползвайте „--signed-tags=РЕЖИМ“ за обработка" + +#, c-format +msgid "exporting signed tag %s" +msgstr "изнаÑÑне на подпиÑан етикет „%s“" + +#, c-format +msgid "stripping signature from tag %s" +msgstr "пропуÑкане на подпиÑите към етикета „%s“" + +#, c-format +msgid "" +"tag %s tags unexported object; use --tag-of-filtered-object=<mode> to handle " +"it" +msgstr "" +"етикетът „%s“ Ñочи към обект, който не Ñе изнаÑÑ â€” ползвайте „--tag-of-" +"filtered-object=РЕЖИМ“ за обработка" + +msgid "cannot export nested tags unless --mark-tags is specified." +msgstr "непреките етикети не Ñе изнаÑÑÑ‚, оÑвен ако не зададете „--mark-tags“." + +#, c-format +msgid "tag %s points nowhere?" +msgstr "етикетът „%s“ не Ñочи наникъде" + +#, c-format +msgid "%s: unexpected object of type %s, skipping." +msgstr "„%s“: неочакван обект-%s — преÑкача Ñе." + +#, c-format +msgid "tag points to object of unexpected type %s, skipping." +msgstr "етикетът Ñочи към обект от неправилен вид „%s“, пропуÑка Ñе." + +#, c-format +msgid "unable to open marks file %s for writing." +msgstr "файлът Ñ Ð¼Ð°Ñ€ÐºÐµÑ€Ð¸Ñ‚Ðµ „%s“ не може да Ñе отвори за запиÑ." + +#, c-format +msgid "unable to write marks file %s." +msgstr "файлът Ñ Ð¼Ð°Ñ€ÐºÐµÑ€Ð¸Ñ‚Ðµ „%s“ не може да Ñе запази." + +#, c-format +msgid "corrupt mark line: %s" +msgstr "грешен ред за маркер: %s" + +#, c-format +msgid "object not found: %s" +msgstr "обектът „%s“ липÑва" + +#, c-format +msgid "not a commit? can't happen: %s" +msgstr "не е подаване? Това не Ñ‚Ñ€Ñбва да Ñе Ñлучва: „%s“" + +#, c-format +msgid "object %s already has a mark" +msgstr "обектът „%s“ вече има маркер" msgid "--anonymize-map token cannot be empty" msgstr "опциÑта „--anonymize-map“ изиÑква аргумент" @@ -6326,29 +6479,459 @@ msgid "label tags with mark ids" msgstr "задаване на идентификатори на маркери на етикетите" #, c-format -msgid "Missing from marks for submodule '%s'" -msgstr "ЛипÑват маркери „от“ за подмодула „%s“" +msgid "can't write crash report %s" +msgstr "докладът за забиване на програмата не може де Ñе запази: „%s“" + +#, c-format +msgid "fast-import: dumping crash report to %s\n" +msgstr "fast-import: докладът за грешка Ñе извежда в „%s“\n" + +#, c-format +msgid "mark :%<PRIuMAX> not declared" +msgstr "маркер :%<PRIuMAX> не е обÑвен" + +#, c-format +msgid "invalid attempt to create duplicate branch: %s" +msgstr "неправилен опит за Ñъздаване на повтарÑщ Ñе клон: „%s“" + +#, c-format +msgid "branch name doesn't conform to Git standards: %s" +msgstr "името на клон не Ð¾Ñ‚Ð³Ð¾Ð²Ð°Ñ€Ñ Ð½Ð° Ñтандарта на Git: „%s“" + +msgid "internal consistency error creating the index" +msgstr "вътрешна грешка за ÑъвмеÑтимоÑтта на данните при Ñъздаване на индекÑа" + +msgid "cannot create keep file" +msgstr "файлът за запазване на Ð´Ð¸Ñ€ÐµÐºÑ‚Ð¾Ñ€Ð¸Ñ Ð½Ðµ може да Ñе Ñъздаде" + +msgid "failed to write keep file" +msgstr "файлът за запазване на Ð´Ð¸Ñ€ÐµÐºÑ‚Ð¾Ñ€Ð¸Ñ Ð½Ðµ може да Ñе запази" + +msgid "cannot store pack file" +msgstr "пакетниÑÑ‚ файл не може да Ñе Ñъхрани" + +msgid "cannot store index file" +msgstr "файлът за индекÑа не може да Ñе Ñъхрани" + +#, c-format +msgid "failed seeking to start of '%s'" +msgstr "не може да Ñ‚ÑŠÑ€Ñи началото на „%s“" + +#, c-format +msgid "core Git rejected index %s" +msgstr "Git отхвърли индекÑа „%s“" + +msgid "cannot truncate pack to skip duplicate" +msgstr "пакетът не може да Ñе отреже за пропуÑкане на повторениÑта" + +#, c-format +msgid "EOF in data (%<PRIuMAX> bytes remaining)" +msgstr "неочакван край на данни (EOF), а оÑтават още %<PRIuMAX> байта" + +#, c-format +msgid "unexpected deflate failure: %d" +msgstr "неочаквана грешка от „deflate“: %d" + +#, c-format +msgid "not a tree: %s" +msgstr "не е дърво: %s" + +#, c-format +msgid "can't load tree %s" +msgstr "дървото „%s“ не може да Ñе зареди" + +#, c-format +msgid "corrupt mode in %s" +msgstr "повреден обект в „%s“" + +msgid "root cannot be a non-directory" +msgstr "началната Ð´Ð¸Ñ€ÐµÐºÑ‚Ð¾Ñ€Ð¸Ñ Ð½Ðµ може да не е директориÑ" + +msgid "empty path component found in input" +msgstr "празен компонент за път на входа" + +msgid "non-directories cannot have subtrees" +msgstr "обекти, които не Ñа директории, не може да имат поддървета" + +#, c-format +msgid "dropping %s since it would point to itself (i.e. to %s)" +msgstr "„%s“ Ñе преÑкача, защото ще Ñочи Ñебе Ñи (Ñ‚.е. „%s“)" + +#, c-format +msgid "branch %s is missing commits." +msgstr "липÑват Ð¿Ð¾Ð´Ð°Ð²Ð°Ð½Ð¸Ñ Ð² клона „%s“." + +#, c-format +msgid "not updating %s (new tip %s does not contain %s)" +msgstr "„%s“ не Ñе обновÑва (новиÑÑ‚ връх „%s“ не Ñъдържа „%s“)" + +#, c-format +msgid "unable to create leading directories of %s" +msgstr "родителÑките директории на „%s“ не може да бъдат Ñъздадени" + +#, c-format +msgid "unable to write marks file %s" +msgstr "файлът Ñ Ð¼Ð°Ñ€ÐºÐµÑ€Ð¸Ñ‚Ðµ „%s“ не може да Ñе запише" + +#, c-format +msgid "unable to write marks file %s: %s" +msgstr "файлът Ñ Ð¼Ð°Ñ€ÐºÐµÑ€Ð¸Ñ‚Ðµ „%s“ не може да Ñе запише: %s" + +#, c-format +msgid "unable to write file %s" +msgstr "файлът „%s“ не може да Ñе запише" + +#, c-format +msgid "expected 'data n' command, found: %s" +msgstr "очаква Ñе команда „data n“, а бе получена: „%s“" + +#, c-format +msgid "EOF in data (terminator '%s' not found)" +msgstr "Край на данни (EOF), липÑва „%s“" + +msgid "data is too large to use in this context" +msgstr "данните Ñа прекалено големи за този контекÑÑ‚" + +#, c-format +msgid "EOF in data (%lu bytes remaining)" +msgstr "получен е край на файл (EOF) в данните, а оÑтават още %lu байта" + +#, c-format +msgid "missing < in ident string: %s" +msgstr "липÑва „<“ в низа за идентичноÑтта: %s" + +#, c-format +msgid "missing space before < in ident string: %s" +msgstr "липÑва интервал пред „<“ в низа за идентичноÑтта: %s\"" + +#, c-format +msgid "missing > in ident string: %s" +msgstr "липÑва „>“ в низа за идентичноÑтта: %s" + +#, c-format +msgid "missing space after > in ident string: %s" +msgstr "липÑва интервал Ñлед „>“ в низа за идентичноÑтта: %s" + +#, c-format +msgid "invalid raw date \"%s\" in ident: %s" +msgstr "грешна неформатирана дата „%s“ в идентичноÑтта: %s" + +#, c-format +msgid "invalid rfc2822 date \"%s\" in ident: %s" +msgstr "дата във формат различен от rfc2822 „%s“ в идентичноÑтта: %s" + +#, c-format +msgid "date in ident must be 'now': %s" +msgstr "датата в идентичноÑтта Ñ‚Ñ€Ñбва да е „now“ (Ñега): %s" + +#, c-format +msgid "too large fanout (%u)" +msgstr "прекалено голÑм Ð¾Ñ‚ÐºÑŠÑ Ð·Ð° разпределение (%u)" + +#, c-format +msgid "failed to remove path %s" +msgstr "пътÑÑ‚ „%s“ не може да Ñе изтрие" + +#, c-format +msgid "no value after ':' in mark: %s" +msgstr "липÑва ÑтойноÑÑ‚ Ñлед „:“ в маркера: „%s“" + +#, c-format +msgid "garbage after mark: %s" +msgstr "повредени данни Ñлед маркер: %s" + +#, c-format +msgid "missing space after mark: %s" +msgstr "липÑва интервал Ñлед маркера: „%s“" + +#, c-format +msgid "invalid %s: %s" +msgstr "неправилен %s: „%s“" + +#, c-format +msgid "NUL in %s: %s" +msgstr "NUL в %s: %s" + +#, c-format +msgid "garbage after %s: %s" +msgstr "повредени данни Ñлед %s: „%s“" + +#, c-format +msgid "missing space after %s: %s" +msgstr "липÑва интервал Ñлед %s: „%s“" + +#, c-format +msgid "corrupt mode: %s" +msgstr "неправилен режим: „%s“" + +#, c-format +msgid "invalid dataref: %s" +msgstr "неправилен указател към данни: „%s“" + +#, c-format +msgid "missing space after SHA1: %s" +msgstr "липÑва интервал Ñлед SHA1: „%s“" + +#, c-format +msgid "Git links cannot be specified 'inline': %s" +msgstr "връзките на Git не може да Ñе указват вътре („inline“): %s" + +#, c-format +msgid "not a commit (actually a %s): %s" +msgstr "не е подаване, а е %s: %s" + +#, c-format +msgid "directories cannot be specified 'inline': %s" +msgstr "директориите не може да Ñе указват вътре („inline“): %s" + +#, c-format +msgid "%s not found: %s" +msgstr "файлът „%s“ липÑва: %s" + +msgid "tree" +msgstr "дърво" + +#, c-format +msgid "not a %s (actually a %s): %s" +msgstr "не е %s, а е %s: %s" + +#, c-format +msgid "path %s not in branch" +msgstr "пътÑÑ‚ „%s“ не е в клон" + +msgid "can't add a note on empty branch." +msgstr "не може да Ñе добави бележка към празен клон." + +#, c-format +msgid "mark :%<PRIuMAX> not a commit" +msgstr "маркер :%<PRIuMAX> не е подаване" + +#, c-format +msgid "not a valid commit: %s" +msgstr "не е подаване: „%s“" + +#, c-format +msgid "invalid ref name or SHA1 expression: %s" +msgstr "неправилно име на указател или израз Ñ SHA1: %s" + +#, c-format +msgid "not a blob (actually a %s): %s" +msgstr "не е обект-BLOB, а е %s: %s" + +#, c-format +msgid "blob not found: %s" +msgstr "обектът-BLOB липÑва: %s" + +#, c-format +msgid "the commit %s is corrupt" +msgstr "подаването „%s“ е повредено" + +#, c-format +msgid "can't create a branch from itself: %s" +msgstr "не може да Ñе Ñъздаде клон от него ÑамиÑ: „%s“" + +#, c-format +msgid "" +"expected gpgsig format: 'gpgsig <hash-algo> <signature-format>', got 'gpgsig " +"%s'" +msgstr "" +"очакваше Ñе gpgsig във формат: „gpgsig ÐЛГОРИТЪМ_ЗÐ_КОÐТРОЛÐÐ_СУМР" +"ФОРМÐТ_ÐÐ_ПОДПИСГ, а не „gpgsig %s“" + +#, c-format +msgid "unknown git hash algorithm in gpgsig: '%s'" +msgstr "непознат алгоритъм на git за контролни Ñуми в gpgsig: „%s“" #, c-format -msgid "Missing to marks for submodule '%s'" -msgstr "ЛипÑват маркери „до“ за подмодула „%s“" +msgid "invalid signature format in gpgsig: '%s'" +msgstr "неправилен формат на Ð¿Ð¾Ð´Ð¿Ð¸Ñ Ð² gpgsig: %s" + +msgid "'unknown' signature format in gpgsig" +msgstr "непознат („unknown“) формат на Ð¿Ð¾Ð´Ð¿Ð¸Ñ Ð² gpgsig" #, c-format -msgid "Expected 'mark' command, got %s" -msgstr "Очаква Ñе команда „mark“, а бе получена: „%s“" +msgid "multiple %s signatures found, ignoring additional signature" +msgstr "открити Ñа много подпиÑи „%s“. Допълнителните Ñе преÑкачат" + +msgid "parse_one_signature() returned unknown hash algo" +msgstr "„parse_one_signature()“ върна непознат алгоритъм за контролна Ñума" + +msgid "expected committer but didn't get one" +msgstr "очакваше Ñе подаващ, но такъв липÑва" + +msgid "encountered signed commit; use --signed-commits=<mode> to handle it" +msgstr "" +"получено е подпиÑано подаване — ползвайте „--signed-commits=РЕЖИМ“ за " +"обработка" + +msgid "stripping a commit signature" +msgstr "пропуÑкане на Ð¿Ð¾Ð´Ð¿Ð¸Ñ Ð½Ð° подаване" + +msgid "importing a commit signature verbatim" +msgstr "доÑловно внаÑÑне на Ð¿Ð¾Ð´Ð¿Ð¸Ñ Ð½Ð° подаване" + +msgid "encountered signed tag; use --signed-tags=<mode> to handle it" +msgstr "" +"получен е подпиÑан етикет — ползвайте „--signed-tags=РЕЖИМ“ за обработка" #, c-format -msgid "Expected 'to' command, got %s" -msgstr "Очаква Ñе команда „to“, а бе получена: „%s“" +msgid "importing a tag signature verbatim for tag '%s'" +msgstr "доÑловно внаÑÑне на Ð¿Ð¾Ð´Ð¿Ð¸Ñ Ð½Ð° етикет за „%s“" -msgid "Expected format name:filename for submodule rewrite option" +#, c-format +msgid "stripping a tag signature for tag '%s'" +msgstr "пропуÑкане на подпиÑа на етикета „%s“" + +#, c-format +msgid "expected 'from' command, got '%s'" +msgstr "очаква Ñе команда „from“, а бе получена: „%s“" + +msgid "can't tag an empty branch." +msgstr "не може да Ñе Ñъздаде етикет за празен клон." + +#, c-format +msgid "not a valid object: %s" +msgstr "неправилен обект: „%s“" + +msgid "write to frontend failed" +msgstr "неуÑпешен Ð·Ð°Ð¿Ð¸Ñ ÐºÑŠÐ¼ интерфейÑа" + +#, c-format +msgid "can't read object %s" +msgstr "обектът „%s“ не може да Ñе прочете" + +#, c-format +msgid "object %s is a %s but a blob was expected." +msgstr "обектът „%s“ е %s, а не BLOB, какъвто Ñе очакваше." + +#, c-format +msgid "not a mark: %s" +msgstr "не е маркер: „%s“" + +#, c-format +msgid "unknown mark: %s" +msgstr "непознат маркер: „%s“" + +#, c-format +msgid "garbage after SHA1: %s" +msgstr "повредени данни Ñлед SHA1: %s" + +#, c-format +msgid "not a tree-ish: %s" +msgstr "не е дърво: „%s“" + +#, c-format +msgid "can't load object %s" +msgstr "обектът за „%s“ не може да Ñе зареди" + +#, c-format +msgid "invalid SHA1 in tag: %s" +msgstr "неправилна Ñума SHA1 в етикет: %s" + +#, c-format +msgid "invalid SHA1 in commit: %s" +msgstr "неправилна Ñума SHA1 в подаване: %s" + +#, c-format +msgid "missing from marks for submodule '%s'" +msgstr "липÑват маркери „от“ за подмодула „%s“" + +#, c-format +msgid "missing to marks for submodule '%s'" +msgstr "липÑват маркери „до“ за подмодула „%s“" + +#, c-format +msgid "missing space after tree-ish: %s" +msgstr "Ñлед клона липÑва интервал: %s" + +#, c-format +msgid "not in a commit: %s" +msgstr "не е в подаване: „%s“" + +#, c-format +msgid "expected 'mark' command, got %s" +msgstr "очаква Ñе команда „mark“, а бе получена: „%s“" + +#, c-format +msgid "expected 'to' command, got %s" +msgstr "очаква Ñе команда „to“, а бе получена: „%s“" + +msgid "only one import-marks command allowed per stream" +msgstr "" +"Ñлед поток е позволена Ñамо една команда за внаÑÑне на маркери (import-marks)" + +#, c-format +msgid "unknown --date-format argument %s" +msgstr "неправилен аргумент за „--date-format“: %s" + +#, c-format +msgid "%s: argument must be a non-negative integer" +msgstr "%s: аргументът Ñ‚Ñ€Ñбва да е неотрицателен" + +#, c-format +msgid "--depth cannot exceed %u" +msgstr "дълбочината към „--depth“ не може да превишава %u" + +#, c-format +msgid "--cat-blob-fd cannot exceed %d" +msgstr "аргументът към „--cat-blob-fd“ не може да превишава %d" + +msgid "expected format name:filename for submodule rewrite option" msgstr "опциÑта за Ð¿Ñ€ÐµÐ·Ð°Ð¿Ð¸Ñ Ð½Ð° подмодул изиÑква формат: име:име_на_файл" #, c-format +msgid "max-pack-size is now in bytes, assuming --max-pack-size=%lum" +msgstr "" +"минималниÑÑ‚ макÑимален размер на пакетите (max-pack-size) вече е в байтове. " +"Приема Ñе, че Ñте задали „--max-pack-size=%lum“" + +msgid "minimum max-pack-size is 1 MiB" +msgstr "минималниÑÑ‚ макÑимален размер на пакетите (max-pack-size) е 1 MiB" + +#, c-format +msgid "unknown --signed-commits mode '%s'" +msgstr "непознат режим „%s“ за опциÑта „--signed-commits“" + +#, c-format +msgid "unknown --signed-tags mode '%s'" +msgstr "непознат режим „%s“ за опциÑта „--signed-tags“" + +#, c-format msgid "feature '%s' forbidden in input without --allow-unsafe-features" msgstr "„%s“ изиÑква изричното задаване на опциÑта „--allow-unsafe-features“" #, c-format +msgid "got feature command '%s' after data command" +msgstr "получена е команда „%s“ Ñлед команда за данни" + +#, c-format +msgid "this version of fast-import does not support feature %s." +msgstr "тази верÑÐ¸Ñ Ð½Ð° бързото внаÑÑне (fast-import) не поддържа „%s“." + +#, c-format +msgid "got option command '%s' after data command" +msgstr "Ñлед командата е получена команда за Ð¾Ð¿Ñ†Ð¸Ñ â€ž%s“" + +#, c-format +msgid "this version of fast-import does not support option: %s" +msgstr "тази верÑÐ¸Ñ Ð½Ð° бързото внаÑÑне (fast-import) не поддържа опциÑта „%s“" + +#, c-format +msgid "unknown option %s" +msgstr "непозната опциÑ: „%s“" + +#, c-format +msgid "unknown option --%s" +msgstr "непозната Ð¾Ð¿Ñ†Ð¸Ñ â€ž--%s“" + +#, c-format +msgid "unsupported command: %s" +msgstr "неподдържана команда: „%s“" + +msgid "stream ends early" +msgstr "ранен край на поток" + +#, c-format msgid "Lockfile created but not reported: %s" msgstr "ЗаключващиÑÑ‚ файл е Ñъздаден, но не е докладван: „%s“" @@ -6496,6 +7079,39 @@ msgstr "" "ще изключи предупреждението, докато отдалечениÑÑ‚ указател HEAD не\n" "започне да Ñочи нещо друго." +msgid "" +"You're on a case-insensitive filesystem, and the remote you are\n" +"trying to fetch from has references that only differ in casing. It\n" +"is impossible to store such references with the 'files' backend. You\n" +"can either accept this as-is, in which case you won't be able to\n" +"store all remote references on disk. Or you can alternatively\n" +"migrate your repository to use the 'reftable' backend with the\n" +"following command:\n" +"\n" +" git refs migrate --ref-format=reftable\n" +"\n" +"Please keep in mind that not all implementations of Git support this\n" +"new format yet. So if you use tools other than Git to access this\n" +"repository it may not be an option to migrate to reftables.\n" +msgstr "" +"Ползвате файлова ÑиÑтема, коÑто не различава главни от малки букви,\n" +"а отдалеченото хранилище, от което Ñе опитвате да доÑтавите обекти,\n" +"Ñъдържа указатели, които Ñе различават Ñамо по региÑтъра Ñи.\n" +"Ðевъзможно е да запазите вÑички такива указатели ÑÑŠÑ ÑъхранÑване\n" +"базирано на файлове („files“). Имате два избора:\n" +"\n" +" ⃠или приемате положението и факта, че не може да Ñъхраните\n" +" вÑички указатели;\n" +" ⃠или мигрирайте хранилището Ñи да ÑъхранÑва указатели чрез\n" +" таблица („reftable“) Ñ ÐºÐ¾Ð¼Ð°Ð½Ð´Ð°Ñ‚Ð°:\n" +"\n" +" git refs migrate --ref-format=reftable\n" +"\n" +"Ðе вÑички реализации на Git поддържат Ð½Ð¾Ð²Ð¸Ñ Ñ„Ð¾Ñ€Ð¼Ð°Ñ‚. Затова, ако ще\n" +"ползвате други инÑтрументи, за да доÑтъпвате хранилището, миграциÑта\n" +"към ÑъхранÑването на указателите чрез таблица може да не е подходÑщо\n" +"решение за ваÑ.\n" + #, c-format msgid "" "some local refs could not be updated; try running\n" @@ -6743,21 +7359,6 @@ msgstr "използване на това ИМЕ вмеÑто иÑтинÑÐºÐ¸Ñ msgid "file to read from" msgstr "файл, от който да Ñе чете" -msgid "git for-each-ref [<options>] [<pattern>]" -msgstr "git for-each-ref [ОПЦИЯ…] [ШÐБЛОÐ]" - -msgid "git for-each-ref [--points-at <object>]" -msgstr "git for-each-ref [--points ОБЕКТ]" - -msgid "git for-each-ref [--merged [<commit>]] [--no-merged [<commit>]]" -msgstr "git for-each-ref [--merged [ПОДÐÐ’ÐÐЕ]] [--no-merged [ПОДÐÐ’ÐÐЕ]]" - -msgid "git for-each-ref [--contains [<commit>]] [--no-contains [<commit>]]" -msgstr "git for-each-ref [--contains [ПОДÐÐ’ÐÐЕ]] [--no-contains [ПОДÐÐ’ÐÐЕ]]" - -msgid "git for-each-ref [--start-after <marker>]" -msgstr "git for-each-ref [--start-after ÐœÐРКЕР]" - msgid "quote placeholders suitably for shells" msgstr "цитиране подходÑщо за командни интерпретатори на обвивката" @@ -6812,6 +7413,9 @@ msgstr "непознат аргумент към опциÑта „--stdin“" msgid "cannot use --start-after with patterns" msgstr "опциÑта „--start-after“ е неÑъвмеÑтима ÑÑŠÑ Ð·Ð°Ð´Ð°Ð²Ð°Ð½ÐµÑ‚Ð¾ на шаблони" +msgid "git for-each-ref " +msgstr "git for-each-ref" + msgid "git for-each-repo --config=<config> [--] <arguments>" msgstr "git for-each-repo --config=ÐÐСТРОЙКР[--] ÐРГУМЕÐТ…" @@ -7294,6 +7898,9 @@ msgstr "" "задачата „incremental-repack“ Ñе преÑкача, защото наÑтройката " "„core.multiPackIndex“ е изключена" +msgid "failed to perform geometric repack" +msgstr "неуÑпешно геометрично препакетиране" + #, c-format msgid "task '%s' failed" msgstr "неуÑпешно изпълнение на задачата „%s“" @@ -7303,6 +7910,10 @@ msgid "lock file '%s' exists, skipping maintenance" msgstr "заключващиÑÑ‚ файл „%s“ ÑъщеÑтвува. ДейÑтвието Ñе преÑкача" #, c-format +msgid "unknown maintenance strategy: '%s'" +msgstr "непозната ÑÑ‚Ñ€Ð°Ñ‚ÐµÐ³Ð¸Ñ Ð·Ð° поддръжка: „%s“" + +#, c-format msgid "'%s' is not a valid task" msgstr "„%s“ не е правилна задача" @@ -8187,6 +8798,29 @@ msgstr "опциÑта „--trailer“ е неÑъвмеÑтима Ñ â€ž--only- msgid "no input file given for in-place editing" msgstr "не е зададен входен файл за редактиране на мÑÑто" +msgid "last-modified can only operate on one tree at a time" +msgstr "командата „last-modified“ работи Ñамо Ñ Ð¿Ð¾ едно дърво" + +#, c-format +msgid "unknown last-modified argument: %s" +msgstr "неправилен аргумент за командата „last-modified“: %s" + +msgid "unable to setup last-modified" +msgstr "командата „last-modified“ не може да Ñе наÑтрои" + +msgid "" +"git last-modified [--recursive] [--show-trees] [<revision-range>] [[--] " +"<path>...]" +msgstr "" +"git last-modified [--recursive] [--show-trees] [ДИÐПÐЗОÐ_ÐÐ_ВЕРСИИТЕ] [[--] " +"ПЪТ…]" + +msgid "recurse into subtrees" +msgstr "рекурÑивно обхождане поддърветата" + +msgid "show tree entries when recursing into subtrees" +msgstr "извеждане на дърветата при рекурÑивното обхождане на поддърветата" + msgid "git log [<options>] [<revision-range>] [[--] <path>...]" msgstr "git log [ОПЦИЯ…] [ДИÐПÐЗОÐ_ÐÐ_ВЕРСИИТЕ] [[--] ПЪТ…]" @@ -8225,6 +8859,22 @@ msgstr "" msgid "-L<range>:<file> cannot be used with pathspec" msgstr "опциÑта „-LДИÐПÐЗОÐ:ФÐЙЛ“ не може да Ñе ползва Ñ ÑˆÐ°Ð±Ð»Ð¾Ð½ за пътища" +msgid "" +"\n" +"hint: You can replace 'git whatchanged <opts>' with:\n" +"hint:\tgit log <opts> --raw --no-merges\n" +"hint: Or make an alias:\n" +"hint:\tgit config set --global alias.whatchanged 'log --raw --no-merges'\n" +"\n" +msgstr "" +"\n" +"ПОДСКÐЗКÐ: Може да замените „git whatchanged ОПЦИЯ…“ Ñ:\n" +"ПОДСКÐЗКÐ: git log ОПЦИЯ… --raw --no-merges\n" +"ПОДСКÐЗКÐ: Рможе да Ñъздадете и пÑевдоним:\n" +"ПОДСКÐЗКÐ: git config set --global alias.whatchanged 'log --raw --no-" +"merges'\n" +"\n" + #, c-format msgid "git show %s: bad file" msgstr "git show %s: повреден файл" @@ -8680,9 +9330,6 @@ msgstr "git ls-tree [ОПЦИЯ…] УКÐЗÐТЕЛ_КЪМ_ДЪРВО [ПЪТ†msgid "only show trees" msgstr "извеждане Ñамо на дървета" -msgid "recurse into subtrees" -msgstr "рекурÑивно обхождане поддърветата" - msgid "show trees when recursing" msgstr "извеждане на дърветата при рекурÑивното обхождане" @@ -8838,10 +9485,6 @@ msgid "Could not write object file" msgstr "Файлът Ñ Ð¾Ð±ÐµÐºÑ‚Ð¸ не може да Ñе запише" #, c-format -msgid "unknown option %s" -msgstr "непозната опциÑ: „%s“" - -#, c-format msgid "could not parse object '%s'" msgstr "неуÑпешен анализ на обекта „%s“" @@ -9012,10 +9655,6 @@ msgstr "не може да Ñе извърши Ñкатаване" msgid "stash failed" msgstr "неуÑпешно Ñкатаване" -#, c-format -msgid "not a valid object: %s" -msgstr "неправилен обект: „%s“" - msgid "read-tree failed" msgstr "неуÑпешно прочитане на обект-дърво" @@ -9954,7 +10593,7 @@ msgid "" "expected edge object ID, got garbage:\n" " %s" msgstr "" -"очаква Ñе идентификатор на краен обект, а не:\n" +"очаква Ñе идентификатор на краен обект, а не повредени данни:\n" " %s" #, c-format @@ -9962,7 +10601,7 @@ msgid "" "expected object ID, got garbage:\n" " %s" msgstr "" -"очаква Ñе идентификатор на обект, а не:\n" +"очаква Ñе идентификатор на обект, а не повредени данни:\n" " %s" msgid "could not load cruft pack .mtimes" @@ -10205,27 +10844,8 @@ msgstr "" "Общо: %<PRIu32> (разлики: %<PRIu32>), преизползвани: %<PRIu32> (разлики: " "%<PRIu32>), преизползвани при пакетиране: %<PRIu32> (от %<PRIuMAX>)" -msgid "" -"git pack-refs [--all] [--no-prune] [--auto] [--include <pattern>] [--exclude " -"<pattern>]" -msgstr "" -"git pack-refs [--all] [--no-prune] [--auto] [--include ШÐБЛОÐ] [--exclude " -"ШÐБЛОÐ]" - -msgid "pack everything" -msgstr "пакетиране на вÑичко" - -msgid "prune loose refs (default)" -msgstr "окаÑÑ‚Ñ€Ñне на недоÑтижимите указатели (Ñтандартно)" - -msgid "auto-pack refs as needed" -msgstr "автоматично пакетиране на указателите при нужда" - -msgid "references to include" -msgstr "кои указатели да Ñе включат" - -msgid "references to exclude" -msgstr "кои указатели да Ñе преÑкочат" +msgid "git pack-refs " +msgstr "git pack-refs " msgid "git patch-id [--stable | --unstable | --verbatim]" msgstr "git patch-id [--stable|--unstable|--verbatim]" @@ -10757,6 +11377,10 @@ msgstr "git range-diff [ОПЦИЯ…] СТÐÐ _ВРЪХ...ÐОВ_ВРЪХ" msgid "git range-diff [<options>] <base> <old-tip> <new-tip>" msgstr "git range-diff [ОПЦИЯ…] БÐЗРСТÐÐ _ВРЪХ ÐОВ_ВРЪХ" +#, c-format +msgid "invalid max-memory value: %s" +msgstr "неправилна ÑтойноÑÑ‚ за макÑималната памет (max-memory): %s" + msgid "use simple diff colors" msgstr "използване на проÑти цветове за разликите" @@ -10766,6 +11390,12 @@ msgstr "бележки" msgid "passed to 'git log'" msgstr "подава Ñе на командата „git log“" +msgid "size" +msgstr "размер" + +msgid "maximum memory for cost matrix (default 4G)" +msgstr "макÑимална памет за матрицата за цената (Ñтандартно е 4G)" + msgid "only emit output related to the first range" msgstr "извеждане Ñамо на информациÑта за Ð¿ÑŠÑ€Ð²Ð¸Ñ Ð´Ð¸Ð°Ð¿Ð°Ð·Ð¾Ð½" @@ -11337,16 +11967,13 @@ msgstr "git reflog [show] [ОПЦИЯ…] [УКÐЗÐТЕЛ]" msgid "git reflog list" msgstr "git reflog list" -msgid "" -"git reflog expire [--expire=<time>] [--expire-unreachable=<time>]\n" -" [--rewrite] [--updateref] [--stale-fix]\n" -" [--dry-run | -n] [--verbose] [--all [--single-worktree] | " -"<refs>...]" +msgid "git reflog exists <ref>" +msgstr "git reflog exists УКÐЗÐТЕЛ" + +msgid "git reflog write <ref> <old-oid> <new-oid> <message>" msgstr "" -"git reflog expire [--expire=ВРЕМЕ] [--expire-unreachable=ВРЕМЕ]\n" -" [--rewrite] [--updateref] [--stale-fix]\n" -" [--dry-run|-n] [--verbose] [--all [--single-worktree]|" -"УКÐЗÐТЕЛ…]" +"git reflog write УКÐЗÐТЕЛ СТÐÐ _УКÐЗÐТЕЛ_ÐÐ_ОБЕКТ ÐОВ_УКÐЗÐТЕЛ_ÐÐ_ОБЕКТ " +"СЪОБЩЕÐИЕ" msgid "" "git reflog delete [--rewrite] [--updateref]\n" @@ -11355,12 +11982,20 @@ msgstr "" "git reflog delete [--rewrite] [--updateref]\n" " [--dry-run|-n] [--verbose] УКÐЗÐТЕЛ@{УТОЧÐЕÐИЕ}…" -msgid "git reflog exists <ref>" -msgstr "git reflog exists УКÐЗÐТЕЛ" - msgid "git reflog drop [--all [--single-worktree] | <refs>...]" msgstr "git reflog drop [--all [--single-worktree]|УКÐЗÐТЕЛ…]" +msgid "" +"git reflog expire [--expire=<time>] [--expire-unreachable=<time>]\n" +" [--rewrite] [--updateref] [--stale-fix]\n" +" [--dry-run | -n] [--verbose] [--all [--single-worktree] | " +"<refs>...]" +msgstr "" +"git reflog expire [--expire=ВРЕМЕ] [--expire-unreachable=ВРЕМЕ]\n" +" [--rewrite] [--updateref] [--stale-fix]\n" +" [--dry-run|-n] [--verbose] [--all [--single-worktree]|" +"УКÐЗÐТЕЛ…]" + #, c-format msgid "invalid timestamp '%s' given to '--%s'" msgstr "неправилно времево клеймо „%s“ подадено към „--%s“" @@ -11433,12 +12068,51 @@ msgstr "изтриване на журнала Ñ ÑƒÐºÐ°Ð·Ð°Ñ‚ÐµÐ»Ð¸ Ñамо в msgid "references specified along with --all" msgstr "указателите Ñе задават Ñ Ð¾Ð¿Ñ†Ð¸Ñта „--all“" +#, c-format +msgid "invalid reference name: %s" +msgstr "неправилно име на указател: %s" + +#, c-format +msgid "invalid old object ID: '%s'" +msgstr "неправилен идентификатор на Ñтар обект: „%s“" + +#, c-format +msgid "old object '%s' does not exist" +msgstr "ÑтариÑÑ‚ обект „%s“ не ÑъщеÑтвува" + +#, c-format +msgid "invalid new object ID: '%s'" +msgstr "неправилен идентификатор на нов обект: „%s“" + +#, c-format +msgid "new object '%s' does not exist" +msgstr "новиÑÑ‚ обект „%s“ не ÑъщеÑтвува" + +#, c-format +msgid "cannot start transaction: %s" +msgstr "транзакциÑта „%s“ не може да Ñе Ñтартира" + +#, c-format +msgid "cannot queue reflog update: %s" +msgstr "" +"обновÑването „%s“ на журнала Ñ Ð¿Ð¾Ð´Ð°Ð²Ð°Ð½Ð¸Ñта не може да Ñе Ñложи в опашката" + +#, c-format +msgid "cannot commit reflog update: %s" +msgstr "„%s“ не е обновÑване на журнала Ñ Ð¿Ð¾Ð´Ð°Ð²Ð°Ð½Ð¸Ñта" + msgid "git refs migrate --ref-format=<format> [--no-reflog] [--dry-run]" msgstr "git refs migrate --ref-format=ФОРМÐТ [--no-reflog] [--dry-run]" msgid "git refs verify [--strict] [--verbose]" msgstr "git refs verify [--strict] [--verbose]" +msgid "git refs exists <ref>" +msgstr "git ref exists УКÐЗÐТЕЛ" + +msgid "git refs optimize " +msgstr "git refs optimize " + msgid "specify the reference format to convert to" msgstr "указване на форма̀та за указател, към който да Ñе конвертира" @@ -11461,6 +12135,18 @@ msgstr "Ñтроги проверки" msgid "'git refs verify' takes no arguments" msgstr "командата „git refs verify“ не приема аргументи" +msgid "git refs list " +msgstr "git refs list " + +msgid "'git refs exists' requires a reference" +msgstr "„git refs exists“ изиÑква указател" + +msgid "reference does not exist" +msgstr "указателÑÑ‚ не ÑъщеÑтвува" + +msgid "failed to look up reference" +msgstr "Ñоченото от ÑƒÐºÐ°Ð·Ð°Ñ‚ÐµÐ»Ñ Ð»Ð¸Ð¿Ñва" + msgid "" "git remote add [-t <branch>] [-m <master>] [-f] [--tags | --no-tags] [--" "mirror=<fetch|push>] <name> <url>" @@ -11625,6 +12311,24 @@ msgstr "" " %s:%d\n" "използва отдалечено хранилище, което вече не ÑъщеÑтвува: „%s“" +msgid "" +"The remote you are trying to rename has conflicting references in the\n" +"new target refspec. This is most likely caused by you trying to nest\n" +"a remote into itself, e.g. by renaming 'parent' into 'parent/child'\n" +"or by unnesting a remote, e.g. the other way round.\n" +"\n" +"If that is the case, you can address this by first renaming the\n" +"remote to a different name.\n" +msgstr "" +"Отдалеченото хранилище, което Ñе пробвате да преименувате, Ñъдържа\n" +"указатели, които предизвикват конфликти в целевото хранилище на указатели.\n" +"Това най-чеÑто Ñе дължи на опит да вложите отдалечено хранилище в Ñебе Ñи,\n" +"напр. като преименувате „parent“ към „parent/child“ или при изваждането му\n" +"(преименуване в обратната поÑока).\n" +"\n" +"Ðко ÑлучаÑÑ‚ е такъв, може да го заобиколите като първо преименувате\n" +"отдалеченото хранилище Ñ Ð´Ñ€ÑƒÐ³Ð¾ име.\n" + #, c-format msgid "No such remote: '%s'" msgstr "ÐÑма отдалечено хранилище на име „%s“" @@ -11633,6 +12337,13 @@ msgstr "ÐÑма отдалечено хранилище на име „%s“" msgid "Could not rename config section '%s' to '%s'" msgstr "Разделът „%s“ в наÑтройките не може да Ñе преименува на „%s“" +msgid "Renaming remote references" +msgstr "Преименуване на отдалечените указатели" + +#, c-format +msgid "queueing remote ref renames failed: %s" +msgstr "неуÑпешно добавÑне на имената на отдалечените указатели: %s" + #, c-format msgid "" "Not updating non-default fetch refspec\n" @@ -11643,16 +12354,9 @@ msgstr "" " %s\n" " Променете наÑтройките ръчно, ако е необходимо." -msgid "Renaming remote references" -msgstr "Преименуване на отдалечените указатели" - #, c-format -msgid "deleting '%s' failed" -msgstr "неуÑпешно изтриване на „%s“" - -#, c-format -msgid "creating '%s' failed" -msgstr "неуÑпешно Ñъздаване на „%s“" +msgid "renaming remote refs failed: %s" +msgstr "неуÑпешно преименуване на отдалечените указатели: %s" msgid "" "Note: A branch outside the refs/remotes/ hierarchy was not removed;\n" @@ -11939,52 +12643,6 @@ msgstr "" "Ползвайте опциÑта „--no-write-bitmap-index“ или изключете наÑтройката\n" "„pack.writeBitmaps“." -msgid "could not start pack-objects to repack promisor objects" -msgstr "" -"командата „pack-objects“ не може да Ñе Ñтартира за препакетирането на " -"гарантиращите обекти" - -msgid "failed to feed promisor objects to pack-objects" -msgstr "" -"гарантиращите обекти не може да Ñе подадат на командата „git pack-objects“" - -msgid "repack: Expecting full hex object ID lines only from pack-objects." -msgstr "" -"repack: от „pack-objects“ Ñе изиÑкват редове Ñамо Ñ Ð¿ÑŠÐ»Ð½Ð¸ шеÑтнайÑетични " -"указатели." - -msgid "could not finish pack-objects to repack promisor objects" -msgstr "" -"командата „pack-objects“ не може да завърши за препакетирането на " -"гарантиращите обекти" - -#, c-format -msgid "cannot open index for %s" -msgstr "грешка при отварÑне на индекÑа за „%s“" - -#, c-format -msgid "pack %s too large to consider in geometric progression" -msgstr "пакет „%s“ е твърде голÑм, за да е чаÑÑ‚ от геометрична прогреÑиÑ" - -#, c-format -msgid "pack %s too large to roll up" -msgstr "пакет „%s“ е твърде голÑм за Ñвиване" - -#, c-format -msgid "could not open tempfile %s for writing" -msgstr "временниÑÑ‚ файл „%s“ не може да Ñе отвори за запиÑ" - -msgid "could not close refs snapshot tempfile" -msgstr "временниÑÑ‚ файл ÑÑŠÑ Ñнимка на указателите не може да Ñе затвори" - -#, c-format -msgid "could not remove stale bitmap: %s" -msgstr "изтриването на оÑтарÑлата битова маÑка „%s“ е невъзможно" - -#, c-format -msgid "pack prefix %s does not begin with objdir %s" -msgstr "името на Ð¿Ð°ÐºÐµÑ‚Ð½Ð¸Ñ Ñ„Ð°Ð¹Ð» „%s“ не започва Ñ Ð´Ð¸Ñ€ÐµÐºÑ‚Ð¾Ñ€Ð¸Ñта за обекти Ñ â€ž%s“" - msgid "pack everything in a single pack" msgstr "пакетиране на вÑичко в пакет" @@ -12095,18 +12753,6 @@ msgstr "опциÑта „%s“ изиÑква „%s“" msgid "Nothing new to pack." msgstr "Ðищо ново за пакетиране" -#, c-format -msgid "renaming pack to '%s' failed" -msgstr "неуÑпешно преименуване на Ð¿Ð°ÐºÐµÑ‚Ð½Ð¸Ñ Ñ„Ð°Ð¹Ð» на „%s“" - -#, c-format -msgid "pack-objects did not write a '%s' file for pack %s-%s" -msgstr "Командата „git pack-objects“ не запиÑа файл „%s“ за пакета „%s-%s“" - -#, c-format -msgid "could not unlink: %s" -msgstr "неуÑпешно изтриване на „%s“" - msgid "git replace [-f] <object> <replacement>" msgstr "git replace [-f] ОБЕКТ ЗÐМЯÐÐ" @@ -12362,6 +13008,62 @@ msgstr "не Ñе поддържа прилагане наново и на Ð½Ð°Ñ msgid "replaying merge commits is not supported yet!" msgstr "не Ñе поддържа прилагане наново и на Ð¿Ð¾Ð´Ð°Ð²Ð°Ð½Ð¸Ñ ÑÑŠÑ Ñливане!" +#, c-format +msgid "key '%s' not found" +msgstr "ключът „%s“ липÑва" + +#, c-format +msgid "invalid format '%s'" +msgstr "неправилен формат „%s“" + +msgid "output format" +msgstr "изходен формат" + +msgid "synonym for --format=nul" +msgstr "пÑевдоним на „--format=nul“" + +msgid "unsupported output format" +msgstr "неподдържан изходен формат" + +msgid "References" +msgstr "Указатели" + +msgid "Count" +msgstr "Брой" + +msgid "Branches" +msgstr "Клони" + +msgid "Tags" +msgstr "Етикети" + +msgid "Remotes" +msgstr "Отдалечени хранилища" + +msgid "Others" +msgstr "Други" + +msgid "Reachable objects" +msgstr "ДоÑтижими обекти" + +msgid "Commits" +msgstr "ПодаваниÑ" + +msgid "Trees" +msgstr "Дървета" + +msgid "Blobs" +msgstr "Обекти-BLOB" + +msgid "Repository structure" +msgstr "Структура на хранилището" + +msgid "Value" +msgstr "СтойноÑÑ‚" + +msgid "Counting references" +msgstr "ПреброÑване на указателите" + msgid "" "git rerere [clear | forget <pathspec>... | diff | status | remaining | gc]" msgstr "git rerere [clear|forget ШÐБЛОÐ_ЗÐ_ПЪТИЩÐ…|diff|status|remaining|gc]" @@ -12958,12 +13660,6 @@ msgstr "git show-ref --exclude-existing[=ШÐБЛОÐ]" msgid "git show-ref --exists <ref>" msgstr "git show-ref --exists УКÐЗÐТЕЛ" -msgid "reference does not exist" -msgstr "указателÑÑ‚ не ÑъщеÑтвува" - -msgid "failed to look up reference" -msgstr "Ñоченото от ÑƒÐºÐ°Ð·Ð°Ñ‚ÐµÐ»Ñ Ð»Ð¸Ð¿Ñва" - msgid "only show tags (can be combined with --branches)" msgstr "извеждане на етикетите (може да Ñе комбинира Ñ â€ž--branches“ за клони)" @@ -12997,9 +13693,10 @@ msgstr "" msgid "" "git sparse-checkout (init | list | set | add | reapply | disable | check-" -"rules) [<options>]" +"rules | clean) [<options>]" msgstr "" -"git sparse-checkout (init|list|set|add|reapply|disable|check-rules) ОПЦИЯ…" +"git sparse-checkout (init|list|set|add|reapply|disable|check-rules|clean) " +"ОПЦИЯ…" msgid "this worktree is not sparse" msgstr "това работно дърво не е чаÑтично" @@ -13040,10 +13737,6 @@ msgid "toggle the use of a sparse index" msgstr "превключване на ползването на чаÑтичен индекÑ" #, c-format -msgid "unable to create leading directories of %s" -msgstr "родителÑките директории на „%s“ не може да бъдат Ñъздадени" - -#, c-format msgid "failed to open '%s'" msgstr "„%s“ не може да Ñе отвори" @@ -13126,6 +13819,37 @@ msgstr "" "шаблоните за чаÑтичноÑÑ‚ може да бъдат приложени наново Ñамо в чаÑтично " "изтеглено хранилище" +msgid "report each affected file, not just directories" +msgstr "извеждане на заÑегнатите файлове, а не Ñамо на директориите" + +msgid "must be in a sparse-checkout to clean directories" +msgstr "" +"за изчиÑтване на директории Ñ‚Ñ€Ñбва да Ñте в чаÑтично изтеглено хранилище" + +msgid "must be in a cone-mode sparse-checkout to clean directories" +msgstr "" +"за изчиÑтване на директории Ñ‚Ñ€Ñбва да Ñте в чаÑтично изтеглено хранилище Ñ " +"пътеводно напаÑване" + +msgid "for safety, refusing to clean without one of --force or --dry-run" +msgstr "" +"за безопаÑноÑÑ‚ изчиÑтването изиÑква нÑÐºÐ¾Ñ Ð¾Ñ‚ опциите „--force“ или „--dry-" +"run“" + +msgid "failed to read index" +msgstr "неуÑпешно изчитане на индекÑа" + +msgid "" +"failed to convert index to a sparse index; resolve merge conflicts and try " +"again" +msgstr "" +"индекÑÑŠÑ‚ не може да Ñе преобразува в чаÑтичен — първо коригирайте " +"конфликтите и тогава пробвайте отново" + +#, c-format +msgid "failed to remove '%s'" +msgstr "„%s“ не може да Ñе изтрие" + msgid "error while refreshing working directory" msgstr "грешка при обновÑване на работната директориÑ" @@ -14871,9 +15595,6 @@ msgstr "Ð·Ð°Ð¿Ð¸Ñ Ð½Ð° обект-дърво за поддиректориÑÑ‚Ð msgid "only useful for debugging" msgstr "Ñамо за изчиÑтване на грешки" -msgid "core.fsyncMethod = batch is unsupported on this platform" -msgstr "„core.fsyncMethod = batch“ не Ñе поддържа на тази платформа" - #, c-format msgid "could not parse bundle list key %s with value '%s'" msgstr "" @@ -15280,6 +16001,9 @@ msgid "Add or parse structured information in commit messages" msgstr "" "ДобавÑне или обработка на Ñтруктурирана Ð¸Ð½Ñ„Ð¾Ñ€Ð¼Ð°Ñ†Ð¸Ñ Ð² ÑъобщениÑта при подаване" +msgid "EXPERIMENTAL: Show when files were last modified" +msgstr "ЕКСПЕРИМЕÐТÐЛÐО: Извеждане кога файловете Ñа променени поÑледно" + msgid "Show commit logs" msgstr "Извеждане на журнала Ñ Ð¿Ð¾Ð´Ð°Ð²Ð°Ð½Ð¸Ñта" @@ -15402,6 +16126,9 @@ msgstr "" "ЕКСПЕРИМЕÐТÐЛÐО: прилагане на Ð¿Ð¾Ð´Ð°Ð²Ð°Ð½Ð¸Ñ Ð²ÑŠÑ€Ñ…Ñƒ нова база, работи и Ñ Ð³Ð¾Ð»Ð¸ " "хранилища" +msgid "Retrieve information about the repository" +msgstr "Получаване на Ð¸Ð½Ñ„Ð¾Ñ€Ð¼Ð°Ñ†Ð¸Ñ Ð·Ð° хранилището" + msgid "Generates a summary of pending changes" msgstr "Обобщение на предÑтоÑщите промѐни" @@ -15483,8 +16210,8 @@ msgstr "Преминаване към друг клон" msgid "Read, modify and delete symbolic refs" msgstr "Извеждане, промÑна и изтриване на Ñимволни указатели" -msgid "Create, list, delete or verify a tag object signed with GPG" -msgstr "Извеждане, Ñъздаване, изтриване, проверка на етикети подпиÑани Ñ GPG" +msgid "Create, list, delete or verify tags" +msgstr "Създаване, извеждане, изтриване или проверка на етикети" msgid "Creates a temporary file with a blob's contents" msgstr "Създаване на временен файл ÑÑŠÑ Ñъщото Ñъдържание като обектът-BLOB" @@ -16370,6 +17097,43 @@ msgstr "обектът-BLOB „%s“ Ñ ÐºÐ¾Ð½Ñ„Ð¸Ð³ÑƒÑ€Ð°Ñ†Ð¸Ð¸ липÑва" msgid "unable to parse command-line config" msgstr "неправилни наÑтройки от ÐºÐ¾Ð¼Ð°Ð½Ð´Ð½Ð¸Ñ Ñ€ÐµÐ´" +#, c-format +msgid "" +"\n" +"To use the default comment string (#) please run\n" +"\n" +"%s" +msgstr "" +"\n" +"За да ползвате ÑÑ‚Ð°Ð½Ð´Ð°Ñ€Ñ‚Ð½Ð¸Ñ Ð½Ð¸Ð· за коментар „#“, изпълнете\n" +"\n" +"%s" + +msgid "<comment string>" +msgstr "ÐИЗ_ЗÐ_КОМЕÐТÐÐ " + +#, c-format +msgid "" +"\n" +"To set a custom comment string please run\n" +"\n" +"%s\n" +"where '%s' is the string you wish to use.\n" +msgstr "" +"\n" +"За да зададете друг низ за коментар, изпълнете\n" +"\n" +"%s\n" +"където „%s“ е низът, който иÑкате да ползвате.\n" + +#, c-format +msgid "Support for '%s=auto' has been removed in Git 3.0" +msgstr "Поддръжката на „%s=auto“ е премахната в Git 3.0" + +#, c-format +msgid "Support for '%s=auto' is deprecated and will be removed in Git 3.0" +msgstr "Поддръжката на „%s=auto“ е оÑтарÑла и ще бъде премахната в Git 3.0" + msgid "unknown error occurred while reading the configuration files" msgstr "неочаквана грешка при изчитането на конфигурационните файлове" @@ -16870,6 +17634,12 @@ msgstr "директориÑта „%s“ не може да Ñе добави Ð msgid "failed to write archive" msgstr "неуÑпешен Ð·Ð°Ð¿Ð¸Ñ Ð½Ð° архива" +msgid "max-depth is not supported for worktree diffs" +msgstr "„max-depth“ не Ñе поддържа за разлики в работно дърво" + +msgid "max-depth is not supported for index diffs" +msgstr "„max-depth“ не Ñе поддържа за разлики Ñ Ð¸Ð½Ð´ÐµÐºÑа" + msgid "--merge-base does not work with ranges" msgstr "опциÑта „--merge-base“ не работи Ñ Ð´Ð¸Ð°Ð¿Ð°Ð·Ð¾Ð½Ð¸" @@ -17393,6 +18163,12 @@ msgstr "[(A|C|D|M|R|T|U|X|B)…[*]]" msgid "select files by diff type" msgstr "избор на файловете по вид разлика" +msgid "<depth>" +msgstr "ДЪЛБОЧИÐÐ" + +msgid "maximum tree depth to recurse" +msgstr "макÑимална дълбочина на дървото за обхождане" + msgid "<file>" msgstr "ФÐЙЛ" @@ -17599,10 +18375,6 @@ msgid "invalid unshallow line: %s" msgstr "неправилен неплитък ред: „%s“" #, c-format -msgid "object not found: %s" -msgstr "обектът „%s“ липÑва" - -#, c-format msgid "error in object: %s" msgstr "грешка в обекта: „%s“" @@ -17885,6 +18657,10 @@ msgstr "празен пÑевдоним за „%s“" msgid "recursive alias: %s" msgstr "зациклен пÑевдоним: „%s“" +#, c-format +msgid "alias loop detected: expansion of '%s' does not terminate:%s" +msgstr "зациклÑне в пÑевдонимите: замеÑтваниÑта на „%s“ не приключват:%s" + msgid "write failure on standard output" msgstr "грешка при Ð·Ð°Ð¿Ð¸Ñ Ð½Ð° ÑÑ‚Ð°Ð½Ð´Ð°Ñ€Ñ‚Ð½Ð¸Ñ Ð¸Ð·Ñ…Ð¾Ð´" @@ -17895,10 +18671,6 @@ msgid "close failed on standard output" msgstr "грешка при затварÑне на ÑÑ‚Ð°Ð½Ð´Ð°Ñ€Ñ‚Ð½Ð¸Ñ Ð¸Ð·Ñ…Ð¾Ð´" #, c-format -msgid "alias loop detected: expansion of '%s' does not terminate:%s" -msgstr "зациклÑне в пÑевдонимите: замеÑтваниÑта на „%s“ не приключват:%s" - -#, c-format msgid "cannot handle %s as a builtin" msgstr "„%s“ не може да Ñе обработи като вградена команда" @@ -17957,6 +18729,10 @@ msgstr "лош/неÑъвмеÑтим Ð¿Ð¾Ð´Ð¿Ð¸Ñ â€ž%s“" msgid "failed to get the ssh fingerprint for key '%s'" msgstr "отпечатъкът по ssh на ключа „%s“ не може да Ñе получи" +#, c-format +msgid "failed to get the ssh fingerprint for key %s" +msgstr "отпечатъкът по ssh на ключа „%s“ не може да Ñе получи" + msgid "" "either user.signingkey or gpg.ssh.defaultKeyCommand needs to be configured" msgstr "" @@ -17964,6 +18740,11 @@ msgstr "" "Ñ‚Ñ€Ñбва да е зададена" #, c-format +msgid "malformed build-time gpg.ssh.defaultKeyCommand: %s" +msgstr "" +"неправилна команда „gpg.ssh.defaultKeyCommand“ по време на компилиране: %s" + +#, c-format msgid "gpg.ssh.defaultKeyCommand succeeded but returned no keys: %s %s" msgstr "" "командата „gpg.ssh.defaultKeyCommand“ завърши уÑпешно, но не върна никакви " @@ -18231,6 +19012,13 @@ msgstr "" " ◠заÑвен адреÑ: %s\n" " ◠пренаÑочване: %s" +#, c-format +msgid "" +"number too large to represent as curl_off_t on this platform: %<PRIuMAX>" +msgstr "" +"чиÑлото е прекалено голÑмо, за да Ñе предÑтави като „curl_off_t“ на тази " +"платформа: %<PRIuMAX>" + msgid "Author identity unknown\n" msgstr "ЛипÑва Ð¸Ð½Ñ„Ð¾Ñ€Ð¼Ð°Ñ†Ð¸Ñ Ð·Ð° автора\n" @@ -18701,10 +19489,6 @@ msgid "could not load pack" msgstr "пакетът не може да Ñе зареди" #, c-format -msgid "could not open index for %s" -msgstr "индекÑÑŠÑ‚ за „%s“ не може да Ñе отвори" - -#, c-format msgid "unable to link '%s' to '%s'" msgstr "не може да Ñе Ñъздаде връзка „%s“, коÑто да Ñочи към „%s“" @@ -18729,6 +19513,10 @@ msgid "unknown preferred pack: '%s'" msgstr "непознат предпочитан пакет: %s" #, c-format +msgid "failed to open preferred pack %s" +msgstr "предпочитаниÑÑ‚ пакет „%s“ не може да Ñе отвори" + +#, c-format msgid "cannot select preferred pack %s with no objects" msgstr "" "не може да изберете „%s“, който не Ñъдържа обекти, за предпочитан пакет" @@ -18753,6 +19541,9 @@ msgstr "не може да Ñе Ñъздаде временен Ñлой за и msgid "could not write multi-pack bitmap" msgstr "многопакетната битова маÑка не може да Ñе запази" +msgid "too many multi-pack-indexes" +msgstr "прекалено много индекÑи за множеÑтво пакети" + msgid "unable to open multi-pack-index chain file" msgstr "файлът Ñ Ð²ÐµÑ€Ð¸Ð³Ð°Ñ‚Ð° на гра̀фа Ñ Ð¿Ð¾Ð´Ð°Ð²Ð°Ð½Ð¸Ñта не може да Ñе отвори" @@ -19019,7 +19810,7 @@ msgstr "непакетираниÑÑ‚ обект „%s“ е повреден" #, c-format msgid "garbage at end of loose object '%s'" -msgstr "грешни данни в ÐºÑ€Ð°Ñ Ð½Ð° Ð½ÐµÐ¿Ð°ÐºÐµÑ‚Ð¸Ñ€Ð°Ð½Ð¸Ñ Ð¾Ð±ÐµÐºÑ‚ „%s“" +msgstr "повредени данни в ÐºÑ€Ð°Ñ Ð½Ð° Ð½ÐµÐ¿Ð°ÐºÐµÑ‚Ð¸Ñ€Ð°Ð½Ð¸Ñ Ð¾Ð±ÐµÐºÑ‚ „%s“" #, c-format msgid "unable to open loose object %s" @@ -19053,10 +19844,6 @@ msgid "files '%s' and '%s' differ in contents" msgstr "Ñъдържанието на файловете „%s“ и „%s“ е различно" #, c-format -msgid "unable to write file %s" -msgstr "файлът „%s“ не може да Ñе запише" - -#, c-format msgid "unable to write repeatedly vanishing file %s" msgstr "ÑмалÑващиÑÑ‚ Ñе файл „%s“ не може да Ñе запише" @@ -19064,6 +19851,9 @@ msgstr "ÑмалÑващиÑÑ‚ Ñе файл „%s“ не може да Ñе з msgid "unable to set permission to '%s'" msgstr "права̀та за доÑтъп до „%s“ не може да бъдат зададени" +msgid "core.fsyncMethod = batch is unsupported on this platform" +msgstr "„core.fsyncMethod = batch“ не Ñе поддържа на тази платформа" + msgid "error when closing loose object file" msgstr "грешка при затварÑнето на файла Ñ Ð½ÐµÐ¿Ð°ÐºÐµÑ‚Ð¸Ñ€Ð°Ð½ обект" @@ -19593,6 +20383,21 @@ msgstr "" msgid "mtimes file %s is corrupt" msgstr "файлът Ñ Ð²Ñ€ÐµÐ¼ÐµÑ‚Ð¾ на промÑна (mtime) „%s“ е повреден" +msgid "pack everything" +msgstr "пакетиране на вÑичко" + +msgid "prune loose refs (default)" +msgstr "окаÑÑ‚Ñ€Ñне на недоÑтижимите указатели (Ñтандартно)" + +msgid "auto-pack refs as needed" +msgstr "автоматично пакетиране на указателите при нужда" + +msgid "references to include" +msgstr "кои указатели да Ñе включат" + +msgid "references to exclude" +msgstr "кои указатели да Ñе преÑкочат" + #, c-format msgid "reverse-index file %s is too small" msgstr "файлът Ñ Ð¾Ð±Ñ€Ð°Ñ‚Ð½Ð¸Ñ Ð¸Ð½Ð´ÐµÐºÑ â€ž%s“ е твърде малък" @@ -20033,6 +20838,10 @@ msgid "could not fetch %s from promisor remote" msgstr "„%s“ не може да Ñе доÑтави от гарантиращото хранилище" #, c-format +msgid "unsupported field '%s' in '%s' config" +msgstr "неподдържана поле „%s“ в наÑтройките на „%s“" + +#, c-format msgid "no or empty URL advertised for remote '%s'" msgstr "липÑващ или празен Ð°Ð´Ñ€ÐµÑ Ð·Ð° отдалечено хранилище „%s“" @@ -20041,12 +20850,16 @@ msgid "known remote named '%s' but with URL '%s' instead of '%s'" msgstr "има хранилище Ñ Ð¸Ð¼Ðµ „%s“, но адреÑÑŠÑ‚ му е „%s“, а не „%s“" #, c-format -msgid "unknown '%s' value for '%s' config option" -msgstr "непозната ÑтойноÑÑ‚ „%s“ за наÑтройката „%s“" +msgid "invalid element '%s' from remote info" +msgstr "неправилен елемент „%s“ в информациÑта за отдалеченото хранилище" #, c-format -msgid "unknown element '%s' from remote info" -msgstr "непознат елемент „%s“ в информациÑта за отдалеченото хранилище" +msgid "server advertised a promisor remote without a name or URL: %s" +msgstr "Ñървърът обÑви за налично хранилище-гарант без име или адреÑ: %s" + +#, c-format +msgid "unknown '%s' value for '%s' config option" +msgstr "непозната ÑтойноÑÑ‚ „%s“ за наÑтройката „%s“" #, c-format msgid "accepted promisor remote '%s' not found" @@ -20145,6 +20958,16 @@ msgid "failed to generate diff" msgstr "неуÑпешно Ñ‚ÑŠÑ€Ñене на разлика" #, c-format +msgid "" +"range-diff: unable to compute the range-diff, since it exceeds the maximum " +"memory for the cost matrix: %s (%<PRIuMAX> bytes) needed, limited to %s " +"(%<PRIuMAX> bytes)" +msgstr "" +"range-diff: диапазонната разлика не може да Ñе изчиÑли, защото превишава " +"макÑималната памет за матрицата Ñ Ñ†ÐµÐ½Ð¸Ñ‚Ðµ: необходими Ñа %s (%<PRIuMAX> " +"байта), а ограничението е %s (%<PRIuMAX> байта)" + +#, c-format msgid "could not parse log for '%s'" msgstr "журналът Ñ Ð¿Ð¾Ð´Ð°Ð²Ð°Ð½Ð¸Ñта на „%s“ не може да Ñе анализира" @@ -20688,6 +21511,9 @@ msgstr "„%s“ не е журнал Ñ Ð¿Ð¾Ð´Ð°Ð²Ð°Ð½Ð¸Ñ" msgid "no reflog for '%s'" msgstr "липÑва журнал Ñ Ð¿Ð¾Ð´Ð°Ð²Ð°Ð½Ð¸Ñта за „%s“" +msgid "Checking references consistency" +msgstr "Проверка на валидноÑтта на указателите" + #, c-format msgid "%s does not point to a valid object!" msgstr "„%s“ не Ñочи към позволен обект!" @@ -20703,8 +21529,9 @@ msgstr "%s„%s“ оÑтана извън клоните Ñлед изтривР#, c-format msgid "" "Using '%s' as the name for the initial branch. This default branch name\n" -"is subject to change. To configure the initial branch name to use in all\n" -"of your new repositories, which will suppress this warning, call:\n" +"will change to \"main\" in Git 3.0. To configure the initial branch name\n" +"to use in all of your new repositories, which will suppress this warning,\n" +"call:\n" "\n" "\tgit config --global init.defaultBranch <name>\n" "\n" @@ -20713,9 +21540,10 @@ msgid "" "\n" "\tgit branch -m <name>\n" msgstr "" -"ПървоначалниÑÑ‚ клон ще Ñе казва „%s“. Това може да Ñе променÑ. Може да " -"зададете\n" -"наÑтройката и да Ñпрете това Ñъобщение. За това изпълнете:\n" +"ПървоначалниÑÑ‚ клон ще Ñе казва „%s“. Това ще Ñе Ð¿Ñ€Ð¾Ð¼ÐµÐ½Ñ Ð½Ð° „main“ при Git " +"3.0.\n" +"Може да зададете наÑтройка, за да Ñпрете това Ñъобщение. За това " +"изпълнете:\n" "\n" " git config --global init.defaultBranch ИМЕ\n" "\n" @@ -20725,6 +21553,20 @@ msgstr "" " git branch -m ИМЕ\n" #, c-format +msgid "" +"Using '%s' as the name for the initial branch since Git 3.0.\n" +"If you expected Git to create 'master', the just-created\n" +"branch can be renamed via this command:\n" +"\n" +"\tgit branch -m master\n" +msgstr "" +"С излизането на Git 3.0 за име на Ð¿ÑŠÑ€Ð²Ð¾Ð½Ð°Ñ‡Ð°Ð»Ð½Ð¸Ñ ÐºÐ»Ð¾Ð½ Ñе\n" +"ползва „%s“. Ðко предпочитате Git да ползва „master“,\n" +"проÑто преименувайте току що ÑÑŠÐ·Ð´Ð°Ð´ÐµÐ½Ð¸Ñ ÐºÐ»Ð¾Ð½ Ñ ÐºÐ¾Ð¼Ð°Ð½Ð´Ð°Ñ‚Ð°:\n" +"\n" +" git branch -m master\n" + +#, c-format msgid "could not retrieve `%s`" msgstr "„%s“ не може да Ñе получи" @@ -20811,6 +21653,28 @@ msgstr "временната Ð´Ð¸Ñ€ÐµÐºÑ‚Ð¾Ñ€Ð¸Ñ Ð·Ð° Ð¼Ð¸Ð³Ñ€Ð°Ñ†Ð¸Ñ â€ž%s“ msgid "migrated refs can be found at '%s'" msgstr "мигрираните указатели Ñа в „%s“" +msgid "" +"'core.preferSymlinkRefs=true' is nominated for removal.\n" +"hint: The use of symbolic links for symbolic refs is deprecated\n" +"hint: and will be removed in Git 3.0. The configuration that\n" +"hint: tells Git to use them is thus going away. You can unset\n" +"hint: it with:\n" +"hint:\n" +"hint:\tgit config unset core.preferSymlinkRefs\n" +"hint:\n" +"hint: Git will then use the textual symref format instead." +msgstr "" +"„core.preferSymlinkRefs=true“ е отбелÑзан за изтриване.\n" +"ПОДСКÐЗКÐ: Ползването на Ñимволни връзки за Ñимволни указатели е оÑтарÑло и\n" +"ПОДСКÐЗКÐ: ще Ñе преуÑтанови в Git 3.0. ÐаÑтройката на Git да прави това\n" +"ПОДСКÐЗКÐ: по този начин Ñъщо предÑтои да бъде премахната. Може да Ñ " +"премахнете\n" +"ПОДСКÐЗКÐ: Ñами още Ñега Ñ ÐºÐ¾Ð¼Ð°Ð½Ð´Ð°Ñ‚Ð°:\n" +"ПОДСКÐЗКÐ:\n" +"ПОДСКÐЗКÐ: git config unset core.preferSymlinkRefs\n" +"ПОДСКÐЗКÐ:\n" +"ПОДСКÐЗКÐ: След това Git ще ползва текÑтов формат за файловете Ñ ÑƒÐºÐ°Ð·Ð°Ñ‚ÐµÐ»Ð¸." + #, c-format msgid "" "cannot lock ref '%s': expected symref with target '%s': but is a regular ref" @@ -20819,6 +21683,10 @@ msgstr "" "„%s“, но вмеÑто това е обикновен указател" #, c-format +msgid "trying to write reflog for '%s' with incomplete values" +msgstr "опит за впиÑване в журнала на указателите на „%s“ Ñ Ð½ÐµÐ¿ÑŠÐ»Ð½Ð° ÑтойноÑÑ‚" + +#, c-format msgid "cannot read ref file '%s'" msgstr "файлът Ñ ÑƒÐºÐ°Ð·Ð°Ñ‚ÐµÐ» „%s“ не може да Ñе прочете" @@ -20826,9 +21694,6 @@ msgstr "файлът Ñ ÑƒÐºÐ°Ð·Ð°Ñ‚ÐµÐ» „%s“ не може да Ñе про msgid "cannot open directory %s" msgstr "директориÑта „%s“ не може да Ñе отвори" -msgid "Checking references consistency" -msgstr "Проверка на валидноÑтта на указателите" - #, c-format msgid "unable to open '%s'" msgstr "„%s“ не може да Ñе отвори" @@ -20871,8 +21736,14 @@ msgstr "" "ÑÐ¸Ð¼Ð²Ð¾Ð»Ð½Ð¸Ñ ÑƒÐºÐ°Ð·Ð°Ñ‚ÐµÐ» „%s“)" #, c-format +msgid "cannot lock ref '%s': dangling symref already exists" +msgstr "" +"указателÑÑ‚ „%s“ не може да Ñе заключи: файлът Ñ ÑƒÐºÐ°Ð·Ð°Ñ‚ÐµÐ» извън клон вече " +"ÑъщеÑтвува" + +#, c-format msgid "cannot lock ref '%s': reference already exists" -msgstr "указателÑÑ‚ „%s“ не може да Ñе заключи:cуказателÑÑ‚ вече ÑъщеÑтвува" +msgstr "указателÑÑ‚ „%s“ не може да Ñе заключи: указателÑÑ‚ вече ÑъщеÑтвува" #, c-format msgid "cannot lock ref '%s': reference is missing but expected %s" @@ -20978,9 +21849,6 @@ msgstr "remote-curl: неочакван пакет за край на отгов msgid "RPC failed; %s" msgstr "ÐеуÑпешно отдалечено извикване. %s" -msgid "cannot handle pushes this big" -msgstr "толкова големи изтлаÑÐºÐ²Ð°Ð½Ð¸Ñ Ð½Ðµ може да Ñе изпълнÑÑ‚" - #, c-format msgid "cannot deflate request; zlib deflate error %d" msgstr "" @@ -21051,7 +21919,9 @@ msgid "" "If you cannot, please let us know why you still need to use it by\n" "sending an e-mail to <git@vger.kernel.org>." msgstr "" -"изчитането на отдалеченото хранилище от „%s/%s“ предÑтои да Ñе премахне.\n" +"изчитане на отдалеченото хранилище от „%s/%s“, което е набелÑзано за " +"изтриване.\n" +"\n" "Ðко вÑе още ползвате директориÑта „remotes/“, препоръчваме да Ñ Ð¼Ð¸Ð³Ñ€Ð¸Ñ€Ð°Ñ‚Ðµ\n" "към ÑледÑщи директории на база наÑтройки чрез командата:\n" "\n" @@ -21169,6 +22039,13 @@ msgstr "" "изтлаÑкате към „%s:refs/tags/%s“?" #, c-format +msgid "" +"The <src> part of the refspec ('%s') is an object ID that doesn't exist.\n" +msgstr "" +"ЧаÑтта от ÑƒÐºÐ°Ð·Ð°Ñ‚ÐµÐ»Ñ („%s“) за ИЗТОЧÐИК е идентификатор на неÑъщеÑтвуващ " +"обект.\n" + +#, c-format msgid "%s cannot be resolved to branch" msgstr "не е открит клон ÑъответÑтващ на „%s“" @@ -21294,6 +22171,64 @@ msgid "cannot strip one component off url '%s'" msgstr "не може да Ñе махне компонент от адреÑа „%s“" #, c-format +msgid "cannot open index for %s" +msgstr "грешка при отварÑне на индекÑа за „%s“" + +#, c-format +msgid "pack %s too large to consider in geometric progression" +msgstr "пакет „%s“ е твърде голÑм, за да е чаÑÑ‚ от геометрична прогреÑиÑ" + +#, c-format +msgid "pack %s too large to roll up" +msgstr "пакет „%s“ е твърде голÑм за Ñвиване" + +#, c-format +msgid "could not open tempfile %s for writing" +msgstr "временниÑÑ‚ файл „%s“ не може да Ñе отвори за запиÑ" + +msgid "could not close refs snapshot tempfile" +msgstr "временниÑÑ‚ файл ÑÑŠÑ Ñнимка на указателите не може да Ñе затвори" + +#, c-format +msgid "could not remove stale bitmap: %s" +msgstr "изтриването на оÑтарÑлата битова маÑка „%s“ е невъзможно" + +msgid "could not start pack-objects to repack promisor objects" +msgstr "" +"командата „pack-objects“ не може да Ñе Ñтартира за препакетирането на " +"гарантиращите обекти" + +msgid "failed to feed promisor objects to pack-objects" +msgstr "" +"гарантиращите обекти не може да Ñе подадат на командата „git pack-objects“" + +msgid "repack: Expecting full hex object ID lines only from pack-objects." +msgstr "" +"repack: от „pack-objects“ Ñе изиÑкват редове Ñамо Ñ Ð¿ÑŠÐ»Ð½Ð¸ шеÑтнайÑетични " +"указатели." + +msgid "could not finish pack-objects to repack promisor objects" +msgstr "" +"командата „pack-objects“ не може да завърши за препакетирането на " +"гарантиращите обекти" + +#, c-format +msgid "pack prefix %s does not begin with objdir %s" +msgstr "името на Ð¿Ð°ÐºÐµÑ‚Ð½Ð¸Ñ Ñ„Ð°Ð¹Ð» „%s“ не започва Ñ Ð´Ð¸Ñ€ÐµÐºÑ‚Ð¾Ñ€Ð¸Ñта за обекти Ñ â€ž%s“" + +#, c-format +msgid "renaming pack to '%s' failed" +msgstr "неуÑпешно преименуване на Ð¿Ð°ÐºÐµÑ‚Ð½Ð¸Ñ Ñ„Ð°Ð¹Ð» на „%s“" + +#, c-format +msgid "pack-objects did not write a '%s' file for pack %s-%s" +msgstr "Командата „git pack-objects“ не запиÑа файл „%s“ за пакета „%s-%s“" + +#, c-format +msgid "could not unlink: %s" +msgstr "неуÑпешно изтриване на „%s“" + +#, c-format msgid "bad replace ref name: %s" msgstr "неправилно име на указател за замÑна: „%s“" @@ -22663,9 +23598,6 @@ msgstr "не е хранилище на git: „%s“" msgid "cannot chdir to '%s'" msgstr "не може да Ñе влезе в директориÑта „%s“" -msgid "cannot come back to cwd" -msgstr "процеÑÑŠÑ‚ не може да Ñе върне към предишната работна директориÑ" - #, c-format msgid "failed to stat '%*s%s%s'" msgstr "не може да Ñе получи Ð¸Ð½Ñ„Ð¾Ñ€Ð¼Ð°Ñ†Ð¸Ñ Ñ‡Ñ€ÐµÐ· „stat“ за „%*s%s%s“" @@ -23746,18 +24678,30 @@ msgid "warning: " msgstr "предупреждение: " #, c-format +msgid "'%s' is nominated for removal.\n" +msgstr "„%s“ е отбелÑзан за изтриване.\n" + +#, c-format msgid "" -"'%s' is nominated for removal.\n" -"If you still use this command, please add an extra\n" -"option, '--i-still-use-this', on the command line\n" -"and let us know you still use it by sending an e-mail\n" -"to <git@vger.kernel.org>. Thanks.\n" +"If you still use this command, here's what you can do:\n" +"\n" +"- read https://git-scm.com/docs/BreakingChanges.html\n" +"- check if anyone has discussed this on the mailing\n" +" list and if they came up with something that can\n" +" help you: https://lore.kernel.org/git/?q=%s\n" +"- send an email to <git@vger.kernel.org> to let us\n" +" know that you still use this command and were unable\n" +" to determine a suitable replacement\n" +"\n" msgstr "" -"ПредÑтои пълното премахване на „%s“.\n" -"Ðко вÑе още ползвате тази команда, добавете\n" -"опциÑта „--i-still-use-this“ на ÐºÐ¾Ð¼Ð°Ð½Ð´Ð½Ð¸Ñ Ñ€ÐµÐ´ и молим да\n" -"ни извеÑтите Ñ Ðµ-пиÑмо до пощенÑÐºÐ¸Ñ ÑпиÑък:\n" -"<git@vger.kernel.org>. Предварително благодарим.\n" +"Ðко вÑе още ползвате командата, ето какво може да направите:\n" +"\n" +"⃠прочетете https://git-scm.com/docs/BreakingChanges.html ;\n" +"⃠проверете дали е имало диÑкуÑÐ¸Ñ Ð·Ð° това в пощенÑÐºÐ¸Ñ ÑпиÑък на проекта\n" +" и дали е намерено решение: https://lore.kernel.org/git/?q=%s ;\n" +"⃠пратете е-пиÑмо на <git@vger.kernel.org>, за да ни извеÑтите, че вÑе\n" +" още ползвате командата и не Ñте намерили подходÑщ замеÑтител.\n" +"\n" msgid "refusing to run without --i-still-use-this" msgstr "Ñ‚Ñ€Ñбва да добавите и опциÑта „--i-still-use-this“" @@ -24646,6 +25590,9 @@ msgstr "" msgid "Send this email reply required" msgstr "ИзиÑкване на отговор към това е-пиÑмо" +msgid "The destination IMAP folder is not properly defined." +msgstr "Целевата папка за IMAP не е дефинирана правилно." + msgid "The required SMTP server is not properly defined." msgstr "Сървърът за SMTP не е наÑтроен правилно." @@ -87,8 +87,8 @@ msgid "" msgstr "" "Project-Id-Version: git\n" "Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n" -"POT-Creation-Date: 2025-08-12 17:01+0000\n" -"PO-Revision-Date: 2025-08-14 19:13+0200\n" +"POT-Creation-Date: 2025-11-07 21:01+0100\n" +"PO-Revision-Date: 2025-11-09 14:56+0100\n" "Last-Translator: Cédric Malard <c.malard-git@valdun.net>\n" "Language-Team: Jean-Noël Avila <jn.avila@free.fr>\n" "Language: fr\n" @@ -631,37 +631,39 @@ msgid "Nothing was applied.\n" msgstr "Rien n'a été appliqué.\n" msgid "" -"j - leave this hunk undecided, see next undecided hunk\n" -"J - leave this hunk undecided, see next hunk\n" -"k - leave this hunk undecided, see previous undecided hunk\n" -"K - leave this hunk undecided, see previous hunk\n" +"j - go to the next undecided hunk, roll over at the bottom\n" +"J - go to the next hunk, roll over at the bottom\n" +"k - go to the previous undecided hunk, roll over at the top\n" +"K - go to the previous hunk, roll over at the top\n" "g - select a hunk to go to\n" "/ - search for a hunk matching the given regex\n" "s - split the current hunk into smaller hunks\n" "e - manually edit the current hunk\n" -"p - print the current hunk, 'P' to use the pager\n" +"p - print the current hunk\n" +"P - print the current hunk using the pager\n" "? - print help\n" msgstr "" -"j - laisser cette section non décidée et aller à la suivante non-décidée\n" -"J - laisser cette section non décidée et aller à la suivante\n" -"k - laisser cette section non décidée et aller à la précédente non-décidée\n" -"K - laisser cette section non décidée et aller à la précédente\n" +"j - aller à section non-décidée suivante et reboucler au début si en bas\n" +"J - aller à section suivante et reboucler au début si en bas\n" +"k - aller à section non-décidée précédente et reboucler à la fin si en haut\n" +"K - aller à section précédente et reboucler à la fin si en haut\n" "g - sélectionner une section et s'y rendre\n" "/ - rechercher une section correspondant à une regex donnée\n" "s - découper la section en sections plus petites\n" "e - éditer manuellement la section actuelle\n" -"p - afficher la section actuelle, 'P' pour utiliser un paginateur\n" +"p - afficher la section actuelle\n" +"P - afficher la section actuelle avec un paginateur\n" "? - afficher l'aide\n" #, c-format msgid "Only one letter is expected, got '%s'" msgstr "une seule lettre est attendue, mais '%s' a été reçu" -msgid "No previous hunk" -msgstr "Pas de section précédente" +msgid "No other hunk" +msgstr "Aucune autre section" -msgid "No next hunk" -msgstr "Pas de section suivante" +msgid "No other undecided hunk" +msgstr "Aucune autre section non-décidée" msgid "No other hunks to goto" msgstr "Aucune autre section à atteindre" @@ -2473,15 +2475,20 @@ msgid "Restrict the missing objects to the current sparse-checkout" msgstr "Restreindre les objets manquants à l'extraction clairsemée actuelle" msgid "" -"git bisect start [--term-(new|bad)=<term> --term-(old|good)=<term>] [--no-" -"checkout] [--first-parent] [<bad> [<good>...]] [--] [<pathspec>...]" +"git bisect start [--term-(bad|new)=<term-new> --term-(good|old)=<term-old>]\n" +" [--no-checkout] [--first-parent] [<bad> [<good>...]] [--] " +"[<pathspec>...]" msgstr "" -"git bisect start [--term-{new,bad}=<terme> --term-{old,good}=<terme>] [--" -"no-checkout] [--first-parent] [<mauvais> [<bon>...]] [--] [<spéc-de-" -"chemin>...]" +"git bisect start [--term-(new,bad)=<terme-nouveau> --term-(old|good)=<terme-" +"ancien>]\n" +" [--no-checkout] [--first-parent] [<mauvais> [<bon>...]] " +"[--] [<spéc-de-chemin>...]" + +msgid "git bisect (bad|new|<term-new>) [<rev>]" +msgstr "git bisect (good|bad|<terme-nouveau>) [<rév>]" -msgid "git bisect (good|bad) [<rev>...]" -msgstr "git bisect (good|bad) [<rév>...]" +msgid "git bisect (good|old|<term-old>) [<rev>...]" +msgstr "git bisect (good|bad|<terme-ancien>) [<rév>...]" msgid "git bisect skip [(<rev>|<range>)...]" msgstr "git bisect skip [(<rév>|<plage>)...]" @@ -5742,6 +5749,14 @@ msgid "found %i tags; gave up search at %s\n" msgstr "%i étiquettes trouvées ; recherche abandonnée à %s\n" #, c-format +msgid "cannot search for blob '%s' on an unborn branch" +msgstr "impossible de rechercher le blob '%s' dans une branche non-née" + +#, c-format +msgid "blob '%s' not reachable from HEAD" +msgstr "le blob '%s' est inaccessibles depuis HEAD" + +#, c-format msgid "describe %s\n" msgstr "décrire %s\n" @@ -5883,6 +5898,9 @@ msgstr "option invalide : %s" msgid "%s...%s: no merge base" msgstr "%s..%s: pas de base de fusion" +msgid "cannot come back to cwd" +msgstr "impossible de revenir au répertoire de travail courant" + msgid "Not a git repository" msgstr "Ce n'est pas un dépôt git" @@ -5992,10 +6010,140 @@ msgstr "pas de <commande> spécifié pour --extcmd=<commande>" msgid "git fast-export [<rev-list-opts>]" msgstr "git fast-export [<options-de-liste-de-révisions>]" -msgid "Error: Cannot export nested tags unless --mark-tags is specified." +#, c-format +msgid "unknown %s mode: %s" +msgstr "mode %s inconnu : %s" + +#, c-format +msgid "unknown tag-of-filtered mode: %s" +msgstr "mode tag-of-filtered inconnu : %s" + +#, c-format +msgid "unknown reencoding mode: %s" +msgstr "Mode de ré-encodage inconnu : %s" + +#, c-format +msgid "could not read blob %s" +msgstr "impossible de lire le blob %s" + +#, c-format +msgid "oid mismatch in blob %s" +msgstr "incohérence d'oid dans le blob %s" + +#, c-format +msgid "could not write blob '%s'" +msgstr "impossible d'écrire le blob '%s'" + +#, c-format +msgid "unexpected comparison status '%c' for %s, %s" +msgstr "status de comparaison inattendu '%c' pour %s, %s" + +msgid "none" +msgstr "vide" + +#, c-format +msgid "could not find author in commit %s" +msgstr "impossible de trouver l'auteur dans le commit %s" + +#, c-format +msgid "could not find committer in commit %s" +msgstr "impossible de trouver le validateur dans le commit %s" + +#, c-format +msgid "" +"encountered commit-specific encoding %.*s in commit %s; use --reencode=[yes|" +"no] to handle it" +msgstr "" +"encodage spécifique à un commit %.*s rencontré dans le commit %s ; utilisez " +"--reencode=(yes|no) pour le gérer" + +#, c-format +msgid "encountered signed commit %s; use --signed-commits=<mode> to handle it" +msgstr "" +"commit signé %s rencontré ; utilisez --signed-commits=<mode> pour le gérer" + +#, c-format +msgid "exporting %<PRIuMAX> signature(s) for commit %s" +msgstr "export de %<PRIuMAX> signature(s) pour le commit %s" + +#, c-format +msgid "stripping signature(s) from commit %s" +msgstr "suppression de signature(s) du commit %s" + +#, c-format +msgid "" +"omitting tag %s,\n" +"since tags of trees (or tags of tags of trees, etc.) are not supported." +msgstr "" +"étiquette %s ignorée,\n" +"puisque les étiquettes d'arbres (ou les étiquettes d'étiquettes d'arbres, " +"etc.) ne sont pas gérées." + +#, c-format +msgid "could not read tag %s" +msgstr "impossible de lire l'étiquette %s" + +#, c-format +msgid "encountered signed tag %s; use --signed-tags=<mode> to handle it" +msgstr "" +"étiquette signée %s rencontrée ; utilisez --signed-tags=<mode> pour la gérer" + +#, c-format +msgid "exporting signed tag %s" +msgstr "export de l'étiquette signée %s" + +#, c-format +msgid "stripping signature from tag %s" +msgstr "suppression de la signature dans l'étiquette %s" + +#, c-format +msgid "" +"tag %s tags unexported object; use --tag-of-filtered-object=<mode> to handle " +"it" +msgstr "" +"l'étiquette %s étiquette un objet non exporté ; utilisez --tag-of-filtered-" +"object=<mode> pour la gérer" + +msgid "cannot export nested tags unless --mark-tags is specified." msgstr "" -"Erreur : impossible d'exporter des étiquettes imbriquées à moins que --mark-" -"tags ne soit spécifié." +"impossible d'exporter des étiquettes imbriquées à moins que --mark-tags ne " +"soit spécifié." + +#, c-format +msgid "tag %s points nowhere?" +msgstr "l'étiquette %s ne pointe nulle part ?" + +#, c-format +msgid "%s: unexpected object of type %s, skipping." +msgstr "%s : objet de type %s inattendu, ignoré." + +#, c-format +msgid "tag points to object of unexpected type %s, skipping." +msgstr "l'étiquette point su un objet de type inaattendu %s, ignoré." + +#, c-format +msgid "unable to open marks file %s for writing." +msgstr "impossible d'ouvrir le fichier de marques %s en écriture." + +#, c-format +msgid "unable to write marks file %s." +msgstr "impossible d'écrire le fichier de marques %s." + +#, c-format +msgid "corrupt mark line: %s" +msgstr "ligne de marque corrompue : %s" + +#, c-format +msgid "object not found: %s" +msgstr "objet non trouvé : %s" + +#, c-format +msgid "not a commit? can't happen: %s" +msgstr "pas un commit ? Cela ne se peut : %s" + +#, c-format +msgid "object %s already has a mark" +msgstr "l'objet %s a déjà une marque" msgid "--anonymize-map token cannot be empty" msgstr "le jeton --anonymize-map ne peut pas être vide" @@ -6066,32 +6214,458 @@ msgid "label tags with mark ids" msgstr "marquer les étiquettes avec des ids de marque" #, c-format -msgid "Missing from marks for submodule '%s'" -msgstr "Champs from manquants pour le sous-module '%s'" +msgid "can't write crash report %s" +msgstr "impossible d'écrire le rapport de crash %s" + +#, c-format +msgid "fast-import: dumping crash report to %s\n" +msgstr "fast-import : écriture du rapport de crash dans %s\n" #, c-format -msgid "Missing to marks for submodule '%s'" -msgstr "Champs 'to' manquants pour le sous-module '%s'" +msgid "mark :%<PRIuMAX> not declared" +msgstr "marque : %<PRIuMAX> non déclarée" + +#, c-format +msgid "invalid attempt to create duplicate branch: %s" +msgstr "tentative invalide de création d'une branche dupliquée : %s" + +#, c-format +msgid "branch name doesn't conform to Git standards: %s" +msgstr "le nom de la branche n'est pas conforme au standards Git : %s" + +msgid "internal consistency error creating the index" +msgstr "erreur de cohérence interne à la création de l'index" + +msgid "cannot create keep file" +msgstr "impossible de créer le fichier keep" + +msgid "failed to write keep file" +msgstr "échec de l'écriture du fichier keep" + +msgid "cannot store pack file" +msgstr "impossible de stocker le fichier paquet" + +msgid "cannot store index file" +msgstr "impossible de stocker le fichier d'index" + +#, c-format +msgid "failed seeking to start of '%s'" +msgstr "échec de la recherche du debut de '%s'" + +#, c-format +msgid "core Git rejected index %s" +msgstr "le cÅ“ur de Git a rejecté l'index %s" + +msgid "cannot truncate pack to skip duplicate" +msgstr "impossible de tronquer le paquet pour sauté la duplication" #, c-format -msgid "Expected 'mark' command, got %s" -msgstr "Commande 'mark' attendue, %s trouvé" +msgid "EOF in data (%<PRIuMAX> bytes remaining)" +msgstr "OEF dans les données (%<PRIuMAX> octets restant)" #, c-format -msgid "Expected 'to' command, got %s" -msgstr "Commande 'to' attendue, %s trouvé" +msgid "unexpected deflate failure: %d" +msgstr "échec inattendu de décompression : %d" -msgid "Expected format name:filename for submodule rewrite option" +#, c-format +msgid "not a tree: %s" +msgstr "pas un arbre : %s" + +#, c-format +msgid "can't load tree %s" +msgstr "impossible de charger l'arbre %s" + +#, c-format +msgid "corrupt mode in %s" +msgstr "mode corrompu dans %s" + +msgid "root cannot be a non-directory" +msgstr "la racine doit être un répertoire" + +msgid "empty path component found in input" +msgstr "composant de chemin vide trouvé dans l'entrée" + +msgid "non-directories cannot have subtrees" +msgstr "les composants non-répertoires ne peut pas avoir de sous-arbre" + +#, c-format +msgid "dropping %s since it would point to itself (i.e. to %s)" +msgstr "suppression de %s puisqu'il pointerait sur lui-même (c-à -d sur %s)" + +#, c-format +msgid "branch %s is missing commits." +msgstr "il manque des commits à la branche %s." + +#, c-format +msgid "not updating %s (new tip %s does not contain %s)" +msgstr "%s pas mis à jour (le nouveau sommet %s ne contient pas %s)" + +#, c-format +msgid "unable to create leading directories of %s" +msgstr "impossible de créer les répertoires de premier niveau de %s" + +#, c-format +msgid "unable to write marks file %s" +msgstr "impossible d'écrire le fichier de marques %s" + +#, c-format +msgid "unable to write marks file %s: %s" +msgstr "impossible d'écrire le fichier de marques %s : %s" + +#, c-format +msgid "unable to write file %s" +msgstr "impossible d'écrire le fichier %s" + +#, c-format +msgid "expected 'data n' command, found: %s" +msgstr "Commande 'data n' attendue, %s trouvé" + +#, c-format +msgid "EOF in data (terminator '%s' not found)" +msgstr "OEF dans les données (terminateur '%s' non trouvé)" + +msgid "data is too large to use in this context" +msgstr "les données sont trop grandes à utiliser dans ce contexte" + +#, c-format +msgid "EOF in data (%lu bytes remaining)" +msgstr "OEF dans les données (%lu octets restants)" + +#, c-format +msgid "missing < in ident string: %s" +msgstr "< manquant dans la chaîne d'identification : %s" + +#, c-format +msgid "missing space before < in ident string: %s" +msgstr "espace manquant avant < dans la chaîne d'identification : %s" + +#, c-format +msgid "missing > in ident string: %s" +msgstr "> manquant dans la chaîne d'identification : %s" + +#, c-format +msgid "missing space after > in ident string: %s" +msgstr "espace manquant après > dans la chaîne d'identification : %s" + +#, c-format +msgid "invalid raw date \"%s\" in ident: %s" +msgstr "date brute invalide \"%s\" dans l'ident : %s" + +#, c-format +msgid "invalid rfc2822 date \"%s\" in ident: %s" +msgstr "date rfc2822 invalide \"%s\" dans l'ident : %s" + +#, c-format +msgid "date in ident must be 'now': %s" +msgstr "la date dans l'ident doit être 'now' : %s" + +#, c-format +msgid "too large fanout (%u)" +msgstr "dispersion trop grande (%u)" + +#, c-format +msgid "failed to remove path %s" +msgstr "échec de la suppression du chemin %s" + +#, c-format +msgid "no value after ':' in mark: %s" +msgstr "aucune valeur après ':' dans la marque : %s" + +#, c-format +msgid "garbage after mark: %s" +msgstr "déchets après la marque : %s" + +#, c-format +msgid "missing space after mark: %s" +msgstr "espace manquant après la marque : %s" + +#, c-format +msgid "invalid %s: %s" +msgstr "%s invalide : %s" + +#, c-format +msgid "NUL in %s: %s" +msgstr "NUL dans %s : %s" + +#, c-format +msgid "garbage after %s: %s" +msgstr "déchets après %s : %s" + +#, c-format +msgid "missing space after %s: %s" +msgstr "espace manquant après %s : %s" + +#, c-format +msgid "corrupt mode: %s" +msgstr "mode corrompu : %s" + +#, c-format +msgid "invalid dataref: %s" +msgstr "dataref invalide : %s" + +#, c-format +msgid "missing space after SHA1: %s" +msgstr "espace manquant après SHA1 : %s" + +#, c-format +msgid "Git links cannot be specified 'inline': %s" +msgstr "les liens Git ne peuvent pas être spécifiés 'inline' :%s" + +#, c-format +msgid "not a commit (actually a %s): %s" +msgstr "pas un commit (type %s) : %s" + +#, c-format +msgid "directories cannot be specified 'inline': %s" +msgstr "les répertoires ne peut pas être 'inline' : %s" + +#, c-format +msgid "%s not found: %s" +msgstr "%s non trouvé : %s" + +msgid "tree" +msgstr "arbre" + +#, c-format +msgid "not a %s (actually a %s): %s" +msgstr "pas de type %s (type %s) : %s" + +#, c-format +msgid "path %s not in branch" +msgstr "chemin %s pas dans une branche" + +msgid "can't add a note on empty branch." +msgstr "impossible d'ajouter une note à une branche vide." + +#, c-format +msgid "mark :%<PRIuMAX> not a commit" +msgstr "marque : %<PRIuMAX> n'est pas un commit" + +#, c-format +msgid "not a valid commit: %s" +msgstr "pas un commit valide : %s" + +#, c-format +msgid "invalid ref name or SHA1 expression: %s" +msgstr "nom de ref ou expression SHA1 invalide : %s" + +#, c-format +msgid "not a blob (actually a %s): %s" +msgstr "pas un blob (type actuel %s) : %s" + +#, c-format +msgid "blob not found: %s" +msgstr "blob non trouvé : %s" + +#, c-format +msgid "the commit %s is corrupt" +msgstr "le commit %s est corrompu" + +#, c-format +msgid "can't create a branch from itself: %s" +msgstr "impossible de créer une branche sur elle-même : %s" + +#, c-format +msgid "" +"expected gpgsig format: 'gpgsig <hash-algo> <signature-format>', got 'gpgsig " +"%s'" +msgstr "" +"format gpgsig attendu : 'gpgsig <algo-empreinte> <format-signature>', trouvé " +"'gpgsig %s'" + +#, c-format +msgid "unknown git hash algorithm in gpgsig: '%s'" +msgstr "algorithme d'empreinte inconnu dans gpgsig : '%s'" + +#, c-format +msgid "invalid signature format in gpgsig: '%s'" +msgstr "format de signature invalide dans gpgsig : '%s'" + +msgid "'unknown' signature format in gpgsig" +msgstr "Format de signature 'unknown' inconnu dans gpgsig" + +#, c-format +msgid "multiple %s signatures found, ignoring additional signature" +msgstr "multiple signatures %s trouvées, signatures additionnelles ignorées" + +msgid "parse_one_signature() returned unknown hash algo" +msgstr "parse_one_signature() a renvoyé un algo d'empreinte inconnu" + +msgid "expected committer but didn't get one" +msgstr "validateur attendu mais aucune information fournie" + +msgid "encountered signed commit; use --signed-commits=<mode> to handle it" +msgstr "" +"commit signé rencontré ; utilisez --signed-commits=<mode> pour le gérer" + +msgid "stripping a commit signature" +msgstr "une signature de commit ignorée" + +msgid "importing a commit signature verbatim" +msgstr "import d'une signature de commit verbatim" + +msgid "encountered signed tag; use --signed-tags=<mode> to handle it" msgstr "" -"Format attendu nom:<nom de fichier> pour l'option de réécriture de sous-" +"étiquette signée rencontrée ; utilisez --signed-tags=<mode> pour la gérer" + +#, c-format +msgid "importing a tag signature verbatim for tag '%s'" +msgstr "import d'une signature d'étiquette verbatim pour l'étiquette '%s'" + +#, c-format +msgid "stripping a tag signature for tag '%s'" +msgstr "suppression d'une signature d'étiquette de l'étiquette '%s'" + +#, c-format +msgid "expected 'from' command, got '%s'" +msgstr "Commande 'from' attendue, '%s' trouvé" + +msgid "can't tag an empty branch." +msgstr "impossible d'étiqueter une branche vide." + +#, c-format +msgid "not a valid object: %s" +msgstr "pas un objet valide : %s" + +msgid "write to frontend failed" +msgstr "échec de l'écriture vers le frontend" + +#, c-format +msgid "can't read object %s" +msgstr "impossible de lire l'objet %s" + +#, c-format +msgid "object %s is a %s but a blob was expected." +msgstr "l'objet %s est de type %s, mais un blob était attendu." + +#, c-format +msgid "not a mark: %s" +msgstr "pas une marque : %s" + +#, c-format +msgid "unknown mark: %s" +msgstr "marque inconnue : %s" + +#, c-format +msgid "garbage after SHA1: %s" +msgstr "déchets après SHA1 : %s" + +#, c-format +msgid "not a tree-ish: %s" +msgstr "pas un arbre-esque : %s" + +#, c-format +msgid "can't load object %s" +msgstr "impossible de charger l'objet %s" + +#, c-format +msgid "invalid SHA1 in tag: %s" +msgstr "SHA1 invalide pour l'étiquette : %s" + +#, c-format +msgid "invalid SHA1 in commit: %s" +msgstr "SHA1 invalide pour le commit : %s" + +#, c-format +msgid "missing from marks for submodule '%s'" +msgstr "marques from manquantes pour le sous-module '%s'" + +#, c-format +msgid "missing to marks for submodule '%s'" +msgstr "marques 'to' manquantes pour le sous-module '%s'" + +#, c-format +msgid "missing space after tree-ish: %s" +msgstr "espace manquant après l'arbre-esque : %s" + +#, c-format +msgid "not in a commit: %s" +msgstr "pas dans un commit : %s" + +#, c-format +msgid "expected 'mark' command, got %s" +msgstr "commande 'mark' attendue, %s trouvé" + +#, c-format +msgid "expected 'to' command, got %s" +msgstr "commande 'to' attendue, %s trouvé" + +msgid "only one import-marks command allowed per stream" +msgstr "une seule commande import-marks tolérée par flux" + +#, c-format +msgid "unknown --date-format argument %s" +msgstr "argument de --date-format inconnu %s" + +#, c-format +msgid "%s: argument must be a non-negative integer" +msgstr "%s : l'argument doit être un entier positif ou nul" + +#, c-format +msgid "--depth cannot exceed %u" +msgstr "--depth ne peut pas être plus grand que %u" + +#, c-format +msgid "--cat-blob-fd cannot exceed %d" +msgstr "--cat-blob-fd ne peut pas être plus grand que %d" + +msgid "expected format name:filename for submodule rewrite option" +msgstr "" +"Format attendu <nom>:<nom de fichier> pour l'option de réécriture de sous-" "module" #, c-format +msgid "max-pack-size is now in bytes, assuming --max-pack-size=%lum" +msgstr "max-pack-size est maintenant en octets, --max-pack-size=%lum supposé" + +msgid "minimum max-pack-size is 1 MiB" +msgstr "la taille limite minimale d'un paquet est 1 Mio" + +#, c-format +msgid "unknown --signed-commits mode '%s'" +msgstr "mode --signed-commits inconnu '%s'" + +#, c-format +msgid "unknown --signed-tags mode '%s'" +msgstr "mode --signed-tags inconnu '%s'" + +#, c-format msgid "feature '%s' forbidden in input without --allow-unsafe-features" msgstr "" "la fonctionnalité '%s' est interdite en entrée sans --allow-unsafe-features" #, c-format +msgid "got feature command '%s' after data command" +msgstr "commande de fonction '%s' reçue après la commande data" + +#, c-format +msgid "this version of fast-import does not support feature %s." +msgstr "cette version de fast-import ne gère pas la fonctionnalité %s." + +#, c-format +msgid "got option command '%s' after data command" +msgstr "option de commande '%s' obtenue après la commande data" + +#, c-format +msgid "this version of fast-import does not support option: %s" +msgstr "cette version de fast-import ne supporte pas la l'option : %s" + +#, c-format +msgid "unknown option %s" +msgstr "option inconnue %s" + +#, c-format +msgid "unknown option --%s" +msgstr "option inconnue --%s" + +#, c-format +msgid "unsupported command: %s" +msgstr "commande non gérée : %s" + +msgid "stream ends early" +msgstr "le flux se termine trop tôt" + +#, c-format msgid "Lockfile created but not reported: %s" msgstr "Fichier verrou créé mais non reporté : %s" @@ -6229,6 +6803,38 @@ msgstr "" "%s'\n" "va désactiver l'alerte jusqu'à ce que le distant change HEAD." +msgid "" +"You're on a case-insensitive filesystem, and the remote you are\n" +"trying to fetch from has references that only differ in casing. It\n" +"is impossible to store such references with the 'files' backend. You\n" +"can either accept this as-is, in which case you won't be able to\n" +"store all remote references on disk. Or you can alternatively\n" +"migrate your repository to use the 'reftable' backend with the\n" +"following command:\n" +"\n" +" git refs migrate --ref-format=reftable\n" +"\n" +"Please keep in mind that not all implementations of Git support this\n" +"new format yet. So if you use tools other than Git to access this\n" +"repository it may not be an option to migrate to reftables.\n" +msgstr "" +"Vous êtes sur un système de fichier non sensible à la casse,\n" +"et le distant duquel vous souhaitez récupérer a des références\n" +"qui ne diffèrent que par la casse ; il est impossible de stocker\n" +"de telles références avec le backend 'file'. Vous pouvez l'accepter\n" +"tel quel, auquel cas vous ne pourrez pas stocker tous les distants\n" +"sur le disque. Ou sinon, vous pouvez migrer votre dépôt pour utiliser\n" +"le backend 'reftable' avec la commande suivante ⋅:\n" +"\n" +" git refs migrate --ref-format=reftable\n" +"\n" +"Veuillez garder à l'esprit que ce format n'est pas encore géré pour toutes " +"les\n" +"implémentations de Git. Si vous utilisez d'autres outils que Git pour " +"accéder\n" +"à ce dépôt, la migration vers reftable pourrait donc ne pas être " +"pertinente.\n" + #, c-format msgid "" "some local refs could not be updated; try running\n" @@ -6476,21 +7082,6 @@ msgstr "utiliser <nom> au lieu de la branche cible reélle" msgid "file to read from" msgstr "fichier d'où lire" -msgid "git for-each-ref [<options>] [<pattern>]" -msgstr "git for-each-ref [<options>] [<motif>]" - -msgid "git for-each-ref [--points-at <object>]" -msgstr "git for-each-ref [--points-at <objet>]" - -msgid "git for-each-ref [--merged [<commit>]] [--no-merged [<commit>]]" -msgstr "git for-each-ref [--merged [<commit>]] [--no-merged [<commit>]]" - -msgid "git for-each-ref [--contains [<commit>]] [--no-contains [<commit>]]" -msgstr "git for-each-ref [--contains [<commit>]] [--no-contains [<commit>]]" - -msgid "git for-each-ref [--start-after <marker>]" -msgstr "git for-each-ref [--start-after <marqueur>]" - msgid "quote placeholders suitably for shells" msgstr "échapper les champs réservés pour les interpréteurs de commandes" @@ -6546,6 +7137,9 @@ msgstr "arguments inconnus fournis avec l'option --stdin" msgid "cannot use --start-after with patterns" msgstr "impossible d'utiliser --start-after avec des motifs" +msgid "git for-each-ref " +msgstr "git for-each-ref " + msgid "git for-each-repo --config=<config> [--] <arguments>" msgstr "git for-each-repo --config=<config> [--] <arguments>" @@ -7021,6 +7615,9 @@ msgid "" msgstr "" "tâche incremental-repack ignorée parce que core.multiPackIndex est désactivé" +msgid "failed to perform geometric repack" +msgstr "échec de l'exécution du repaquetage géométrique" + #, c-format msgid "task '%s' failed" msgstr "échec de la tâche '%s'" @@ -7030,6 +7627,10 @@ msgid "lock file '%s' exists, skipping maintenance" msgstr "le fichier verrou '%s' existe, pas de maintenance" #, c-format +msgid "unknown maintenance strategy: '%s'" +msgstr "stratégie de maintenance inconnue : '%s'" + +#, c-format msgid "'%s' is not a valid task" msgstr "'%s' n'est pas une tâche valide" @@ -7913,6 +8514,29 @@ msgstr "--trailer n'a aucune signification avec --only-input" msgid "no input file given for in-place editing" msgstr "aucun fichier en entrée pour l'éditon sur place" +msgid "last-modified can only operate on one tree at a time" +msgstr "last-modified ne peut opérer que sur un arbre à la fois" + +#, c-format +msgid "unknown last-modified argument: %s" +msgstr "argument de last-modified inconnu : %s" + +msgid "unable to setup last-modified" +msgstr "impossible de renseigner last-modified" + +msgid "" +"git last-modified [--recursive] [--show-trees] [<revision-range>] [[--] " +"<path>...]" +msgstr "" +"git last-modified [--recursive] [--show-trees] [<plage-de-révisions>] [[--] " +"<chemin>...]" + +msgid "recurse into subtrees" +msgstr "parcourir les sous-arbres" + +msgid "show tree entries when recursing into subtrees" +msgstr "afficher les entrées lors de la récurssion dans les sous-arbres" + msgid "git log [<options>] [<revision-range>] [[--] <path>...]" msgstr "git log [<options>] [<plage de révisions>] [[--] <chemin>...]" @@ -7952,6 +8576,21 @@ msgid "-L<range>:<file> cannot be used with pathspec" msgstr "" "-L<plage>:<fichier> ne peut pas être utilisé avec une spécificateur de chemin" +msgid "" +"\n" +"hint: You can replace 'git whatchanged <opts>' with:\n" +"hint:\tgit log <opts> --raw --no-merges\n" +"hint: Or make an alias:\n" +"hint:\tgit config set --global alias.whatchanged 'log --raw --no-merges'\n" +"\n" +msgstr "" +"\n" +"astuce : vous pouvez remplacer 'git whatchanged <opts>' par :\n" +"astuce : \tgit log <opts> --raw --no-merges\n" +"astuce : Ou créer un alias :\n" +"astuce :\tgit config set --global alias.whatchanged 'log --raw --no-merges'\n" +"\n" + #, c-format msgid "git show %s: bad file" msgstr "git show %s : fichier incorrect" @@ -8407,9 +9046,6 @@ msgstr "git ls-tree [<options>] <arbre ou apparenté> [<chemin>...]" msgid "only show trees" msgstr "afficher seulement les arbres" -msgid "recurse into subtrees" -msgstr "parcourir les sous-arbres" - msgid "show trees when recursing" msgstr "afficher les arbres en les parcourant" @@ -8561,10 +9197,6 @@ msgid "Could not write object file" msgstr "impossible d'écrire le fichier d'objet" #, c-format -msgid "unknown option %s" -msgstr "option inconnue %s" - -#, c-format msgid "could not parse object '%s'" msgstr "impossible d'analyser l'objet '%s'" @@ -8733,10 +9365,6 @@ msgstr "impossible de lancer le remisage." msgid "stash failed" msgstr "échec du remisage" -#, c-format -msgid "not a valid object: %s" -msgstr "pas un objet valide : %s" - msgid "read-tree failed" msgstr "read-tree a échoué" @@ -9905,27 +10533,8 @@ msgstr "" "Total %<PRIu32> (delta %<PRIu32>), réutilisés %<PRIu32> (delta %<PRIu32>), " "réutilisés du paquet %<PRIu32> (depuis %<PRIuMAX>)" -msgid "" -"git pack-refs [--all] [--no-prune] [--auto] [--include <pattern>] [--exclude " -"<pattern>]" -msgstr "" -"git pack-refs [--all] [--no-prune] [--auto] [--include <motif>] [--exclude " -"<motif>]" - -msgid "pack everything" -msgstr "empaqueter tout" - -msgid "prune loose refs (default)" -msgstr "élaguer les références perdues (défaut)" - -msgid "auto-pack refs as needed" -msgstr "auto-empaqueter les réfs au besoin" - -msgid "references to include" -msgstr "références à inclure" - -msgid "references to exclude" -msgstr "références à exclure" +msgid "git pack-refs " +msgstr "git pack-refs " msgid "git patch-id [--stable | --unstable | --verbatim]" msgstr "git patch-id [--stable | --unstable | --verbatim]" @@ -10459,6 +11068,10 @@ msgstr "git range-diff [<options>] <ancien-sommet>...<nouveau-sommet>" msgid "git range-diff [<options>] <base> <old-tip> <new-tip>" msgstr "git range-diff [<options>] <base> <ancien-sommet> <nouveau-sommet>" +#, c-format +msgid "invalid max-memory value: %s" +msgstr "valeur invalide de max-memory : %s" + msgid "use simple diff colors" msgstr "utiliser des couleurs de diff simples" @@ -10468,6 +11081,12 @@ msgstr "notes" msgid "passed to 'git log'" msgstr "passé à 'git log'" +msgid "size" +msgstr "taille" + +msgid "maximum memory for cost matrix (default 4G)" +msgstr "memoire maximum pour la matrice de coût (par défaut 4G)" + msgid "only emit output related to the first range" msgstr "afficher seulement les sorties liées à la première plage" @@ -11026,16 +11645,11 @@ msgstr "git reflog [show] [<options-de-journal>] [<réf>]" msgid "git reflog list" msgstr "git reflog list" -msgid "" -"git reflog expire [--expire=<time>] [--expire-unreachable=<time>]\n" -" [--rewrite] [--updateref] [--stale-fix]\n" -" [--dry-run | -n] [--verbose] [--all [--single-worktree] | " -"<refs>...]" -msgstr "" -"git reflog expire [--expire=<temps>] [--expire-unreachable=<temps>]\n" -" [--rewrite] [--updateref] [--stale-fix]\n" -" [--dry-run | -n] [--verbose] [--all [--single-worktree] | " -"<réfs>...]" +msgid "git reflog exists <ref>" +msgstr "git reflog exists <référence>" + +msgid "git reflog write <ref> <old-oid> <new-oid> <message>" +msgstr "git reflog write <ref> <ancien-oid> <nouveau-oid> <message>" msgid "" "git reflog delete [--rewrite] [--updateref]\n" @@ -11044,12 +11658,20 @@ msgstr "" "git reflog delete [--rewrite] [--updateref]\n" " [--dry-run | -n] [--verbose] <réf>@{<spécificateur>}..." -msgid "git reflog exists <ref>" -msgstr "git reflog exists <référence>" - msgid "git reflog drop [--all [--single-worktree] | <refs>...]" msgstr "git reflog drop [--all [--single-worktree] | <réf>...]" +msgid "" +"git reflog expire [--expire=<time>] [--expire-unreachable=<time>]\n" +" [--rewrite] [--updateref] [--stale-fix]\n" +" [--dry-run | -n] [--verbose] [--all [--single-worktree] | " +"<refs>...]" +msgstr "" +"git reflog expire [--expire=<temps>] [--expire-unreachable=<temps>]\n" +" [--rewrite] [--updateref] [--stale-fix]\n" +" [--dry-run | -n] [--verbose] [--all [--single-worktree] | " +"<réfs>...]" + #, c-format msgid "invalid timestamp '%s' given to '--%s'" msgstr "horodatage invalide '%s' fourni à '--%s'" @@ -11120,12 +11742,50 @@ msgstr "abandonner les reflogs de l'arbre-de-travail actuel uniquement" msgid "references specified along with --all" msgstr "références spécifiées en même temps que --all" +#, c-format +msgid "invalid reference name: %s" +msgstr "nom de référence invalide : %s" + +#, c-format +msgid "invalid old object ID: '%s'" +msgstr "ID d'ancien objet invalide : '%s'" + +#, c-format +msgid "old object '%s' does not exist" +msgstr "l'ancien objet '%s' n'existe pas" + +#, c-format +msgid "invalid new object ID: '%s'" +msgstr "ID de nouvel objet invalide : '%s'" + +#, c-format +msgid "new object '%s' does not exist" +msgstr "le nouvel objet '%s' n'existe pas" + +#, c-format +msgid "cannot start transaction: %s" +msgstr "impossible de démarrer la transaction : %s" + +#, c-format +msgid "cannot queue reflog update: %s" +msgstr "impossible d'empiler la mise à jour du reflog : %s" + +#, c-format +msgid "cannot commit reflog update: %s" +msgstr "impossible de valider la mise à jour du reflog : %s" + msgid "git refs migrate --ref-format=<format> [--no-reflog] [--dry-run]" msgstr "git refs migrate --ref-format=<format> [--no-reflog] [--dry-run]" msgid "git refs verify [--strict] [--verbose]" msgstr "git refs verify [--strict] [--verbose]" +msgid "git refs exists <ref>" +msgstr "git refs exist <référence>" + +msgid "git refs optimize " +msgstr "git refs optimize " + msgid "specify the reference format to convert to" msgstr "spécifier le format de réference vers lequel convertir" @@ -11148,6 +11808,18 @@ msgstr "activer une vérification plus stricte" msgid "'git refs verify' takes no arguments" msgstr "'git refs verify' n'accepte aucun argument" +msgid "git refs list " +msgstr "git refs list " + +msgid "'git refs exists' requires a reference" +msgstr "'git refs exists' nécessite une référence" + +msgid "reference does not exist" +msgstr "la référence n'existe pas" + +msgid "failed to look up reference" +msgstr "échec de la recherche de la référence" + msgid "" "git remote add [-t <branch>] [-m <master>] [-f] [--tags | --no-tags] [--" "mirror=<fetch|push>] <name> <url>" @@ -11311,6 +11983,23 @@ msgstr "" "\t%s%d\n" "nomme à présent le distant inexistant '%s'" +msgid "" +"The remote you are trying to rename has conflicting references in the\n" +"new target refspec. This is most likely caused by you trying to nest\n" +"a remote into itself, e.g. by renaming 'parent' into 'parent/child'\n" +"or by unnesting a remote, e.g. the other way round.\n" +"\n" +"If that is the case, you can address this by first renaming the\n" +"remote to a different name.\n" +msgstr "" +"Le distant que vous essayer de renommer a des réference en conflit\n" +"dans le nouveau refspec cible. C'est probablement du à un essai de\n" +"emboîter un distant dans lui-même, p. ex., en renommant 'parent' en\n" +"'parent/enfant' ou à l'inverse, en dé-emboîtant un distant.\n" +"\n" +"Si c'est le cas, vous pouvez le résoudre en commençant par renommer\n" +"le distant avec un nom différent.\n" + #, c-format msgid "No such remote: '%s'" msgstr "Pas de serveur remote : '%s'" @@ -11319,6 +12008,14 @@ msgstr "Pas de serveur remote : '%s'" msgid "Could not rename config section '%s' to '%s'" msgstr "Impossible de renommer la section de configuration '%s' en '%s'" +msgid "Renaming remote references" +msgstr "Renommage des références distantes" + +#, c-format +msgid "queueing remote ref renames failed: %s" +msgstr "" +"la mise en file d'attente des renommages des réf distante a échoué : %s" + #, c-format msgid "" "Not updating non-default fetch refspec\n" @@ -11329,16 +12026,9 @@ msgstr "" "\t%s\n" "\tVeuillez mettre à jour la configuration manuellement si nécessaire." -msgid "Renaming remote references" -msgstr "Renommage des références distantes" - #, c-format -msgid "deleting '%s' failed" -msgstr "échec de suppression de '%s'" - -#, c-format -msgid "creating '%s' failed" -msgstr "échec de création de '%s'" +msgid "renaming remote refs failed: %s" +msgstr "le renommage des réfs distantes a échoué : %s" msgid "" "Note: A branch outside the refs/remotes/ hierarchy was not removed;\n" @@ -11623,52 +12313,6 @@ msgstr "" "Utilisez\n" "--no-write-bitmap-index ou désactivez le paramètre pack.writeBitmaps." -msgid "could not start pack-objects to repack promisor objects" -msgstr "" -"ne pas démarrer pack-objects pour ré-empaqueter les objects de prometteur" - -msgid "failed to feed promisor objects to pack-objects" -msgstr "Échéc de la fourniture les objets du prometteur à pack-objects" - -msgid "repack: Expecting full hex object ID lines only from pack-objects." -msgstr "" -"repack : attente de lignes d'Id d'objets en hexa complet seulement depuis " -"les objects de paquet." - -msgid "could not finish pack-objects to repack promisor objects" -msgstr "" -"impossible de terminer pack-objects pour ré-empaqueter les objets de " -"prometteur" - -#, c-format -msgid "cannot open index for %s" -msgstr "impossible d'ouvrir l'index pour %s" - -#, c-format -msgid "pack %s too large to consider in geometric progression" -msgstr "" -"le paquet %s est trop gros pour être pris en compte dans un progression " -"géométrique" - -#, c-format -msgid "pack %s too large to roll up" -msgstr "le paquet %s est trop gros à enrouler" - -#, c-format -msgid "could not open tempfile %s for writing" -msgstr "impossible d'ouvrir le fichier temporaire %s en écriture" - -msgid "could not close refs snapshot tempfile" -msgstr "impossible de fermer le fichier temporaire d'instantané des réfs" - -#, c-format -msgid "could not remove stale bitmap: %s" -msgstr "impossible de revenir la bitmap obsolète : %s" - -#, c-format -msgid "pack prefix %s does not begin with objdir %s" -msgstr "le préfixe %s ne commence pas avec objdir %s" - msgid "pack everything in a single pack" msgstr "empaqueter tout dans un seul paquet" @@ -11768,18 +12412,6 @@ msgstr "l'option '%s' ne peut être utilisé qu'avec '%s'" msgid "Nothing new to pack." msgstr "Rien de neuf à empaqueter." -#, c-format -msgid "renaming pack to '%s' failed" -msgstr "le renommage du paquet en '%s' a échoué" - -#, c-format -msgid "pack-objects did not write a '%s' file for pack %s-%s" -msgstr "pack-objects n'a pas écrit un fichier '%s' pour la paquet %s-%s" - -#, c-format -msgid "could not unlink: %s" -msgstr "impossible de délier : '%s'" - msgid "git replace [-f] <object> <replacement>" msgstr "git replace [-f] <objet> <remplacement>" @@ -12036,6 +12668,62 @@ msgstr "rejouer jusqu'au commit racine n'est pas encore géré !" msgid "replaying merge commits is not supported yet!" msgstr "rejouer des commits de fusion n'est pas encore géré !" +#, c-format +msgid "key '%s' not found" +msgstr "clé '%s' non trouvée" + +#, c-format +msgid "invalid format '%s'" +msgstr "format invalide '%s'" + +msgid "output format" +msgstr "format de sortie" + +msgid "synonym for --format=nul" +msgstr "synonymes de --format=nul" + +msgid "unsupported output format" +msgstr "format de sortie non géré" + +msgid "References" +msgstr "Références" + +msgid "Count" +msgstr "compte" + +msgid "Branches" +msgstr "Branches" + +msgid "Tags" +msgstr "Étiquettes" + +msgid "Remotes" +msgstr "Distants" + +msgid "Others" +msgstr "Autres" + +msgid "Reachable objects" +msgstr "Objets accessibles" + +msgid "Commits" +msgstr "Commits" + +msgid "Trees" +msgstr "Arbres" + +msgid "Blobs" +msgstr "Blobs" + +msgid "Repository structure" +msgstr "Structure de dépôt" + +msgid "Value" +msgstr "Valeur" + +msgid "Counting references" +msgstr "Comptage des références" + msgid "" "git rerere [clear | forget <pathspec>... | diff | status | remaining | gc]" msgstr "" @@ -12635,12 +13323,6 @@ msgstr "git show-ref --exclude-existing[=<motif>]" msgid "git show-ref --exists <ref>" msgstr "git show-ref --exists <réf>" -msgid "reference does not exist" -msgstr "la référence n'existe pas" - -msgid "failed to look up reference" -msgstr "échec de la recherche de la référence" - msgid "only show tags (can be combined with --branches)" msgstr "afficher seulement les étiquettes (peut être combiné avec --branches)" @@ -12675,10 +13357,10 @@ msgstr "" msgid "" "git sparse-checkout (init | list | set | add | reapply | disable | check-" -"rules) [<options>]" +"rules | clean) [<options>]" msgstr "" "git sparse-checkout (init | list | set | add | reapply | disable | check-" -"rules) [<options>]" +"rules | clean) [<options>]" msgid "this worktree is not sparse" msgstr "cet arbre de travail n'est pas clairsemé" @@ -12721,10 +13403,6 @@ msgid "toggle the use of a sparse index" msgstr "bascule l'utilisation d'index clairsemé" #, c-format -msgid "unable to create leading directories of %s" -msgstr "impossible de créer les répertoires de premier niveau de %s" - -#, c-format msgid "failed to open '%s'" msgstr "échec à l'ouverture de '%s'" @@ -12809,6 +13487,34 @@ msgstr "" "extraction clairsemée nécessaire pour pouvoir réappliquer les motifs de " "clairsemage" +msgid "report each affected file, not just directories" +msgstr "afficher chaque fichier affecté, pas juste les répertoires" + +msgid "must be in a sparse-checkout to clean directories" +msgstr "doit être une extraction clairsemée pour nettoyer les répertoires" + +msgid "must be in a cone-mode sparse-checkout to clean directories" +msgstr "" +"doit être une extraction clairsemée en mode cone pour nettoyer les " +"répertoires" + +msgid "for safety, refusing to clean without one of --force or --dry-run" +msgstr "par sécurité, refus de nettoyer s'il n'y a ni --force ni --dry-run" + +msgid "failed to read index" +msgstr "échec à la lecture de l'index" + +msgid "" +"failed to convert index to a sparse index; resolve merge conflicts and try " +"again" +msgstr "" +"échec de conversion de l'index en index clairsemé ; résolvez les conflits de " +"fusion et ré-essayez" + +#, c-format +msgid "failed to remove '%s'" +msgstr "échec de la suppression de '%s'" + msgid "error while refreshing working directory" msgstr "erreur lors du rafraîchissement du répertoire de travail" @@ -14557,9 +15263,6 @@ msgstr "écrire l'objet arbre pour un sous-répertoire <préfixe>" msgid "only useful for debugging" msgstr "seulement utile pour le débogage" -msgid "core.fsyncMethod = batch is unsupported on this platform" -msgstr "core.fsyncMethod = batch non géré sur cette plateforme" - #, c-format msgid "could not parse bundle list key %s with value '%s'" msgstr "impossible d'analyser la clé de liste de colis %s avec la valeur '%s'" @@ -14961,6 +15664,9 @@ msgid "Add or parse structured information in commit messages" msgstr "" "Ajouter ou analyser l'information structurée dans les messages de validation" +msgid "EXPERIMENTAL: Show when files were last modified" +msgstr "EXPÉRIMENTAL : Afficher la dernière date de modification des fichiers" + msgid "Show commit logs" msgstr "Afficher l'historique des validations" @@ -15090,6 +15796,9 @@ msgstr "" "EXPÉRIMENTAL ; rejoue des commits sur une nouvelle base, fonctionne aussi " "avec les dépôts nus" +msgid "Retrieve information about the repository" +msgstr "Récupérer l'information à propos du dépôt" + msgid "Generates a summary of pending changes" msgstr "Générer une résumé des modifications en attentes" @@ -15171,9 +15880,8 @@ msgstr "Basculer de branche" msgid "Read, modify and delete symbolic refs" msgstr "Lire, modifier et supprimer les références symboliques" -msgid "Create, list, delete or verify a tag object signed with GPG" -msgstr "" -"Créer, lister, supprimer ou vérifier un objet d'étiquette signé avec GPG" +msgid "Create, list, delete or verify tags" +msgstr "Créer, lister, supprimer ou vérifier les étiquettes" msgid "Creates a temporary file with a blob's contents" msgstr "Créer un fichier temporaire avec le contenu d'un blob" @@ -16058,6 +16766,44 @@ msgstr "impossible de résoudre le blob de config '%s'" msgid "unable to parse command-line config" msgstr "lecture de la configuration de ligne de commande impossible" +#, c-format +msgid "" +"\n" +"To use the default comment string (#) please run\n" +"\n" +"%s" +msgstr "" +"\n" +"Pour utiliser la chaîne de comment par défaut (#), veuillez lancer\n" +"\n" +"%s" + +msgid "<comment string>" +msgstr "<chaîne-de-comment>" + +#, c-format +msgid "" +"\n" +"To set a custom comment string please run\n" +"\n" +"%s\n" +"where '%s' is the string you wish to use.\n" +msgstr "" +"\n" +"Pour paramétrer une chaîne de commentaire personnalisée, veuillez lancer\n" +"\n" +"%s\n" +"où '%s' est la chaîne que vous souhaitez utiliser.\n" + +#, c-format +msgid "Support for '%s=auto' has been removed in Git 3.0" +msgstr "La prise en charge de '%s=auto' a été supprimée dans Git 3.0" + +#, c-format +msgid "Support for '%s=auto' is deprecated and will be removed in Git 3.0" +msgstr "" +"La prise en charge de '%s=auto' est obsolète et sera retirée dans Git 3.0" + msgid "unknown error occurred while reading the configuration files" msgstr "erreur inconnue pendant la lecture des fichiers de configuration" @@ -16550,6 +17296,12 @@ msgstr "impossible d'ajouter le répertoire '%s' à l'archiveur" msgid "failed to write archive" msgstr "impossible d'écrire l'archive" +msgid "max-depth is not supported for worktree diffs" +msgstr "max-depth non supporté pour les diffs d'arbre-de-travail" + +msgid "max-depth is not supported for index diffs" +msgstr "max-depth n'est pas géré pour les diffs d'index" + msgid "--merge-base does not work with ranges" msgstr "--merge-base ne fonctionne pas avec des plages" @@ -17085,6 +17837,12 @@ msgstr "[(A|C|D|M|R|T|U|X|B)...[*]]" msgid "select files by diff type" msgstr "sélectionner les fichiers par types de diff" +msgid "<depth>" +msgstr "<profondeur>" + +msgid "maximum tree depth to recurse" +msgstr "profondeur d'arbre maximum de récursion" + msgid "<file>" msgstr "<fichier>" @@ -17288,10 +18046,6 @@ msgid "invalid unshallow line: %s" msgstr "ligne de fin de superficiel invalide : %s" #, c-format -msgid "object not found: %s" -msgstr "objet non trouvé : %s" - -#, c-format msgid "error in object: %s" msgstr "erreur dans l'objet : %s" @@ -17574,6 +18328,10 @@ msgstr "alias vide pour %s" msgid "recursive alias: %s" msgstr "alias recursif : %s" +#, c-format +msgid "alias loop detected: expansion of '%s' does not terminate:%s" +msgstr "boucle d'alias détectée : l'expansion de '%s' ne finit jamais : %s" + msgid "write failure on standard output" msgstr "échec d'écriture sur la sortie standard" @@ -17584,10 +18342,6 @@ msgid "close failed on standard output" msgstr "échec de fermeture de la sortie standard" #, c-format -msgid "alias loop detected: expansion of '%s' does not terminate:%s" -msgstr "boucle d'alias détectée : l'expansion de '%s' ne finit jamais : %s" - -#, c-format msgid "cannot handle %s as a builtin" msgstr "impossible d'utiliser %s comme une fonction intégrée" @@ -17641,11 +18395,19 @@ msgstr "signature incompatible ou mauvaise '%s'" msgid "failed to get the ssh fingerprint for key '%s'" msgstr "échec d'obtention de l'empreinte ssh pour la clé '%s'" +#, c-format +msgid "failed to get the ssh fingerprint for key %s" +msgstr "échec d'obtention de l'empreinte ssh pour la clé %s" + msgid "" "either user.signingkey or gpg.ssh.defaultKeyCommand needs to be configured" msgstr "soit user.signingkey ou gpg.ssh.defaultKeyCommand doit être configuré" #, c-format +msgid "malformed build-time gpg.ssh.defaultKeyCommand: %s" +msgstr "gpg.ssh.defaultKeyCommand malformée : %s" + +#, c-format msgid "gpg.ssh.defaultKeyCommand succeeded but returned no keys: %s %s" msgstr "" "gpg.ssh.defaultKeyCommand a réussi mais n'a retourné aucune clé : %s %s" @@ -17906,6 +18668,13 @@ msgstr "" " demandé : %s\n" " redirection : %s" +#, c-format +msgid "" +"number too large to represent as curl_off_t on this platform: %<PRIuMAX>" +msgstr "" +"nombre trop grand pour être représenté par curl_off_t sur cette plateforme : " +"%<PRIuMAX>" + msgid "Author identity unknown\n" msgstr "Identité d'auteur inconnue\n" @@ -18375,10 +19144,6 @@ msgid "could not load pack" msgstr "impossible de charger le paquet" #, c-format -msgid "could not open index for %s" -msgstr "impossible d'ouvrir l'index pour %s" - -#, c-format msgid "unable to link '%s' to '%s'" msgstr "impossible de lier '%s' à '%s'" @@ -18402,6 +19167,10 @@ msgid "unknown preferred pack: '%s'" msgstr "paquet préféré inconnu : %s" #, c-format +msgid "failed to open preferred pack %s" +msgstr "échec à l'ouverture du paquet préféré %s" + +#, c-format msgid "cannot select preferred pack %s with no objects" msgstr "impossible de sélectionner le paquet préféré %s avec aucun objet" @@ -18425,6 +19194,9 @@ msgstr "impossible de créer une couche MIDX temporaire" msgid "could not write multi-pack bitmap" msgstr "impossible d'écrire le bitmap multi-paquet" +msgid "too many multi-pack-indexes" +msgstr "nombre de multi-pack-index trop grand" + msgid "unable to open multi-pack-index chain file" msgstr "impossible d'ouvrir le fichier d'index multi-paquet" @@ -18704,10 +19476,6 @@ msgid "files '%s' and '%s' differ in contents" msgstr "les fichiers '%s' et '%s' diffèrent par leur contenu" #, c-format -msgid "unable to write file %s" -msgstr "impossible d'écrire le fichier %s" - -#, c-format msgid "unable to write repeatedly vanishing file %s" msgstr "impossible d'écrire le fichier %s qui disparaît répétitivement" @@ -18715,6 +19483,9 @@ msgstr "impossible d'écrire le fichier %s qui disparaît répétitivement" msgid "unable to set permission to '%s'" msgstr "impossible de régler les droits de '%s'" +msgid "core.fsyncMethod = batch is unsupported on this platform" +msgstr "core.fsyncMethod = batch non géré sur cette plateforme" + msgid "error when closing loose object file" msgstr "erreur en fermeture du fichier d'objet esseulé" @@ -19224,6 +19995,21 @@ msgstr "le fichier de mtimes %s a un id d'empreinte non géré %<PRIu32>" msgid "mtimes file %s is corrupt" msgstr "le fichier de mtimes %s est corrompu" +msgid "pack everything" +msgstr "empaqueter tout" + +msgid "prune loose refs (default)" +msgstr "élaguer les références perdues (défaut)" + +msgid "auto-pack refs as needed" +msgstr "auto-empaqueter les réfs au besoin" + +msgid "references to include" +msgstr "références à inclure" + +msgid "references to exclude" +msgstr "références à exclure" + #, c-format msgid "reverse-index file %s is too small" msgstr "le fichier d'index inversé %s est trop petit" @@ -19662,6 +20448,10 @@ msgid "could not fetch %s from promisor remote" msgstr "impossible de récupérer %s depuis le distant de prometteur" #, c-format +msgid "unsupported field '%s' in '%s' config" +msgstr "champ non géré '%s' dans le config '%s'" + +#, c-format msgid "no or empty URL advertised for remote '%s'" msgstr "URL manquante ou vide annoncée pour le distant '%s'" @@ -19670,12 +20460,16 @@ msgid "known remote named '%s' but with URL '%s' instead of '%s'" msgstr "distant connu nommé '%s' mais avec l'URL '%s' au lieu de '%s'" #, c-format -msgid "unknown '%s' value for '%s' config option" -msgstr "valeur inconnue '%s' pour l'option de config '%s'" +msgid "invalid element '%s' from remote info" +msgstr "élément invalide '%s' pour l'info de distant" + +#, c-format +msgid "server advertised a promisor remote without a name or URL: %s" +msgstr "les serveur a annoncé un distant prometteur sans nom ou URL : %s" #, c-format -msgid "unknown element '%s' from remote info" -msgstr "élément inconnu '%s' pour l'info de distant" +msgid "unknown '%s' value for '%s' config option" +msgstr "valeur inconnue '%s' pour l'option de config '%s'" #, c-format msgid "accepted promisor remote '%s' not found" @@ -19775,6 +20569,16 @@ msgid "failed to generate diff" msgstr "échec de la génération de diff" #, c-format +msgid "" +"range-diff: unable to compute the range-diff, since it exceeds the maximum " +"memory for the cost matrix: %s (%<PRIuMAX> bytes) needed, limited to %s " +"(%<PRIuMAX> bytes)" +msgstr "" +"range-diff: impossible de calculer le range-diff, car il dépasse la mémoire " +"maximum pour la matrice de coût : %s (%<PRIuMAX> octets) nécessaires, " +"limités à %s (%<PRIuMAX> octets)" + +#, c-format msgid "could not parse log for '%s'" msgstr "impossible d'analyser le journal pour '%s'" @@ -20308,6 +21112,9 @@ msgstr "'%s' n'est pas un journal de références" msgid "no reflog for '%s'" msgstr "pas de journal de références pour '%s'" +msgid "Checking references consistency" +msgstr "Vérification de la cohérence des références" + #, c-format msgid "%s does not point to a valid object!" msgstr "%s ne pointe pas sur un objet valide!" @@ -20323,8 +21130,9 @@ msgstr "%s%s est en suspens depuis que %s a été effacé\n" #, c-format msgid "" "Using '%s' as the name for the initial branch. This default branch name\n" -"is subject to change. To configure the initial branch name to use in all\n" -"of your new repositories, which will suppress this warning, call:\n" +"will change to \"main\" in Git 3.0. To configure the initial branch name\n" +"to use in all of your new repositories, which will suppress this warning,\n" +"call:\n" "\n" "\tgit config --global init.defaultBranch <name>\n" "\n" @@ -20333,18 +21141,33 @@ msgid "" "\n" "\tgit branch -m <name>\n" msgstr "" -"Utilisation de '%s' comme nom de la branche initiale. Le nom de la branche\n" -"par défaut peut changer. Pour configurer le nom de la branche initiale\n" -"pour tous les nouveaux dépôts, et supprimer cet avertissement, lancez :\n" +"Utilisation de '%s' comme nom de la branche initiale. Le nom\n" +"de la branche par défaut va changer pour \"main\". Pour configurer\n" +"le nom de la branche initiale pour tous les nouveaux dépôts,\n" +"et supprimer cet avertissement, lancez :\n" "\n" "\tgit config --global init.defaultBranch <nom>\n" "\n" -"Les noms les plus utilisés à la place de 'master' sont 'main', 'trunk' et\n" -"'development'. La branche nouvellement créée peut être rénommée avec :\n" +"Les noms les plus utilisés à la place de 'master' sont 'main', 'trunk'\n" +"et 'development'. La branche nouvelle peut être rénommée avec :\n" "\n" "\tgit branch -m <nom>\n" #, c-format +msgid "" +"Using '%s' as the name for the initial branch since Git 3.0.\n" +"If you expected Git to create 'master', the just-created\n" +"branch can be renamed via this command:\n" +"\n" +"\tgit branch -m master\n" +msgstr "" +"L'utilisation de '%s' comme nom de branche initial depuis Git 3.0\n" +"Si vous vous attendiez à ce que Git crée une branche 'master', la\n" +"branche nouvellement créée peut être renommée comme suit :\n" +"\n" +"\tgit branch -m master\n" + +#, c-format msgid "could not retrieve `%s`" msgstr "impossible de récupérer `%s`" @@ -20430,6 +21253,27 @@ msgstr "impossible de supprimer le répetoire de migration temporaire '%s'" msgid "migrated refs can be found at '%s'" msgstr "les références migrées peuvent être trouvées dans '%s'" +msgid "" +"'core.preferSymlinkRefs=true' is nominated for removal.\n" +"hint: The use of symbolic links for symbolic refs is deprecated\n" +"hint: and will be removed in Git 3.0. The configuration that\n" +"hint: tells Git to use them is thus going away. You can unset\n" +"hint: it with:\n" +"hint:\n" +"hint:\tgit config unset core.preferSymlinkRefs\n" +"hint:\n" +"hint: Git will then use the textual symref format instead." +msgstr "" +"La suppression de 'core.preferSymlinkRefs=true' est programmée.\n" +"astuce : L'utilisation de liens symbolique pour les réfs symboliques\n" +"astuce : est obsolète et sera retirée pour Git 3.0. La configuration\n" +"astuce : qui indique à Git de les utiliser va disparaître. Vous\n" +"astuce : pouvez la désactiver avec :\n" +"astuce :\n" +"astuce :\tgit config unset core.preferSymlinkRefs\n" +"astuce :\n" +"astuce : Git utilisera alors le format textuel de symref à la place." + #, c-format msgid "" "cannot lock ref '%s': expected symref with target '%s': but is a regular ref" @@ -20438,6 +21282,10 @@ msgstr "" "normale trouvée" #, c-format +msgid "trying to write reflog for '%s' with incomplete values" +msgstr "essai d'écriture du reflog pour '%s' avec des valeurs incomplètes" + +#, c-format msgid "cannot read ref file '%s'" msgstr "impossible de lire le fichier de référence '%s'" @@ -20445,9 +21293,6 @@ msgstr "impossible de lire le fichier de référence '%s'" msgid "cannot open directory %s" msgstr "impossible d'ouvrir le répertoire %s" -msgid "Checking references consistency" -msgstr "Vérification de la cohérence des références" - #, c-format msgid "unable to open '%s'" msgstr "impossible d'ouvrir '%s'" @@ -20491,6 +21336,12 @@ msgstr "" "mises à jour multiples pour '%s' (dont un via la symref '%s') non permises" #, c-format +msgid "cannot lock ref '%s': dangling symref already exists" +msgstr "" +"impossible de verrouiller la référence '%s' : une référence en suspens " +"existe déjà " + +#, c-format msgid "cannot lock ref '%s': reference already exists" msgstr "impossible de verrouiller la référence '%s' : la référence existe déjà " @@ -20595,9 +21446,6 @@ msgstr "remote-curl : paquet de fin de réponse inattendu" msgid "RPC failed; %s" msgstr "échec RPC ; %s" -msgid "cannot handle pushes this big" -msgstr "impossible de gérer des poussées aussi grosses" - #, c-format msgid "cannot deflate request; zlib deflate error %d" msgstr "impossible de compresser la requête ; erreur de compression zlib %d" @@ -20689,7 +21537,7 @@ msgstr "plus d'un uploadpack fournis, utilisation du premier" #, c-format msgid "unrecognized followRemoteHEAD value '%s' ignored" -msgstr "valeur '%s' de followRemoteHEAD non reconnue et ignorée " +msgstr "valeur '%s' de followRemoteHEAD non reconnue et ignorée" #, c-format msgid "unrecognized value transfer.credentialsInUrl: '%s'" @@ -20789,6 +21637,12 @@ msgstr "" "'%s:refs/tags/%s' ?" #, c-format +msgid "" +"The <src> part of the refspec ('%s') is an object ID that doesn't exist.\n" +msgstr "" +"La partie <src> de la refspec ('%s') est un ID d'objet qui n'existe pas.\n" + +#, c-format msgid "%s cannot be resolved to branch" msgstr "'%s' ne peut pas être résolue comme une branche" @@ -20920,6 +21774,64 @@ msgid "cannot strip one component off url '%s'" msgstr "impossible de supprimer un composant de l'URL '%s'" #, c-format +msgid "cannot open index for %s" +msgstr "impossible d'ouvrir l'index pour %s" + +#, c-format +msgid "pack %s too large to consider in geometric progression" +msgstr "" +"le paquet %s est trop gros pour être pris en compte dans un progression " +"géométrique" + +#, c-format +msgid "pack %s too large to roll up" +msgstr "le paquet %s est trop gros à enrouler" + +#, c-format +msgid "could not open tempfile %s for writing" +msgstr "impossible d'ouvrir le fichier temporaire %s en écriture" + +msgid "could not close refs snapshot tempfile" +msgstr "impossible de fermer le fichier temporaire d'instantané des réfs" + +#, c-format +msgid "could not remove stale bitmap: %s" +msgstr "impossible de revenir la bitmap obsolète : %s" + +msgid "could not start pack-objects to repack promisor objects" +msgstr "" +"ne pas démarrer pack-objects pour ré-empaqueter les objects de prometteur" + +msgid "failed to feed promisor objects to pack-objects" +msgstr "Échéc de la fourniture les objets du prometteur à pack-objects" + +msgid "repack: Expecting full hex object ID lines only from pack-objects." +msgstr "" +"repack : attente de lignes d'Id d'objets en hexa complet seulement depuis " +"les objects de paquet." + +msgid "could not finish pack-objects to repack promisor objects" +msgstr "" +"impossible de terminer pack-objects pour ré-empaqueter les objets de " +"prometteur" + +#, c-format +msgid "pack prefix %s does not begin with objdir %s" +msgstr "le préfixe %s ne commence pas avec objdir %s" + +#, c-format +msgid "renaming pack to '%s' failed" +msgstr "le renommage du paquet en '%s' a échoué" + +#, c-format +msgid "pack-objects did not write a '%s' file for pack %s-%s" +msgstr "pack-objects n'a pas écrit un fichier '%s' pour la paquet %s-%s" + +#, c-format +msgid "could not unlink: %s" +msgstr "impossible de délier : '%s'" + +#, c-format msgid "bad replace ref name: %s" msgstr "mauvaise références de remplacement : %s" @@ -22238,9 +23150,6 @@ msgstr "ce n'est pas un dépôt git : '%s'" msgid "cannot chdir to '%s'" msgstr "impossible de se déplacer vers le répertoire (chdir) '%s'" -msgid "cannot come back to cwd" -msgstr "impossible de revenir au répertoire de travail courant" - #, c-format msgid "failed to stat '%*s%s%s'" msgstr "échec du stat de '%*s%s%s'" @@ -23326,18 +24235,32 @@ msgid "warning: " msgstr "avertissement : " #, c-format +msgid "'%s' is nominated for removal.\n" +msgstr "'%s' est nommé pour la suppression.\n" + +#, c-format msgid "" -"'%s' is nominated for removal.\n" -"If you still use this command, please add an extra\n" -"option, '--i-still-use-this', on the command line\n" -"and let us know you still use it by sending an e-mail\n" -"to <git@vger.kernel.org>. Thanks.\n" +"If you still use this command, here's what you can do:\n" +"\n" +"- read https://git-scm.com/docs/BreakingChanges.html\n" +"- check if anyone has discussed this on the mailing\n" +" list and if they came up with something that can\n" +" help you: https://lore.kernel.org/git/?q=%s\n" +"- send an email to <git@vger.kernel.org> to let us\n" +" know that you still use this command and were unable\n" +" to determine a suitable replacement\n" +"\n" msgstr "" -"La suppression de '%s' est prévue.\n" -"Si vous utilisez cette commande, veuillez ajouter\n" -"une option supplémentaire, '--i-still-use-this',\n" -"sur la ligne de commande pour nous avertir par\n" -"un courriel à <git@vger.kernel.org>. Merci.\n" +"Si vous utilisez toujours cette commande, voici ce que vous pouvez faire :\n" +"\n" +"- lire https://git-scm.com/docs/BreakingChanges.html\n" +"- vérifier si quelqu'un a abordé le sujet sur la liste\n" +" de diffusion et si une solution à votre problème a été\n" +" trouvée : https://lore.kernel.org/git/?q=%s\n" +"- envoyer un courriel à <git@vger.kernel.org> et nous\n" +" informer que vous utilisez toujours cette commande et\n" +" que vous n'avez pas trouvé de remplacement\n" +"\n" msgid "refusing to run without --i-still-use-this" msgstr "refus de lancer sans --i-still-use-this" @@ -24217,6 +25140,9 @@ msgstr "Envoyer ce courriel ? ([y]es|[n]o|[e]dit|[q]uit|[a]ll) : " msgid "Send this email reply required" msgstr "Une réponse est nécessaire" +msgid "The destination IMAP folder is not properly defined." +msgstr "Le dossier IMAP destination n'est pas défini correctement." + msgid "The required SMTP server is not properly defined." msgstr "Le serveur SMTP nécessaire n'est pas défini correctement." @@ -24343,6 +25269,60 @@ msgstr "%s sauté avec un suffix de sauvegarde '%s'.\n" msgid "Do you really want to send %s? [y|N]: " msgstr "Souhaitez-vous réellement envoyer %s ?[y|N] : " +#~ msgid "No previous hunk" +#~ msgstr "Pas de section précédente" + +#~ msgid "No next hunk" +#~ msgstr "Pas de section suivante" + +#~ msgid "git for-each-ref [<options>] [<pattern>]" +#~ msgstr "git for-each-ref [<options>] [<motif>]" + +#~ msgid "git for-each-ref [--merged [<commit>]] [--no-merged [<commit>]]" +#~ msgstr "git for-each-ref [--merged [<commit>]] [--no-merged [<commit>]]" + +#~ msgid "git for-each-ref [--contains [<commit>]] [--no-contains [<commit>]]" +#~ msgstr "git for-each-ref [--contains [<commit>]] [--no-contains [<commit>]]" + +#~ msgid "git for-each-ref [--start-after <marker>]" +#~ msgstr "git for-each-ref [--start-after <marqueur>]" + +#~ msgid "" +#~ "git pack-refs [--all] [--no-prune] [--auto] [--include <pattern>] [--" +#~ "exclude <pattern>]" +#~ msgstr "" +#~ "git pack-refs [--all] [--no-prune] [--auto] [--include <motif>] [--" +#~ "exclude <motif>]" + +#, c-format +#~ msgid "deleting '%s' failed" +#~ msgstr "échec de suppression de '%s'" + +#, c-format +#~ msgid "creating '%s' failed" +#~ msgstr "échec de création de '%s'" + +#, c-format +#~ msgid "could not open index for %s" +#~ msgstr "impossible d'ouvrir l'index pour %s" + +#~ msgid "cannot handle pushes this big" +#~ msgstr "impossible de gérer des poussées aussi grosses" + +#, c-format +#~ msgid "" +#~ "'%s' is nominated for removal.\n" +#~ "If you still use this command, please add an extra\n" +#~ "option, '--i-still-use-this', on the command line\n" +#~ "and let us know you still use it by sending an e-mail\n" +#~ "to <git@vger.kernel.org>. Thanks.\n" +#~ msgstr "" +#~ "La suppression de '%s' est prévue.\n" +#~ "Si vous utilisez cette commande, veuillez ajouter\n" +#~ "une option supplémentaire, '--i-still-use-this',\n" +#~ "sur la ligne de commande pour nous avertir par\n" +#~ "un courriel à <git@vger.kernel.org>. Merci.\n" + #~ msgid "start-after" #~ msgstr "start-after" @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: Git\n" "Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n" -"POT-Creation-Date: 2025-05-29 09:16+0100\n" -"PO-Revision-Date: 2025-05-29 10:10+0100\n" +"POT-Creation-Date: 2025-11-06 23:58+0000\n" +"PO-Revision-Date: 2025-11-07 21:39+0000\n" "Last-Translator: Aindriú Mac Giolla Eoin <aindriu80@gmail.com>\n" "Language-Team: none\n" "Language: ga\n" @@ -16,43 +16,38 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=3; plural=n==1 ? 0 : n==2 ? 1 : 2;\n" -"X-Generator: Poedit 3.4.4\n" +"X-Generator: Poedit 3.7\n" + +#, c-format +msgid "%s cannot be negative" +msgstr "Nà féidir %s a bheith diúltach" -#: add-interactive.c #, c-format msgid "Huh (%s)?" msgstr "Huh (%s)?" -#: add-interactive.c builtin/merge.c builtin/rebase.c reset.c sequencer.c msgid "could not read index" msgstr "nà raibh in ann innéacs a léamh" -#: add-interactive.c msgid "binary" msgstr "dénártha" -#: add-interactive.c msgid "nothing" msgstr "rud ar bith" -#: add-interactive.c msgid "unchanged" msgstr "gan athrú" -#: add-interactive.c msgid "Update" msgstr "Nuashonraigh" -#: add-interactive.c #, c-format msgid "could not stage '%s'" msgstr "nà fhéadfaà '%s' a chéim" -#: add-interactive.c builtin/stash.c reset.c sequencer.c msgid "could not write index" msgstr "nà fhéadfadh innéacs a scrÃobh" -#: add-interactive.c #, c-format msgid "updated %d path\n" msgid_plural "updated %d paths\n" @@ -60,25 +55,20 @@ msgstr[0] "nuashonraithe %d cosán\n" msgstr[1] "nuashonraÃodh %d cosán\n" msgstr[2] "nuashonraÃodh %d cosán\n" -#: add-interactive.c #, c-format msgid "note: %s is untracked now.\n" msgstr "nótaÃ: Tá %s dÃrianaithe anois.\n" -#: add-interactive.c apply.c builtin/checkout.c builtin/reset.c #, c-format msgid "make_cache_entry failed for path '%s'" msgstr "theip ar make_cache_entry le haghaidh cosán '%s'" -#: add-interactive.c msgid "Revert" msgstr "Aisghabháil" -#: add-interactive.c msgid "Could not parse HEAD^{tree}" msgstr "Nà raibh sé in ann HEAD ^ {tree} a pharsáil" -#: add-interactive.c #, c-format msgid "reverted %d path\n" msgid_plural "reverted %d paths\n" @@ -86,16 +76,13 @@ msgstr[0] "cosán %d aisiompaithe\n" msgstr[1] "%d cosán aisiompaithe\n" msgstr[2] "%d cosán aisiompaithe\n" -#: add-interactive.c #, c-format msgid "No untracked files.\n" msgstr "Gan aon chomhaid neamhrianaithe.\n" -#: add-interactive.c msgid "Add untracked" msgstr "Cuir neamh-rianaithe leis" -#: add-interactive.c #, c-format msgid "added %d path\n" msgid_plural "added %d paths\n" @@ -103,145 +90,110 @@ msgstr[0] "cuireadh %d cosán leis\n" msgstr[1] "%d cosán curtha leis\n" msgstr[2] "%d cosán curtha leis\n" -#: add-interactive.c #, c-format msgid "ignoring unmerged: %s" msgstr "ag neamhaird a dhéanamh de neamhchumasctha: %s" -#: add-interactive.c #, c-format msgid "Only binary files changed.\n" msgstr "NÃor athraigh ach comhaid dénártha.\n" -#: add-interactive.c #, c-format msgid "No changes.\n" msgstr "Gan aon athruithe.\n" -#: add-interactive.c msgid "Patch update" msgstr "Nuashonrú paiste" -#: add-interactive.c msgid "Review diff" msgstr "Athbhreithniú diff" -#: add-interactive.c msgid "show paths with changes" msgstr "taispeáin cosáin le hathruithe" -#: add-interactive.c msgid "add working tree state to the staged set of changes" msgstr "cuir stát crann oibre leis an tsraith athruithe céimeádta" -#: add-interactive.c msgid "revert staged set of changes back to the HEAD version" msgstr "tacar athruithe céime a chur ar ais chuig an leagan HEAD" -#: add-interactive.c msgid "pick hunks and update selectively" msgstr "roghnaigh hunks agus nuashonraigh go roghnach" -#: add-interactive.c msgid "view diff between HEAD and index" msgstr "féach ar an difrÃocht idir HEAD agus innéacs" -#: add-interactive.c msgid "add contents of untracked files to the staged set of changes" msgstr "cuir ábhar comhaid neamhrianaithe leis an tacar athruithe céimeádta" -#: add-interactive.c msgid "Prompt help:" msgstr "Cabhair pras:" -#: add-interactive.c msgid "select a single item" msgstr "roghnaigh mÃr amháin" -#: add-interactive.c msgid "select a range of items" msgstr "roghnaigh raon earraÃ" -#: add-interactive.c msgid "select multiple ranges" msgstr "roghnaigh raonta iomadúla" -#: add-interactive.c msgid "select item based on unique prefix" msgstr "roghnaigh mÃr bunaithe ar réimÃr uathúil" -#: add-interactive.c msgid "unselect specified items" msgstr "mÃreanna sonraithe dÃroghnaigh" -#: add-interactive.c msgid "choose all items" msgstr "roghnaigh gach earra" -#: add-interactive.c msgid "(empty) finish selecting" msgstr "(folamh) crÃochnaigh a roghnú" -#: add-interactive.c msgid "select a numbered item" msgstr "roghnaigh mÃr uimhrithe" -#: add-interactive.c msgid "(empty) select nothing" msgstr "(folamh) roghnaigh aon rud" -#: add-interactive.c builtin/clean.c msgid "*** Commands ***" msgstr "*** Orduithe ***" -#: add-interactive.c builtin/clean.c msgid "What now" msgstr "Cad anois" -#: add-interactive.c msgid "staged" msgstr "stáitse" -#: add-interactive.c msgid "unstaged" msgstr "gan stáitse" -#: add-interactive.c apply.c builtin/am.c builtin/bugreport.c builtin/clone.c -#: builtin/diagnose.c builtin/fetch.c builtin/hook.c builtin/merge.c -#: builtin/pull.c builtin/submodule--helper.c msgid "path" msgstr "cosán" -#: add-interactive.c msgid "could not refresh index" msgstr "nà fhéadfadh innéacs a athnuachan" -#: add-interactive.c builtin/clean.c #, c-format msgid "Bye.\n" -msgstr "Slán..\n" +msgstr "Slán.\n" -#: add-patch.c #, c-format msgid "Stage mode change [y,n,q,a,d%s,?]? " msgstr "Athrú modh stáitse [y, n, q, a, d%s,?]? " -#: add-patch.c #, c-format msgid "Stage deletion [y,n,q,a,d%s,?]? " msgstr "Scriosadh céime [y,n,q,a,d%s,?]? " -#: add-patch.c #, c-format msgid "Stage addition [y,n,q,a,d%s,?]? " msgstr "Breiseán céime [y, n, q, a, d%s,?]? " -#: add-patch.c #, c-format msgid "Stage this hunk [y,n,q,a,d%s,?]? " msgstr "Cuir an pÃosa seo ar stáitse [y,n,q,a,d%s,?]? " -#: add-patch.c msgid "" "If the patch applies cleanly, the edited hunk will immediately be marked for " "staging." @@ -249,7 +201,6 @@ msgstr "" "Má chuireann an paiste i bhfeidhm go glan, déanfar an hunk eagarthóireachta " "a mharcáil láithreach le haghaidh stáitsithe." -#: add-patch.c msgid "" "y - stage this hunk\n" "n - do not stage this hunk\n" @@ -264,27 +215,22 @@ msgstr "" "d - ná déan an hunk seo ná aon cheann de na hunks nÃos déanaà sa chomhad a " "chéile\n" -#: add-patch.c #, c-format msgid "Stash mode change [y,n,q,a,d%s,?]? " msgstr "Athrú modh stash [y, n, q, a, d%s,?]? " -#: add-patch.c #, c-format msgid "Stash deletion [y,n,q,a,d%s,?]? " msgstr "Scriosadh staise [y,n,q,a,d%s,?]? " -#: add-patch.c #, c-format msgid "Stash addition [y,n,q,a,d%s,?]? " msgstr "Breiseán stash [y, n, q, a, d%s,?]? " -#: add-patch.c #, c-format msgid "Stash this hunk [y,n,q,a,d%s,?]? " msgstr "An bhfuil an carachtar seo [y,n,q,a,d%s,?] i bhfolach? " -#: add-patch.c msgid "" "If the patch applies cleanly, the edited hunk will immediately be marked for " "stashing." @@ -292,7 +238,6 @@ msgstr "" "Má chuireann an paiste i bhfeidhm go glan, déanfar an hunk eagarthóireachta " "a mharcáil láithreach le haghaidh stórála." -#: add-patch.c msgid "" "y - stash this hunk\n" "n - do not stash this hunk\n" @@ -307,27 +252,22 @@ msgstr "" "d - ná déan an hunk seo ná aon cheann de na hunks nÃos déanaà sa chomhad a " "stóráil\n" -#: add-patch.c #, c-format msgid "Unstage mode change [y,n,q,a,d%s,?]? " msgstr "Athrú ar mhodh gan stáitse [y, n, q, a, d%s,?]? " -#: add-patch.c #, c-format msgid "Unstage deletion [y,n,q,a,d%s,?]? " msgstr "Scriosadh gan stáitse [y,n,q,a,d%s,?]? " -#: add-patch.c #, c-format msgid "Unstage addition [y,n,q,a,d%s,?]? " msgstr "Breiseán gan stáitse [y, n, q, a, d%s,?]? " -#: add-patch.c #, c-format msgid "Unstage this hunk [y,n,q,a,d%s,?]? " msgstr "DÃ-stáitseáil an pÃosa beag seo den stáitse [y,n,q,a,d%s,?]? " -#: add-patch.c msgid "" "If the patch applies cleanly, the edited hunk will immediately be marked for " "unstaging." @@ -335,7 +275,6 @@ msgstr "" "Má chuireann an paiste i bhfeidhm go glan, déanfar an hunk eagarthóireachta " "a mharcáil láithreach le haghaidh dÃstáisithe." -#: add-patch.c msgid "" "y - unstage this hunk\n" "n - do not unstage this hunk\n" @@ -350,27 +289,22 @@ msgstr "" "d - ná déan an hunk seo nó aon cheann de na huncanna nÃos déanaà sa chomhad " "a dhÃchur\n" -#: add-patch.c #, c-format msgid "Apply mode change to index [y,n,q,a,d%s,?]? " msgstr "Cuir athrú mód i bhfeidhm ar innéacs [y,n,q,a,d%s,?]? " -#: add-patch.c #, c-format msgid "Apply deletion to index [y,n,q,a,d%s,?]? " msgstr "Cuir scriosadh i bhfeidhm ar innéacs [y, n, q, a, d%s,?]? " -#: add-patch.c #, c-format msgid "Apply addition to index [y,n,q,a,d%s,?]? " msgstr "Cuir an breiseán i bhfeidhm ar innéacs [y,n,q,a,d%s,?]? " -#: add-patch.c #, c-format msgid "Apply this hunk to index [y,n,q,a,d%s,?]? " msgstr "Cuir an pÃosa seo i bhfeidhm ar innéacs [y,n,q,a,d%s,?]? " -#: add-patch.c msgid "" "If the patch applies cleanly, the edited hunk will immediately be marked for " "applying." @@ -378,7 +312,6 @@ msgstr "" "Má chuireann an paiste i bhfeidhm go glan, déanfar an hunk eagarthóireachta " "a mharcáil láithreach le haghaidh iarratas a dhéanamh." -#: add-patch.c msgid "" "y - apply this hunk to index\n" "n - do not apply this hunk to index\n" @@ -394,28 +327,23 @@ msgstr "" "d - ná cuir an hunk seo ná aon cheann de na hunks nÃos déanaà sa chomhad i " "bhfeidhm\n" -#: add-patch.c #, c-format msgid "Discard mode change from worktree [y,n,q,a,d%s,?]? " msgstr "Athrú modh a dhiúscairt ó chrann oibre [y, n, q, a, d%s,?]? " -#: add-patch.c #, c-format msgid "Discard deletion from worktree [y,n,q,a,d%s,?]? " msgstr "An scriosadh ón gcrann oibre [y,n,q,a,d%s,?] a sheachaint? " -#: add-patch.c #, c-format msgid "Discard addition from worktree [y,n,q,a,d%s,?]? " msgstr "Scrios an breiseán ón gcrann oibre [y,n,q,a,d%s,?]? " -#: add-patch.c #, c-format msgid "Discard this hunk from worktree [y,n,q,a,d%s,?]? " msgstr "" "An bhfuil an pÃosa beag seo le fáil réidh ón gcrann oibre [y,n,q,a,d%s,?]? " -#: add-patch.c msgid "" "If the patch applies cleanly, the edited hunk will immediately be marked for " "discarding." @@ -423,7 +351,6 @@ msgstr "" "Má chuireann an paiste i bhfeidhm go glan, déanfar an hunk eagarthóireachta " "a mharcáil láithreach lena dhiúscairt." -#: add-patch.c msgid "" "y - discard this hunk from worktree\n" "n - do not discard this hunk from worktree\n" @@ -438,31 +365,26 @@ msgstr "" "d - ná caith an hunk seo ná aon cheann de na huncanna nÃos déanaà sa " "chomhad\n" -#: add-patch.c #, c-format msgid "Discard mode change from index and worktree [y,n,q,a,d%s,?]? " msgstr "" "Athrú modh a dhiúscairt ó innéacs agus crann oibre [y, n, q, a, d %s,?]? " -#: add-patch.c #, c-format msgid "Discard deletion from index and worktree [y,n,q,a,d%s,?]? " msgstr "" "An scriosadh ón innéacs agus ón gcrann oibre [y,n,q,a,d%s,?] a dhÃbirt? " -#: add-patch.c #, c-format msgid "Discard addition from index and worktree [y,n,q,a,d%s,?]? " msgstr "Caitheamh breisiú ó innéacs agus crann oibre [y, n, q, a, d %s,?]? " -#: add-patch.c #, c-format msgid "Discard this hunk from index and worktree [y,n,q,a,d%s,?]? " msgstr "" "An bhfuil an pÃosa beag seo le fáil réidh ón innéacs agus ón gcrann oibre " "[y,n,q,a,d%s,?]? " -#: add-patch.c msgid "" "y - discard this hunk from index and worktree\n" "n - do not discard this hunk from index and worktree\n" @@ -477,34 +399,29 @@ msgstr "" "d - ná caith an hunk seo ná aon cheann de na huncanna nÃos déanaà sa " "chomhad\n" -#: add-patch.c #, c-format msgid "Apply mode change to index and worktree [y,n,q,a,d%s,?]? " msgstr "" "Cuir athrú mód i bhfeidhm ar an innéacs agus ar an gcrann oibre " "[y,n,q,a,d%s,?]? " -#: add-patch.c #, c-format msgid "Apply deletion to index and worktree [y,n,q,a,d%s,?]? " msgstr "" "Cuir scriosadh i bhfeidhm ar innéacs agus crann oibre [y, n, q, a, d%s,?]? " -#: add-patch.c #, c-format msgid "Apply addition to index and worktree [y,n,q,a,d%s,?]? " msgstr "" "Cuir an breiseán i bhfeidhm ar an innéacs agus ar an gcrann oibre " "[y,n,q,a,d%s,?]? " -#: add-patch.c #, c-format msgid "Apply this hunk to index and worktree [y,n,q,a,d%s,?]? " msgstr "" "Cuir an pÃosa seo i bhfeidhm ar an innéacs agus ar an gcrann oibre " "[y,n,q,a,d%s,?]? " -#: add-patch.c msgid "" "y - apply this hunk to index and worktree\n" "n - do not apply this hunk to index and worktree\n" @@ -520,27 +437,22 @@ msgstr "" "d - ná cuir an hunk seo ná aon cheann de na hunks nÃos déanaà sa chomhad i " "bhfeidhm\n" -#: add-patch.c #, c-format msgid "Apply mode change to worktree [y,n,q,a,d%s,?]? " msgstr "Cuir athrú mód i bhfeidhm ar an gcrann oibre [y,n,q,a,d%s,?]? " -#: add-patch.c #, c-format msgid "Apply deletion to worktree [y,n,q,a,d%s,?]? " msgstr "Cuir scriosadh i bhfeidhm ar chrann oibre [y, n, q, a, d%s,?]? " -#: add-patch.c #, c-format msgid "Apply addition to worktree [y,n,q,a,d%s,?]? " msgstr "Cuir an breiseán i bhfeidhm ar an gcrann oibre [y,n,q,a,d%s,?]? " -#: add-patch.c #, c-format msgid "Apply this hunk to worktree [y,n,q,a,d%s,?]? " msgstr "Cuir an pÃosa seo i bhfeidhm ar an gcrann oibre [y,n,q,a,d%s,?]? " -#: add-patch.c msgid "" "y - apply this hunk to worktree\n" "n - do not apply this hunk to worktree\n" @@ -556,29 +468,23 @@ msgstr "" "d - ná cuir an hunk seo ná aon cheann de na hunks nÃos déanaà sa chomhad i " "bhfeidhm\n" -#: add-patch.c #, c-format msgid "could not parse hunk header '%.*s'" msgstr "nÃorbh fhéidir ceanntásc an bhlúire '%.*s' a pharsáil" -#: add-patch.c msgid "could not parse diff" msgstr "nà raibh sé in ann difrÃocht a pharsáil" -#: add-patch.c msgid "could not parse colored diff" msgstr "nà raibh sé in ann difrÃocht daite a pháirseáil" -#: add-patch.c #, c-format msgid "failed to run '%s'" msgstr "theip ar '%s' a reáchtáil" -#: add-patch.c msgid "mismatched output from interactive.diffFilter" msgstr "aschur mÃ-mheaitseáilte ó interactive.diffFilter" -#: add-patch.c msgid "" "Your filter must maintain a one-to-one correspondence\n" "between its input and output lines." @@ -586,7 +492,6 @@ msgstr "" "Caithfidh do scagaire comhfhreagras duine le duine a choinneáil\n" "idir a lÃnte ionchuir agus aschuir." -#: add-patch.c #, c-format msgid "" "expected context line #%d in\n" @@ -595,7 +500,6 @@ msgstr "" "lÃne comhthéacs a bhfuil súil leo #%d i\n" "%.*s" -#: add-patch.c #, c-format msgid "" "hunks do not overlap:\n" @@ -608,12 +512,10 @@ msgstr "" " nà chrÃochnaÃonn sé le:\n" "%.*s" -#: add-patch.c msgid "Manual hunk edit mode -- see bottom for a quick guide.\n" msgstr "" "Modh eagarthóireachta hunk láimhe - féach an bun le haghaidh treoir thapa.\n" -#: add-patch.c #, c-format msgid "" "---\n" @@ -626,7 +528,6 @@ msgstr "" "Chun lÃnte '%c' a bhaint, scrios iad.\n" "Bainfear lÃnte a thosaÃonn le %s.\n" -#: add-patch.c 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" @@ -637,11 +538,9 @@ msgstr "" "eagarthóireacht\n" "cuireadh isteach agus fágtar an hunk gan athrú.\n" -#: add-patch.c msgid "could not parse hunk header" msgstr "nà fhéadfaà ceanntásc hunk a pháirseáil" -#: add-patch.c msgid "'git apply --cached' failed" msgstr "Theip ar 'git apply --cached'" @@ -651,80 +550,71 @@ msgstr "Theip ar 'git apply --cached'" #. (saying "n" for "no" discards!) if the translation #. of the word "no" does not start with n. #. -#: add-patch.c msgid "" "Your edited hunk does not apply. Edit again (saying \"no\" discards!) [y/n]? " msgstr "" "Nà bhaineann do chuid eagraithe. Cuir in eagar arÃs (ag rá \"nÃl\" cuirtear " "i leataobh é!) [y/n]? " -#: add-patch.c msgid "The selected hunks do not apply to the index!" msgstr "Nà bhaineann na hunks roghnaithe leis an innéacs!" -#: add-patch.c msgid "Apply them to the worktree anyway? " msgstr "An gcuirfidh tú i bhfeidhm iad ar an gcrann oibre ar aon nós? " -#: add-patch.c msgid "Nothing was applied.\n" msgstr "Nà chuirtear aon rud i bhfeidhm.\n" -#: add-patch.c msgid "" -"j - leave this hunk undecided, see next undecided hunk\n" -"J - leave this hunk undecided, see next hunk\n" -"k - leave this hunk undecided, see previous undecided hunk\n" -"K - leave this hunk undecided, see previous hunk\n" +"j - go to the next undecided hunk, roll over at the bottom\n" +"J - go to the next hunk, roll over at the bottom\n" +"k - go to the previous undecided hunk, roll over at the top\n" +"K - go to the previous hunk, roll over at the top\n" "g - select a hunk to go to\n" "/ - search for a hunk matching the given regex\n" "s - split the current hunk into smaller hunks\n" "e - manually edit the current hunk\n" -"p - print the current hunk, 'P' to use the pager\n" +"p - print the current hunk\n" +"P - print the current hunk using the pager\n" "? - print help\n" msgstr "" -"j - fág an hunk seo gan chinneadh, féach an chéad hunk neamhchinnte eile\n" -"J - fág an hunk seo gan chinneadh, féach an chéad hunk eile\n" -"k - fág an hunk seo gan chinneadh, féach an hunk neamhchinnte roimhe seo\n" -"K - fág an hunk seo gan chinneadh, féach an hunk roimhe seo\n" -"g - roghnaigh hunk le dul chuig\n" -"/- cuardaigh hunk a mheaitseann leis an regex a thugtar\n" -"s - roinn an hunk reatha ina huncanna nÃos lú\n" -"e - cuir an hunk reatha in eagar de láimh\n" -"p - priontáil an hunk reatha, 'P' chun an pager a úsáid\n" -"? - cabhair priontála\n" +"j - téigh go dtà an chéad phÃosa eile gan chinneadh, rolladh thar ag an " +"mbun\n" +"J - téigh go dtà an chéad phÃosa eile, rolladh thar ag an mbun\n" +"k - téigh go dtà an phÃosa roimhe sin gan chinneadh, rolladh thar ag an " +"mbarr\n" +"K - téigh go dtà an phÃosa roimhe sin, rolladh thar ag an mbarr\n" +"g - roghnaigh pÃosa le dul chuige\n" +"/ - déan cuardach ar phÃosa a mheaitseálann an regex tugtha\n" +"s - roinn an pÃosa reatha ina phÃosaà nÃos lú\n" +"e - cuir an pÃosa reatha in eagar de láimh\n" +"p - priontáil an pÃosa reatha\n" +"P - priontáil an pÃosa reatha ag baint úsáide as an ngléasóir\n" +"? - cabhair phriontála\n" -#: add-patch.c #, c-format msgid "Only one letter is expected, got '%s'" msgstr "NÃl súil leis ach litir amháin, fuair '%s'" -#: add-patch.c -msgid "No previous hunk" -msgstr "NÃl aon hunk roimhe seo" +msgid "No other hunk" +msgstr "Gan aon phÃosa eile" -#: add-patch.c -msgid "No next hunk" -msgstr "NÃl aon chéad hunk eile" +msgid "No other undecided hunk" +msgstr "Gan aon phÃosa eile gan cinneadh" -#: add-patch.c msgid "No other hunks to goto" -msgstr "NÃl aon ghuncanna eile le dul" +msgstr "NÃl aon phÃosa eile le dul go" -#: add-patch.c msgid "go to which hunk (<ret> to see more)? " msgstr "téigh chuig cén hunk (<ret> le tuilleadh a fheiceáil)? " -#: add-patch.c msgid "go to which hunk? " msgstr "téigh chuig cén hunk? " -#: add-patch.c #, c-format msgid "Invalid number: '%s'" msgstr "Uimhir neamhbhailÃ: '%s'" -#: add-patch.c #, c-format msgid "Sorry, only %d hunk available." msgid_plural "Sorry, only %d hunks available." @@ -732,54 +622,42 @@ msgstr[0] "Tá brón orm, nÃl ach %d pÃosa ar fáil." msgstr[1] "Tá brón orm, nÃl ach %d hunks ar fáil." msgstr[2] "Tá brón orm, nÃl ach %d hunks ar fáil." -#: add-patch.c msgid "No other hunks to search" -msgstr "NÃl aon ghuncanna eile le cuardach" +msgstr "NÃl aon phÃosa eile le cuardach" -#: add-patch.c msgid "search for regex? " msgstr "cuardach a dhéanamh ar regex? " -#: add-patch.c #, c-format msgid "Malformed search regexp %s: %s" msgstr "Regexp cuardaigh mÃfheidhmithe %s: %s" -#: add-patch.c msgid "No hunk matches the given pattern" msgstr "NÃl aon hunk ag teacht leis an bpatrún tugtha" -#: add-patch.c msgid "Sorry, cannot split this hunk" msgstr "Tá brón orainn, nà féidir an hunk seo a roinnt" -#: add-patch.c #, c-format msgid "Split into %d hunks." msgstr "Roinn ina %d hunks." -#: add-patch.c msgid "Sorry, cannot edit this hunk" msgstr "Tá brón orainn, nà féidir an hunk seo a chur in eagar" -#: add-patch.c #, c-format msgid "Unknown command '%s' (use '?' for help)" msgstr "Ordú anaithnid '%s' (bain úsáid as '?' le haghaidh cabhair)" -#: add-patch.c msgid "'git apply' failed" msgstr "Theip ar 'git apply'" -#: add-patch.c msgid "No changes." msgstr "Gan aon athruithe." -#: add-patch.c msgid "Only binary files changed." msgstr "NÃor athraigh ach comhaid dénártha." -#: advice.c #, c-format msgid "" "\n" @@ -788,44 +666,36 @@ msgstr "" "\n" "DÃchumasaigh an teachtaireacht seo le \"git config set advice.%s false\"" -#: advice.c #, c-format msgid "%shint:%s%.*s%s\n" msgstr "%sleid:%s%.*s%s\n" -#: advice.c msgid "Cherry-picking is not possible because you have unmerged files." msgstr "" "Nà féidir piocadh silÃnà toisc go bhfuil comhaid neamh-chumasaithe agat." -#: advice.c msgid "Committing is not possible because you have unmerged files." msgstr "" "Nà féidir tiomantas a dhéanamh toisc go bhfuil comhaid neamh-" "chomhcheangailte agat." -#: advice.c msgid "Merging is not possible because you have unmerged files." msgstr "" "Nà féidir cumasc a dhéanamh toisc go bhfuil comhaid neamh-chumasaithe agat." -#: advice.c msgid "Pulling is not possible because you have unmerged files." msgstr "" "Nà féidir tarraingt a tharraingt toisc go bhfuil comhaid neamh-chumasaithe " "agat." -#: advice.c msgid "Reverting is not possible because you have unmerged files." msgstr "" "Nà féidir aisiompú toisc go bhfuil comhaid neamh-chomhcheangailte agat." -#: advice.c msgid "Rebasing is not possible because you have unmerged files." msgstr "" "Nà féidir athbhunú a dhéanamh toisc go bhfuil comhaid neamh-chumasaithe agat." -#: advice.c msgid "" "Fix them up in the work tree, and then use 'git add/rm <file>'\n" "as appropriate to mark resolution and make a commit." @@ -833,23 +703,18 @@ msgstr "" "<file>Socraigh iad sa chrann oibre, agus ansin bain úsáid as 'git add/rm '\n" "de réir mar is cuà chun réiteach a mharcáil agus tiomantas a dhéanamh." -#: advice.c msgid "Exiting because of an unresolved conflict." msgstr "Ag imeacht mar gheall ar choimhlint neamhréitithe." -#: advice.c builtin/merge.c msgid "You have not concluded your merge (MERGE_HEAD exists)." msgstr "NÃor thug tú do chumasc i gcrÃch (MERGE_HEAD ann)." -#: advice.c msgid "Please, commit your changes before merging." msgstr "Déan d'athruithe a dhéanamh le do thoil sula ndéanann tú cumasc." -#: advice.c msgid "Exiting because of unfinished merge." msgstr "Ag imeacht mar gheall ar chumasc crÃochnaithe." -#: advice.c msgid "" "Diverging branches can't be fast-forwarded, you need to either:\n" "\n" @@ -867,11 +732,9 @@ msgstr "" "\n" " git rebase\n" -#: advice.c msgid "Not possible to fast-forward, aborting." msgstr "Nà féidir dul ar aghaidh go tapa, ag cur isteach." -#: advice.c #, c-format msgid "" "The following paths and/or pathspecs matched paths that exist\n" @@ -882,7 +745,6 @@ msgstr "" "lasmuigh de do shainmhÃniú seiceála neamhchoitianta, mar sin nà bheidh\n" "nuashonraithe san innéacs:\n" -#: advice.c msgid "" "If you intend to update such entries, try one of the following:\n" "* Use the --sparse option.\n" @@ -893,7 +755,6 @@ msgstr "" "* Úsáid an rogha --sparse.\n" "* DÃchumasaigh nó modhnaigh na rialacha neamhghnách." -#: advice.c #, c-format msgid "" "Note: switching to '%s'.\n" @@ -938,7 +799,6 @@ msgstr "" "false\n" "\n" -#: advice.c #, c-format msgid "" "The following paths have been moved outside the\n" @@ -950,7 +810,6 @@ msgstr "" "ar an\n" "modhnuithe.\n" -#: advice.c msgid "" "To correct the sparsity of these paths, do the following:\n" "* Use \"git add --sparse <paths>\" to update the index\n" @@ -961,102 +820,74 @@ msgstr "" "* Úsáid “git sparse-checkout reapply†chun na rialacha neamhchoitianta a " "chur i bhfeidhm" -#: alias.c msgid "cmdline ends with \\" msgstr "crÃochnaÃonn cmdline le \\" -#: alias.c msgid "unclosed quote" msgstr "luachan neamhdhúnadh" -#: alias.c builtin/cat-file.c builtin/notes.c builtin/prune-packed.c -#: builtin/receive-pack.c builtin/refs.c builtin/tag.c t/helper/test-pkt-line.c msgid "too many arguments" msgstr "an iomarca argóintÃ" -#: apply.c #, c-format msgid "unrecognized whitespace option '%s'" msgstr "rogha spás bán gan aithint '%s'" -#: apply.c #, c-format msgid "unrecognized whitespace ignore option '%s'" msgstr "neamhaird ar spás bán gan aithint neamhaird ar rogha '%s'" -#: apply.c archive.c builtin/add.c builtin/branch.c builtin/checkout-index.c -#: builtin/checkout.c builtin/clean.c builtin/clone.c builtin/commit.c -#: builtin/describe.c builtin/diff-tree.c builtin/difftool.c -#: builtin/fast-export.c builtin/fetch.c builtin/help.c builtin/index-pack.c -#: builtin/init-db.c builtin/log.c builtin/ls-files.c builtin/merge-base.c -#: builtin/merge-tree.c builtin/merge.c builtin/pack-objects.c builtin/rebase.c -#: builtin/repack.c builtin/replay.c builtin/reset.c builtin/rev-parse.c -#: builtin/show-branch.c builtin/stash.c builtin/submodule--helper.c -#: builtin/tag.c builtin/worktree.c parse-options.c range-diff.c revision.c #, c-format msgid "options '%s' and '%s' cannot be used together" msgstr "nà féidir roghanna '%s' agus '%s' a úsáid le chéile" -#: apply.c #, c-format msgid "'%s' outside a repository" msgstr "'%s' lasmuigh de stór" -#: apply.c msgid "failed to read patch" msgstr "theip ar phaiste a léamh" -#: apply.c msgid "patch too large" msgstr "paiste ró-mhór" -#: apply.c #, c-format msgid "Cannot prepare timestamp regexp %s" msgstr "Nà féidir regexp %s aimstampa a ullmhú" -#: apply.c #, c-format msgid "regexec returned %d for input: %s" msgstr "d'fhill regexec %d le haghaidh ionchur: %s" -#: apply.c #, c-format msgid "unable to find filename in patch at line %d" msgstr "nà féidir ainm comhaid a aimsiú i bpaiste ag an lÃne %d" -#: apply.c #, c-format msgid "git apply: bad git-diff - expected /dev/null, got %s on line %d" msgstr "git apply: bad git-diff - ag súil le /dev/null, fuair %s ar lÃne %d" -#: apply.c #, c-format msgid "git apply: bad git-diff - inconsistent new filename on line %d" msgstr "" "git apply: bad git-diff - ainm comhaid nua neamhchomhsheasmhach ar lÃne %d" -#: apply.c #, c-format msgid "git apply: bad git-diff - inconsistent old filename on line %d" msgstr "git apply: bad git-diff - sean-ainm comhaid neamhréireach ar lÃne %d" -#: apply.c #, c-format msgid "git apply: bad git-diff - expected /dev/null on line %d" msgstr "git apply: bad git-diff - súil leis /dev/null ar lÃne %d" -#: apply.c #, c-format msgid "invalid mode on line %d: %s" msgstr "modh neamhbhailà ar lÃne %d: %s" -#: apply.c #, c-format msgid "inconsistent header lines %d and %d" msgstr "lÃnte ceanntásc neamhchomhsheasmhach %d agus %d" -#: apply.c #, c-format msgid "" "git diff header lacks filename information when removing %d leading pathname " @@ -1074,80 +905,64 @@ msgstr[2] "" "tá easpa eolais ainm comhaid ar cheanntásc git diff agus %d comhpháirteanna " "ainm cosáin tosaigh á mbaint (lÃne %d)" -#: apply.c #, c-format msgid "git diff header lacks filename information (line %d)" msgstr "tá easpa eolais ainm comhaid ar cheanntásc git diff (lÃne %d)" -#: apply.c #, c-format msgid "recount: unexpected line: %.*s" msgstr "atháireamh: lÃne gan choinne: %.*s" -#: apply.c #, c-format msgid "patch fragment without header at line %d: %.*s" msgstr "blúirt paiste gan ceanntásc ag an lÃne %d: %.*s" -#: apply.c msgid "new file depends on old contents" msgstr "braitheann comhad nua ar shean-ábhar" -#: apply.c msgid "deleted file still has contents" msgstr "tá ábhar fós ag comhad scriosta" -#: apply.c #, c-format msgid "corrupt patch at line %d" msgstr "paiste truaillithe ag lÃne %d" -#: apply.c #, c-format msgid "new file %s depends on old contents" msgstr "braitheann an comhad nua %s ar an seanábhar" -#: apply.c #, c-format msgid "deleted file %s still has contents" msgstr "tá ábhar fós ag comhad scriosta %s" -#: apply.c #, c-format msgid "** warning: file %s becomes empty but is not deleted" msgstr "** rabhadh: éirÃonn comhad %s folamh ach nà scriostar é" -#: apply.c #, c-format msgid "corrupt binary patch at line %d: %.*s" msgstr "paiste dénártha truaillithe ag lÃne %d: %.*s" -#: apply.c #, c-format msgid "unrecognized binary patch at line %d" msgstr "paiste dénártha gan aithint ag an lÃne %d" -#: apply.c #, c-format msgid "patch with only garbage at line %d" msgstr "paiste gan ach truflais ag an lÃne %d" -#: apply.c #, c-format msgid "unable to read symlink %s" -msgstr "nach féidir nasc simtéarach %s a léamh" +msgstr "nà féidir an nasc siombalach %s a léamh" -#: apply.c #, c-format msgid "unable to open or read %s" -msgstr "nach féidir %s a oscailt nó a léamh" +msgstr "nà féidir %s a oscailt ná a léamh" -#: apply.c #, c-format msgid "invalid start of line: '%c'" msgstr "tús neamhbhailà na lÃne: '%c'" -#: apply.c #, c-format msgid "Hunk #%d succeeded at %d (offset %d line)." msgid_plural "Hunk #%d succeeded at %d (offset %d lines)." @@ -1155,12 +970,10 @@ msgstr[0] "D'éirigh le hunk #%d ag %d (lÃne fhritháireamh %d)." msgstr[1] "D'éirigh le hunk #%d ag %d (%d lÃne curtha as feidhm)." msgstr[2] "D'éirigh le hunk #%d ag %d (%d lÃne curtha as feidhm)." -#: apply.c #, c-format msgid "Context reduced to (%ld/%ld) to apply fragment at %d" msgstr "Laghdaithe comhthéacs go (%ld/%ld) chun blúire a chur i bhfeidhm ag %d" -#: apply.c #, c-format msgid "" "while searching for:\n" @@ -1169,25 +982,21 @@ msgstr "" "agus tú ag cuardach:\n" "%.*s" -#: apply.c #, c-format msgid "missing binary patch data for '%s'" msgstr "sonraà paiste dénártha in easnamh do '%s'" -#: apply.c #, c-format msgid "cannot reverse-apply a binary patch without the reverse hunk to '%s'" msgstr "" "nà féidir paiste dénártha a chur i bhfeidhm ar ais gan an hunk droim ar ais " "chuig '%s'" -#: apply.c #, c-format msgid "cannot apply binary patch to '%s' without full index line" msgstr "" "nà féidir paiste dénártha a chur i bhfeidhm ar '%s' gan lÃne innéacs iomlán" -#: apply.c #, c-format msgid "" "the patch applies to '%s' (%s), which does not match the current contents." @@ -1195,226 +1004,182 @@ msgstr "" "baineann an paiste le '%s' (%s), nach bhfuil comhoiriúnach leis an ábhar " "reatha." -#: apply.c #, c-format msgid "the patch applies to an empty '%s' but it is not empty" msgstr "baineann an paiste le '%s' folamh ach nÃl sé folamh" -#: apply.c #, c-format msgid "the necessary postimage %s for '%s' cannot be read" msgstr "nà féidir an post riachtanach %s le haghaidh '%s' a léamh" -#: apply.c #, c-format msgid "binary patch does not apply to '%s'" msgstr "nà bhaineann paiste dénártha le '%s'" -#: apply.c #, c-format msgid "binary patch to '%s' creates incorrect result (expecting %s, got %s)" msgstr "" "cruthaÃonn paiste dénártha chuig '%s' toradh mÃcheart (ag súil le %s, fuair " "%s)" -#: apply.c #, c-format msgid "patch failed: %s:%ld" msgstr "theip ar phaiste: %s: %ld" -#: apply.c builtin/mv.c #, c-format msgid "cannot checkout %s" msgstr "nà féidir %s a sheiceáil" -#: apply.c midx.c pack-mtimes.c pack-revindex.c setup.c #, c-format msgid "failed to read %s" msgstr "theip ar %s a léamh" -#: apply.c #, c-format msgid "reading from '%s' beyond a symbolic link" msgstr "léamh ó '%s' nÃos faide ná nasc siombalach" -#: apply.c #, c-format msgid "path %s has been renamed/deleted" msgstr "tá conair %s athainmnithe/scriosta" -#: apply.c #, c-format msgid "%s: does not exist in index" msgstr "%s: nÃl ann san innéacs" -#: apply.c #, c-format msgid "%s: does not match index" msgstr "%s: nà mheaitseálann innéacs" -#: apply.c msgid "repository lacks the necessary blob to perform 3-way merge." msgstr "nÃl an blob riachtanach ag stór chun cumasc trà bhealach a dhéanamh." -#: apply.c #, c-format msgid "Performing three-way merge...\n" msgstr "Cumaisc trà bhealach a dhéanamh...\n" -#: apply.c #, c-format msgid "cannot read the current contents of '%s'" msgstr "nà féidir ábhar reatha '%s' a léamh" -#: apply.c #, c-format msgid "Failed to perform three-way merge...\n" msgstr "Theip ar chumasc trà bhealach a dhéanamh...\n" -#: apply.c #, c-format msgid "Applied patch to '%s' with conflicts.\n" msgstr "Paiste cuireadh i bhfeidhm ar '%s' le coinbhleachtaÃ.\n" -#: apply.c #, c-format msgid "Applied patch to '%s' cleanly.\n" msgstr "Cuireadh paiste i bhfeidhm go '%s' go glan.\n" -#: apply.c #, c-format msgid "Falling back to direct application...\n" msgstr "Ag titim ar ais chuig feidhmchlár dÃreach...\n" -#: apply.c msgid "removal patch leaves file contents" msgstr "fágann paiste bainte ábhar an chomhaid" -#: apply.c #, c-format msgid "%s: wrong type" msgstr "%s: cineál mÃcheart" -#: apply.c #, c-format msgid "%s has type %o, expected %o" msgstr "%s tá cineál %o air, ach bhÃothas ag súil le %o" -#: apply.c read-cache.c #, c-format msgid "invalid path '%s'" msgstr "cosán neamhbhailà '%s'" -#: apply.c #, c-format msgid "%s: already exists in index" msgstr "%s: ann cheana féin san innéacs" -#: apply.c #, c-format msgid "%s: already exists in working directory" msgstr "%s: ann cheana féin san eolaire oibre" -#: apply.c #, c-format msgid "new mode (%o) of %s does not match old mode (%o)" msgstr "nà mheaitseálann modh nua (%o) de %s sean-mhodh (%o)" -#: apply.c #, c-format msgid "new mode (%o) of %s does not match old mode (%o) of %s" msgstr "nà mheaitseálann modh nua (%o) de %s sean-mhodh (%o) de %s" -#: apply.c #, c-format msgid "affected file '%s' is beyond a symbolic link" msgstr "tá an comhad tionchair '%s' nÃos faide ná nasc siombalach" -#: apply.c #, c-format msgid "%s: patch does not apply" msgstr "%s: nÃl paiste i bhfeidhm" -#: apply.c #, c-format msgid "Checking patch %s..." msgstr "Seiceáil paiste %s..." -#: apply.c #, c-format msgid "sha1 information is lacking or useless for submodule %s" msgstr "tá faisnéis sha1 easpa nó gan úsáid le haghaidh fo-mhodúl %s" -#: apply.c #, c-format msgid "mode change for %s, which is not in current HEAD" msgstr "athrú modh do %s, nach bhfuil i HEAD reatha" -#: apply.c #, c-format msgid "sha1 information is lacking or useless (%s)." msgstr "tá faisnéis sha1 easpa nó gan úsáid (%s)." -#: apply.c #, c-format msgid "could not add %s to temporary index" msgstr "nà fhéadfaà %s a chur le hinnéacs sealadach" -#: apply.c #, c-format msgid "could not write temporary index to %s" msgstr "nà fhéadfaà innéacs sealadach a scrÃobh chuig %s" -#: apply.c #, c-format msgid "unable to remove %s from index" -msgstr "nach féidir %s a bhaint as innéacs" +msgstr "nà féidir %s a bhaint den innéacs" -#: apply.c #, c-format msgid "corrupt patch for submodule %s" msgstr "paiste truaillithe do fho-mhodúl %s" -#: apply.c #, c-format msgid "unable to stat newly created file '%s'" -msgstr "nach féidir an comhad nua-chruthaithe '%s' a stáil" +msgstr "nà féidir an comhad nua-chruthaithe '%s' a atosú" -#: apply.c #, c-format msgid "unable to create backing store for newly created file %s" -msgstr "nach féidir stór tacaÃochta a chruthú do chomhad nua-chruthaithe %s" +msgstr "" +"nà féidir stór tacaÃochta a chruthú don chomhad %s a cruthaÃodh le déanaÃ" -#: apply.c #, c-format msgid "unable to add cache entry for %s" -msgstr "nach féidir iontráil taisce a chur le haghaidh %s" +msgstr "nà féidir iontráil taisce a chur leis le haghaidh %s" -#: apply.c builtin/bisect.c builtin/gc.c #, c-format msgid "failed to write to '%s'" msgstr "theip ar scrÃobh chuig '%s'" -#: apply.c #, c-format msgid "closing file '%s'" msgstr "comhad dúnadh '%s'" -#: apply.c #, c-format msgid "unable to write file '%s' mode %o" msgstr "nà féidir an comhad '%s' modh %o a scrÃobh" -#: apply.c #, c-format msgid "Applied patch %s cleanly." msgstr "Cuireadh paiste %s i bhfeidhm go glan." -#: apply.c msgid "internal error" msgstr "earráid inmheánach" -#: apply.c #, c-format msgid "Applying patch %%s with %d reject..." msgid_plural "Applying patch %%s with %d rejects..." @@ -1422,45 +1187,36 @@ msgstr[0] "Ag cur paiste %%s i bhfeidhm le %d diúltú..." msgstr[1] "Ag cur paiste %%s i bhfeidhm le %d diúltuithe..." msgstr[2] "Ag cur paiste %%s i bhfeidhm le %d diúltuithe..." -#: apply.c #, c-format msgid "cannot open %s" msgstr "nà féidir %s a oscailt" -#: apply.c rerere.c #, c-format msgid "cannot unlink '%s'" msgstr "nà féidir '%s' a dhÃnascadh" -#: apply.c #, c-format msgid "Hunk #%d applied cleanly." msgstr "Cuireadh Hunk #%d i bhfeidhm go glan." -#: apply.c #, c-format msgid "Rejected hunk #%d." msgstr "Hunk diúltaithe #%d." -#: apply.c #, c-format msgid "Skipped patch '%s'." msgstr "Paiste scipeáilte '%s'." -#: apply.c msgid "No valid patches in input (allow with \"--allow-empty\")" msgstr "NÃl aon paistà bailà san ionchur (cead le “--allow-emptyâ€)" -#: apply.c t/helper/test-cache-tree.c msgid "unable to read index file" -msgstr "in ann comhad innéacs a léamh" +msgstr "nà féidir comhad innéacs a léamh" -#: apply.c #, c-format msgid "can't open patch '%s': %s" msgstr "nà féidir paiste '%s' a oscailt: %s" -#: apply.c #, c-format msgid "squelched %d whitespace error" msgid_plural "squelched %d whitespace errors" @@ -1468,7 +1224,6 @@ msgstr[0] "earráid spás bán %d múchta" msgstr[1] "%d earráid spás bán múchta" msgstr[2] "%d earráid spás bán múchta" -#: apply.c #, c-format msgid "%d line adds whitespace errors." msgid_plural "%d lines add whitespace errors." @@ -1476,7 +1231,6 @@ msgstr[0] "Cuireann %d lÃne earráidà spás bán leis." msgstr[1] "Cuireann %d lÃne earráidà spás bán leis." msgstr[2] "Cuireann %d lÃne earráidà spás bán leis." -#: apply.c #, c-format msgid "%d line applied after fixing whitespace errors." msgid_plural "%d lines applied after fixing whitespace errors." @@ -1484,398 +1238,303 @@ msgstr[0] "%d lÃne curtha i bhfeidhm tar éis earráidà spás bán a shocrú." msgstr[1] "%d lÃne curtha i bhfeidhm tar éis earráidà spás bán a shocrú." msgstr[2] "%d lÃne curtha i bhfeidhm tar éis earráidà spás bán a shocrú." -#: apply.c builtin/mv.c builtin/rm.c msgid "Unable to write new index file" msgstr "Nà féidir comhad innéacs nua a scrÃobh" -#: apply.c msgid "don't apply changes matching the given path" msgstr "ná cuir athruithe a mheaitseáil leis an gcosán tugtha" -#: apply.c msgid "apply changes matching the given path" msgstr "athruithe a chur i bhfeidhm a mheaitseálann" -#: apply.c builtin/am.c msgid "num" msgstr "uimhir" -#: apply.c msgid "remove <num> leading slashes from traditional diff paths" -msgstr "bain <num>slascanna ceannródaÃocha ó chosáin difriúla traidisiúnta" +msgstr "bain <num> slaiseanna tosaigh as cosáin dhifriúla traidisiúnta" -#: apply.c msgid "ignore additions made by the patch" msgstr "neamhaird a dhéanamh ar bhreiseanna a dhéanann an" -#: apply.c msgid "instead of applying the patch, output diffstat for the input" msgstr "in ionad an paiste a chur i bhfeidhm, diffstat aschuir don ionchur" -#: apply.c msgid "show number of added and deleted lines in decimal notation" msgstr "lÃon na lÃnte breise agus scriosta a thaispeáint i nótaà deachúil" -#: apply.c msgid "instead of applying the patch, output a summary for the input" msgstr "in ionad an paiste a chur i bhfeidhm, aschur achoimre don ionchur" -#: apply.c msgid "instead of applying the patch, see if the patch is applicable" msgstr "" "in ionad an paiste a chur i bhfeidhm, féach an bhfuil an paiste infheidhme" -#: apply.c msgid "make sure the patch is applicable to the current index" msgstr "" "déan cinnte go bhfuil an paiste infheidhme maidir leis an innéacs reatha" -#: apply.c msgid "mark new files with `git add --intent-to-add`" msgstr "comhad nua a mharcáil le `git add --intent-to-add`" -#: apply.c msgid "apply a patch without touching the working tree" msgstr "cuir paiste i bhfeidhm gan teagmháil leis an gcrann oibre" -#: apply.c msgid "accept a patch that touches outside the working area" msgstr "glacadh le paiste a théann lasmuigh den limistéar oibre" -#: apply.c msgid "also apply the patch (use with --stat/--summary/--check)" msgstr "" "cuir an paiste i bhfeidhm freisin (bain úsáid le --stat/--summary/--check)" -#: apply.c msgid "attempt three-way merge, fall back on normal patch if that fails" msgstr "" "iarracht a dhéanamh cumasc trà bhealach, titim ar ais ar ghnáthphaiste má " "theipeann" -#: apply.c builtin/merge-file.c msgid "for conflicts, use our version" msgstr "le haghaidh coimhlintÃ, bain úsáid as ár leagan" -#: apply.c builtin/merge-file.c msgid "for conflicts, use their version" msgstr "le haghaidh coimhlintÃ, bain úsáid as a leagan" -#: apply.c builtin/merge-file.c msgid "for conflicts, use a union version" msgstr "le haghaidh coimhlintÃ, bain úsáid as leagan aontais" -#: apply.c msgid "build a temporary index based on embedded index information" msgstr "innéacs sealadach a thógáil bunaithe ar eolas innéacs leabaithe" -#: apply.c builtin/checkout-index.c msgid "paths are separated with NUL character" msgstr "tá cosáin scartha le carachtar NUL" -#: apply.c msgid "ensure at least <n> lines of context match" msgstr "a chinntiú go mbe <n>adh lÃnte comhthéacsa" -#: apply.c builtin/am.c builtin/interpret-trailers.c builtin/pack-objects.c -#: builtin/rebase.c msgid "action" msgstr "gnÃomh" -#: apply.c msgid "detect new or modified lines that have whitespace errors" msgstr "lÃnte nua nó modhnaithe a bhrath a bhfuil earráidà spás bán acu" -#: apply.c msgid "ignore changes in whitespace when finding context" msgstr "neamhaird a dhéanamh ar athruithe ar spás bán agus comhthéacs á" -#: apply.c msgid "apply the patch in reverse" msgstr "cuir an paiste i bhfeidhm ar ais" -#: apply.c msgid "don't expect at least one line of context" msgstr "ná bà ag súil le lÃne comhthéacs amháin ar a laghad" -#: apply.c msgid "leave the rejected hunks in corresponding *.rej files" msgstr "fág na hunks diúltaithe i gcomhaide*.rej comhfhreagracha" -#: apply.c msgid "allow overlapping hunks" msgstr "cead a cheadú do na huncanna" -#: apply.c msgid "tolerate incorrectly detected missing new-line at the end of file" msgstr "" "glacadh le lÃne nua atá in easnamh a bhraitear go mÃcheart ag deireadh an " "chomhaid" -#: apply.c msgid "do not trust the line counts in the hunk headers" msgstr "ná bÃodh muinÃn agat as na comhaireamh lÃne sna ceanntásca hunk" -#: apply.c builtin/am.c msgid "root" msgstr "fréamh" -#: apply.c msgid "prepend <root> to all filenames" msgstr "cuireadh <root>i bhfeidhm ar gach ainm comhaid" -#: apply.c msgid "don't return error for empty patches" msgstr "ná tabhair earráid ar ais le haghaidh paistà folamh" -#: apply.c msgid "--ours, --theirs, and --union require --3way" msgstr "ÉilÃonn --ours, --theirs, agus --union --3way" -#: archive-tar.c archive-zip.c #, c-format msgid "cannot stream blob %s" msgstr "nà féidir le blob %s a shruthlú" -#: archive-tar.c archive-zip.c #, c-format msgid "unsupported file mode: 0%o (SHA1: %s)" msgstr "modh comhad gan tacaÃocht: 0%o (SHA1: %s)" -#: archive-tar.c archive-zip.c builtin/pack-objects.c #, c-format msgid "deflate error (%d)" msgstr "earráid dÃfhabhtaithe (%d)" -#: archive-tar.c #, c-format msgid "unable to start '%s' filter" -msgstr "nach féidir scagaire '%s' a thosú" +msgstr "nà féidir an scagaire '%s' a thosú" -#: archive-tar.c msgid "unable to redirect descriptor" -msgstr "nach féidir tuairiscà a atreorú" +msgstr "nà féidir an tuairisceoir a atreorú" -#: archive-tar.c #, c-format msgid "'%s' filter reported error" msgstr "Earráid a thuairiscigh scagaire '%s'" -#: archive-zip.c #, c-format msgid "path is not valid UTF-8: %s" msgstr "nÃl cosán bailà UTF-8: %s" -#: archive-zip.c #, c-format msgid "path too long (%d chars, SHA1: %s): %s" msgstr "cosán rófhada (%d chars, SHA1: %s): %s" -#: archive-zip.c #, c-format msgid "timestamp too large for this system: %<PRIuMAX>" msgstr "stampa ama ró-mhór don chóras seo:%<PRIuMAX>" -#: archive.c msgid "git archive [<options>] <tree-ish> [<path>...]" -msgstr "git cartlan <options>n [] <tree-ish>[<path>...]" +msgstr "git archive [<options>] <tree-ish> [<path>...]" -#: archive.c msgid "" "git archive --remote <repo> [--exec <cmd>] [<options>] <tree-ish> [<path>...]" msgstr "" -"<tree-ish><path>git archive --remote <repo>[--exec<cmd>] [] [...<options>]" +"git archive --remote <repo> [--exec <cmd>] [<options>] <tree-ish> [<path>...]" -#: archive.c msgid "git archive --remote <repo> [--exec <cmd>] --list" -msgstr "<cmd>git archive --remote <repo>[--exec] --list" +msgstr "git archive --remote <repo> [--exec <cmd>] --list" -#: archive.c builtin/gc.c builtin/notes.c builtin/tag.c #, c-format msgid "cannot read '%s'" msgstr "nà féidir '%s' a léamh" -#: archive.c #, c-format msgid "pathspec '%s' matches files outside the current directory" msgstr "meaitseálann pathspec '%s' comhaid lasmuigh den eolaire reatha" -#: archive.c builtin/add.c builtin/rm.c #, c-format msgid "pathspec '%s' did not match any files" msgstr "nÃor mheaitseáil pathspec '%s' aon chomhaid" -#: archive.c #, c-format msgid "no such ref: %.*s" msgstr "gan aon tagairt den sórt sin: %.*s" -#: archive.c #, c-format msgid "not a valid object name: %s" msgstr "nà ainm réad bailÃ: %s" -#: archive.c t/helper/test-cache-tree.c #, c-format msgid "not a tree object: %s" msgstr "nà réad crann: %s" -#: archive.c #, c-format msgid "failed to unpack tree object %s" msgstr "theip ar réad crann %s a dhÃphacáil" -#: archive.c #, c-format msgid "File not found: %s" msgstr "NÃor aimsÃodh an comhad: %s" -#: archive.c #, c-format msgid "Not a regular file: %s" msgstr "Nà comhad rialta: %s" -#: archive.c #, c-format msgid "unclosed quote: '%s'" msgstr "luachan neamhdhúnadh: '%s'" -#: archive.c #, c-format msgid "missing colon: '%s'" msgstr "colon in easnamh: '%s'" -#: archive.c #, c-format msgid "empty file name: '%s'" msgstr "ainm comhaid folamh: '%s'" -#: archive.c msgid "fmt" msgstr "fmt" -#: archive.c msgid "archive format" msgstr "formáid cartlann" -#: archive.c builtin/log.c parse-options.h msgid "prefix" msgstr "réimÃr" -#: archive.c msgid "prepend prefix to each pathname in the archive" msgstr "réimÃr a pholadh chuig gach ainm cosán sa chartlann" -#: archive.c builtin/blame.c builtin/commit-tree.c builtin/config.c -#: builtin/fast-export.c builtin/gc.c builtin/grep.c builtin/hash-object.c -#: builtin/ls-files.c builtin/notes.c builtin/read-tree.c parse-options.h msgid "file" msgstr "comhad" -#: archive.c msgid "add untracked file to archive" msgstr "cuir comhad neamhrianaithe leis an gcartlann" -#: archive.c msgid "path:content" -msgstr "bealach:ábhar" +msgstr "cosán:ábhar" -#: archive.c builtin/archive.c msgid "write the archive to this file" msgstr "scrÃobh an cartlann chuig an gcomhad seo" -#: archive.c msgid "read .gitattributes in working directory" msgstr "léite.gitattributs san eolaire oibre" -#: archive.c msgid "report archived files on stderr" msgstr "tuairisciú comhaid cartlainne ar stderr" -#: archive.c builtin/clone.c builtin/fetch.c builtin/pack-objects.c -#: builtin/pull.c msgid "time" msgstr "am" -#: archive.c msgid "set modification time of archive entries" msgstr "socraigh am modhnaithe iontrálacha cartlainne" -#: archive.c msgid "set compression level" -msgstr "leibhéal comhbhrú a shocrú" +msgstr "socraigh leibhéal comhbhrúite" -#: archive.c msgid "list supported archive formats" msgstr "liosta formáidà cartlainne tacaÃochta" -#: archive.c builtin/archive.c builtin/clone.c builtin/submodule--helper.c msgid "repo" msgstr "stóras" -#: archive.c builtin/archive.c msgid "retrieve the archive from remote repository <repo>" msgstr "aisghabháil an cartlann ó stór iargúlta <repo>" -#: archive.c builtin/archive.c builtin/difftool.c builtin/notes.c msgid "command" msgstr "ordú" -#: archive.c builtin/archive.c msgid "path to the remote git-upload-archive command" msgstr "cosán chuig an ordú iargúlta git-upload-archive" -#: archive.c msgid "Unexpected option --remote" msgstr "Rogha gan choinne --remote" -#: archive.c builtin/add.c builtin/checkout.c builtin/clone.c builtin/commit.c -#: builtin/fast-export.c builtin/index-pack.c builtin/log.c builtin/reset.c -#: builtin/rm.c builtin/stash.c builtin/worktree.c fetch-pack.c http-fetch.c -#: revision.c #, c-format msgid "the option '%s' requires '%s'" msgstr "tá %s ag teastáil don rogha '%s'" -#: archive.c msgid "Unexpected option --output" msgstr "Rogha gan choinne --output" -#: archive.c t/unit-tests/unit-test.c #, c-format msgid "extra command line parameter '%s'" msgstr "paraiméadar lÃne ordaithe breise '%s'" -#: archive.c #, c-format msgid "Unknown archive format '%s'" msgstr "Formáid cartlainne anaithnid '%s'" -#: archive.c #, c-format msgid "Argument not supported for format '%s': -%d" msgstr "Argóint nach dtacaÃtear le haghaidh formáid '%s': -%d" -#: attr.c #, c-format msgid "%.*s is not a valid attribute name" msgstr "%.*s nà ainm tréith bailà é" -#: attr.c msgid "unable to add additional attribute" -msgstr "in ann tréith bhreise a chur leis" +msgstr "nà féidir tréith bhreise a chur leis" -#: attr.c #, c-format msgid "ignoring overly long attributes line %d" msgstr "neamhaird a dhéanamh ar lÃne tréithe ró-fhada %d" -#: attr.c #, c-format msgid "%s not allowed: %s:%d" msgstr "%s nà cheadaÃtear %s:%d" -#: attr.c msgid "" "Negative patterns are ignored in git attributes\n" "Use '\\!' for literal leading exclamation." @@ -1883,56 +1542,44 @@ msgstr "" "Déantar neamhaird ar phatrúin dhiúltacha i d\n" "Úsáid '\\!' le haghaidh brú ceannródaÃoch litriúil." -#: attr.c #, c-format msgid "cannot fstat gitattributes file '%s'" msgstr "nà féidir an comhad gitattributeanna '%s' fstat" -#: attr.c #, c-format msgid "ignoring overly large gitattributes file '%s'" msgstr "neamhaird a dhéanamh ar chomhad gitattributs ró-mhór '%s'" -#: attr.c #, c-format msgid "ignoring overly large gitattributes blob '%s'" msgstr "neamhaird a dhéanamh ar ghitattributs ró-mhór blob '%s'" -#: attr.c msgid "cannot use --attr-source or GIT_ATTR_SOURCE without repo" msgstr "nà féidir --attr-source nó GIT_ATTR_SOURCE a úsáid gan repo" -#: attr.c msgid "bad --attr-source or GIT_ATTR_SOURCE" msgstr "olc --attr-source nó GIT_ATTR_SOURCE" -#: attr.c read-cache.c refs/packed-backend.c #, c-format msgid "unable to stat '%s'" msgstr "nà féidir '%s' a shástáil" -#: bisect.c builtin/cat-file.c builtin/index-pack.c builtin/notes.c -#: builtin/pack-objects.c combine-diff.c object-file.c rerere.c #, c-format msgid "unable to read %s" -msgstr "nach féidir %s a léamh" +msgstr "nà féidir %s a léamh" -#: bisect.c #, c-format msgid "Badly quoted content in file '%s': %s" msgstr "Ãbhar a luaitear go dona sa chomhad '%s': %s" -#: bisect.c #, c-format msgid "We cannot bisect more!\n" msgstr "Nà féidir linn nÃos mó a dhÃcheangal!\n" -#: bisect.c #, c-format msgid "Not a valid commit name %s" msgstr "Nà ainm tiomanta bailà %s" -#: bisect.c #, c-format msgid "" "The merge base %s is bad.\n" @@ -1941,7 +1588,6 @@ msgstr "" "Tá an bonn cumaisc %s go dona.\n" "CiallaÃonn sé seo go bhfuil an fabht socraithe idir %s agus [%s].\n" -#: bisect.c #, c-format msgid "" "The merge base %s is new.\n" @@ -1950,7 +1596,6 @@ msgstr "" "Tá an bonn cumaisc %s nua.\n" "Tá athrú tagtha ar an maoin idir %s agus [%s].\n" -#: bisect.c #, c-format msgid "" "The merge base %s is %s.\n" @@ -1959,7 +1604,6 @@ msgstr "" "Is é an bonn cumaisc %s ná %s.\n" "CiallaÃonn sé seo go bhfuil an chéad thiomantas '%s' idir %s agus [%s].\n" -#: bisect.c #, c-format msgid "" "Some %s revs are not ancestors of the %s rev.\n" @@ -1970,7 +1614,6 @@ msgstr "" "Nà féidir le git bisect oibriú i gceart sa chás seo.\n" "B'fhéidir gur mheas tú %s agus %s revs?\n" -#: bisect.c #, c-format msgid "" "the merge base between %s and [%s] must be skipped.\n" @@ -1982,41 +1625,33 @@ msgstr "" "%s agus %s.\n" "Leanaimid orainn ar aon nós." -#: bisect.c #, c-format msgid "Bisecting: a merge base must be tested\n" msgstr "Déroinnt: nà mór bonn cumaisc a thástáil\n" -#: bisect.c #, c-format msgid "a %s revision is needed" msgstr "tá athbhreithniú %s ag teastáil" -#: bisect.c #, c-format msgid "could not create file '%s'" msgstr "nà fhéadfaà comhad '%s' a chruthú" -#: bisect.c builtin/notes.c #, c-format msgid "unable to start 'show' for object '%s'" msgstr "nà féidir 'show' a thosú le haghaidh réad '%s'" -#: bisect.c builtin/merge.c #, c-format msgid "could not read file '%s'" msgstr "nà raibh in ann comhad '%s' a léamh" -#: bisect.c msgid "reading bisect refs failed" msgstr "theip ar athbhreithnithe bisect a léamh" -#: bisect.c #, c-format msgid "%s was both %s and %s\n" msgstr "Bhà %s %s agus %s araon\n" -#: bisect.c #, c-format msgid "" "No testable commit found.\n" @@ -2025,7 +1660,6 @@ msgstr "" "NÃor aimsÃodh aon tiomantas intástála.\n" "B'fhéidir gur thosaigh tú le droch-argóintà cosáin?\n" -#: bisect.c #, c-format msgid "(roughly %d step)" msgid_plural "(roughly %d steps)" @@ -2036,7 +1670,6 @@ msgstr[2] "(thart ar %d céim)" #. TRANSLATORS: the last %s will be replaced with "(roughly %d #. steps)" translation. #. -#: bisect.c #, 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" @@ -2048,40 +1681,31 @@ msgstr[2] "" "Ag roinnt ina dhá leath: %d athbhreithniú fágtha le tástáil tar éis an %s " "seo\n" -#: blame.c msgid "--contents and --reverse do not blend well." msgstr "Nà chumasc --contents agus --reverse go maith." -#: blame.c msgid "--reverse and --first-parent together require specified latest commit" msgstr "" "ÉilÃonn --reverse agus --first-parent le chéile an tiomantas sonraithe is " "déanaÃ" -#: blame.c builtin/bisect.c builtin/commit.c builtin/log.c builtin/merge.c -#: builtin/pack-objects.c builtin/shortlog.c midx-write.c pack-bitmap.c -#: remote.c sequencer.c submodule.c msgid "revision walk setup failed" msgstr "theip ar socrú siúlóid ath" -#: blame.c msgid "" "--reverse --first-parent together require range along first-parent chain" msgstr "" "--reverse --first-parent le chéile, teastaÃonn raon feadh an tslabhra first-" "parent" -#: blame.c #, c-format msgid "no such path %s in %s" msgstr "nÃl aon chosán den sórt sin %s i %s" -#: blame.c #, c-format msgid "cannot read blob %s for path %s" msgstr "nà féidir le blob %s a léamh le haghaidh cosán %s" -#: branch.c msgid "" "cannot inherit upstream tracking configuration of multiple refs when " "rebasing is requested" @@ -2089,31 +1713,25 @@ msgstr "" "nà féidir cumraÃocht rianaithe suas srutha iolracha a oidhreacht nuair a " "iarrtar athbhunú" -#: branch.c #, c-format msgid "not setting branch '%s' as its own upstream" msgstr "gan brainse '%s' a shocrú mar a thuas an sruth féin" -#: branch.c #, c-format msgid "branch '%s' set up to track '%s' by rebasing." msgstr "bunaÃodh brainse '%s' chun '%s' a rianú trà athbhunú." -#: branch.c #, c-format msgid "branch '%s' set up to track '%s'." msgstr "bunaÃodh brainse '%s' chun '%s' a rianú." -#: branch.c #, c-format msgid "branch '%s' set up to track:" msgstr "bunaÃodh brainse '%s' chun rianú:" -#: branch.c msgid "unable to write upstream branch configuration" -msgstr "in ann cumraÃocht brainse suas srutha a scrÃobh" +msgstr "nà féidir cumraÃocht brainse suas an sruth a scrÃobh" -#: branch.c msgid "" "\n" "After fixing the error cause you may try to fix up\n" @@ -2123,33 +1741,31 @@ msgstr "" "Tar éis an chúis earráide a shocrú féadfaidh tú iarracht a dhéanamh socrú\n" "an fhaisnéis cianrianaithe trà ghairm a dhéanamh ar:" -#: branch.c #, c-format msgid "asked to inherit tracking from '%s', but no remote is set" msgstr "iarradh ar rianú oidhreachta ó '%s', ach nÃl aon iargúlta socraithe" -#: branch.c #, c-format msgid "asked to inherit tracking from '%s', but no merge configuration is set" msgstr "" "iarrtar ar rianú oidhreachta ó '%s', ach nÃl aon chumraÃocht cumaisc " "socraithe" -#: branch.c #, c-format msgid "not tracking: ambiguous information for ref '%s'" msgstr "gan rianú: faisnéis dhébhrÃoch le haghaidh tagairt '%s'" +#. #-#-#-#-# branch.c.po #-#-#-#-# #. TRANSLATORS: This is a line listing a remote with duplicate #. refspecs in the advice message below. For RTL languages you'll #. probably want to swap the "%s" and leading " " space around. #. +#. #-#-#-#-# object-name.c.po #-#-#-#-# #. TRANSLATORS: This is line item of ambiguous object output #. from describe_ambiguous_object() above. For RTL languages #. you'll probably want to swap the "%s" and leading " " space #. around. #. -#: branch.c object-name.c #, c-format msgid " %s\n" msgstr " %s\n" @@ -2157,7 +1773,6 @@ msgstr " %s\n" #. TRANSLATORS: The second argument is a \n-delimited list of #. duplicate refspecs, composed above. #. -#: branch.c #, c-format msgid "" "There are multiple remotes whose fetch refspecs map to the remote\n" @@ -2179,39 +1794,32 @@ msgstr "" "faigheann ciananna éagsúla léarscáil speisiúcháin go difriúil\n" "spaisà ainmneacha a rianú." -#: branch.c #, c-format msgid "'%s' is not a valid branch name" msgstr "Nà ainm brainse bailà é '%s'" -#: branch.c builtin/branch.c msgid "See `man git check-ref-format`" msgstr "Féach `man git check-ref-format`" -#: branch.c #, c-format msgid "a branch named '%s' already exists" msgstr "tá brainse darb ainm '%s' ann cheana" -#: branch.c #, c-format msgid "cannot force update the branch '%s' used by worktree at '%s'" msgstr "" "nà féidir an brainse '%s' a úsáideann crann oibre a nuashonrú a chur i " "bhfeidhm ag '%s'" -#: branch.c #, c-format msgid "cannot set up tracking information; starting point '%s' is not a branch" msgstr "" "nà féidir faisnéis rianaithe a chur ar bun; nà brainse é pointe tosaigh '%s'" -#: branch.c #, c-format msgid "the requested upstream branch '%s' does not exist" msgstr "nÃl an brainse suas srutha iarrtha '%s' ann" -#: branch.c msgid "" "\n" "If you are planning on basing your work on an upstream\n" @@ -2231,27 +1839,22 @@ msgstr "" "rianóidh sé a mhacasamhail iargúlta, b'fhéidir gur mhaith leat a úsáid\n" "“git push -u†chun an cumraÃocht suas sruth a shocrú agus tú ag brú." -#: branch.c builtin/replace.c #, c-format msgid "not a valid object name: '%s'" msgstr "nà ainm réad bailÃ: '%s'" -#: branch.c #, c-format msgid "ambiguous object name: '%s'" msgstr "ainm réad débhrÃoch: '%s'" -#: branch.c #, c-format msgid "not a valid branch point: '%s'" msgstr "nà pointe brainse bailÃ: '%s'" -#: branch.c #, c-format msgid "submodule '%s': unable to find submodule" msgstr "fo-mhodúl '%s': in ann fo-mhodúl a aimsiú" -#: branch.c #, c-format msgid "" "You may try updating the submodules using 'git checkout --no-recurse-" @@ -2260,135 +1863,102 @@ msgstr "" "Is féidir leat triail a bhaint as na fo-mhodúil a nuashonrú ag baint úsáide " "as 'git checkout --no-recurse-submodules %s && git submodule update --init'" -#: branch.c #, c-format msgid "submodule '%s': cannot create branch '%s'" msgstr "fo-mhodúl '%s': nà féidir brainse '%s' a chruthú" -#: branch.c #, c-format msgid "'%s' is already used by worktree at '%s'" msgstr "Úsáidtear '%s' cheana féin ag an gcrann oibre ag '%s'" -#: builtin/add.c msgid "git add [<options>] [--] <pathspec>..." msgstr "git add [<options>] [--]<pathspec>..." -#: builtin/add.c #, c-format msgid "cannot chmod %cx '%s'" msgstr "nà féidir chmod %cx '%s'" -#: builtin/add.c msgid "Unstaged changes after refreshing the index:" msgstr "Athruithe gan stáitse tar éis an t-innéacs a athnuachan:" -#: builtin/add.c msgid "could not read the index" msgstr "nà raibh in ann an t-innéacs a léamh" -#: builtin/add.c msgid "editing patch failed" msgstr "theip ar paiste eagarthóire" -#: builtin/add.c read-cache.c #, c-format msgid "could not stat '%s'" msgstr "nà fhéadfaà '%s' a stát" -#: builtin/add.c msgid "empty patch. aborted" msgstr "paiste folam. a ghabhrú" -#: builtin/add.c #, c-format msgid "could not apply '%s'" msgstr "nà fhéadfaà '%s' a chur i bhfeidhm" -#: builtin/add.c msgid "The following paths are ignored by one of your .gitignore files:\n" msgstr "" "Déanann ceann de do chomhaid .gitignore neamhaird ar na cosáin seo a " "leanas:\n" -#: builtin/add.c builtin/clean.c builtin/fetch.c builtin/mv.c -#: builtin/prune-packed.c builtin/pull.c builtin/push.c builtin/remote.c -#: builtin/rm.c builtin/send-pack.c msgid "dry run" msgstr "rith tirim" -#: builtin/add.c builtin/check-ignore.c builtin/commit.c -#: builtin/count-objects.c builtin/fsck.c builtin/log.c builtin/mv.c -#: builtin/read-tree.c builtin/refs.c msgid "be verbose" msgstr "a bheith inearálta" -#: builtin/add.c msgid "interactive picking" msgstr "piocadh idirghnÃ" -#: builtin/add.c builtin/checkout.c builtin/reset.c msgid "select hunks interactively" msgstr "roghnaigh hunks idirghnÃomhach" -#: builtin/add.c msgid "edit current diff and apply" msgstr "athraigh an dif reatha agus cuir i bhfeidhm" -#: builtin/add.c msgid "allow adding otherwise ignored files" msgstr "ligean comhaid a neamhaird a chur leis" -#: builtin/add.c msgid "update tracked files" msgstr "comhaid rianaithe a nuashonrú" -#: builtin/add.c msgid "renormalize EOL of tracked files (implies -u)" msgstr "" "athormalú a dhéanamh ar EOL na gcomhaid rianaithe (tugann le tuiscint -u)" -#: builtin/add.c msgid "record only the fact that the path will be added later" msgstr "nà thaifeadadh ach an fÃric go gcuirfear an cosán leis nÃos déanaÃ" -#: builtin/add.c msgid "add changes from all tracked and untracked files" msgstr "cuir athruithe ó gach comhad rianaithe agus neamhrianaithe" -#: builtin/add.c msgid "ignore paths removed in the working tree (same as --no-all)" msgstr "" "neamhaird a dhéanamh ar chosáin a bhaintear sa chrann oibre (mar an gcéanna " "le --no-all)" -#: builtin/add.c msgid "don't add, only refresh the index" msgstr "ná cuir leis, ach an t-innéacs a athnuachan" -#: builtin/add.c msgid "just skip files which cannot be added because of errors" msgstr "" "nà gá ach comhaid a scipeáil nach féidir a chur leis mar gheall ar earráidÃ" -#: builtin/add.c msgid "check if - even missing - files are ignored in dry run" msgstr "" "seiceáil an ndéantar neamhaird ar chomhaid - fiú ar iarraidh - ar iarraidh" -#: builtin/add.c builtin/mv.c builtin/rm.c msgid "allow updating entries outside of the sparse-checkout cone" msgstr "ligean iontrálacha a nuashonrú lasmuigh den chón seiceála neamh" -#: builtin/add.c builtin/update-index.c msgid "override the executable bit of the listed files" msgstr "an giotán infhorghnÃomhaithe de na comhaid liostaithe a sháraigh" -#: builtin/add.c msgid "warn when adding an embedded repository" msgstr "rabhadh agus stór leabaithe á chur leis" -#: builtin/add.c #, c-format msgid "" "You've added another git repository inside your current repository.\n" @@ -2419,154 +1989,120 @@ msgstr "" "\n" "Féach “git help submodule†le haghaidh tuilleadh faisnéise." -#: builtin/add.c #, c-format msgid "adding embedded git repository: %s" msgstr "stór git leabaithe a chur leis: %s" -#: builtin/add.c msgid "Use -f if you really want to add them." msgstr "Úsáid -f más mian leat iad a chur leis i ndáirÃre." -#: builtin/add.c msgid "adding files failed" msgstr "theip ar chomhaid a chur leis" -#: builtin/add.c +#, c-format +msgid "'%s' cannot be negative" +msgstr "Caithfidh '%s' a bheith neamh-diúltach" + #, c-format msgid "--chmod param '%s' must be either -x or +x" msgstr "Caithfidh --chmod param '%s' a bheith -x nó +x" -#: builtin/add.c builtin/checkout.c builtin/commit.c builtin/reset.c -#: builtin/rm.c builtin/stash.c #, c-format msgid "'%s' and pathspec arguments cannot be used together" msgstr "Nà féidir argóintà '%s' agus pathspec a úsáid le chéile" -#: builtin/add.c #, c-format msgid "Nothing specified, nothing added.\n" msgstr "NÃl aon rud sonraithe, nà chuir aon rud leis.\n" -#: builtin/add.c msgid "Maybe you wanted to say 'git add .'?" msgstr "B'fhéidir gur mhaith leat a rá 'git add. '?" -#: builtin/add.c builtin/check-ignore.c builtin/checkout.c builtin/clean.c -#: builtin/commit.c builtin/diff-tree.c builtin/grep.c builtin/mv.c -#: builtin/reset.c builtin/rm.c builtin/submodule--helper.c read-cache.c -#: rerere.c submodule.c msgid "index file corrupt" msgstr "comhad innéacs truaillithe" -#: builtin/add.c builtin/am.c builtin/checkout.c builtin/clone.c -#: builtin/commit.c builtin/stash.c merge.c rerere.c msgid "unable to write new index file" -msgstr "in ann comhad innéacs nua a scrÃobh" +msgstr "nà féidir comhad innéacs nua a scrÃobh" -#: builtin/am.c builtin/mailinfo.c mailinfo.c #, c-format msgid "bad action '%s' for '%s'" msgstr "droch-ghnÃomh '%s' le haghaidh '%s'" -#: builtin/am.c builtin/blame.c builtin/fetch.c builtin/pack-objects.c -#: builtin/pull.c builtin/revert.c config.c diff-merges.c gpg-interface.c -#: ls-refs.c parallel-checkout.c sequencer.c setup.c #, c-format msgid "invalid value for '%s': '%s'" msgstr "luach neamhbhailà do '%s': '%s'" -#: builtin/am.c builtin/commit.c builtin/merge.c sequencer.c #, c-format msgid "could not read '%s'" msgstr "nà raibh in ann '%s' a léamh" -#: builtin/am.c msgid "could not parse author script" msgstr "nà raibh sé in ann script údair a pharsáil" -#: builtin/am.c builtin/replace.c commit.c sequencer.c #, c-format msgid "could not parse %s" msgstr "nà fhéadfaà %s a pháirseáil" -#: builtin/am.c #, c-format msgid "'%s' was deleted by the applypatch-msg hook" msgstr "Scriosadh '%s' ag an crúca applypatch-msg" -#: builtin/am.c #, c-format msgid "Malformed input line: '%s'." msgstr "LÃne ionchuir mÃfhoirmithe: '%s'." -#: builtin/am.c #, c-format msgid "Failed to copy notes from '%s' to '%s'" msgstr "Theip ar nótaà a chóipeáil ó '%s' go '%s'" -#: builtin/am.c msgid "fseek failed" msgstr "theip ar fseek" -#: builtin/am.c builtin/rebase.c sequencer.c wrapper.c #, c-format msgid "could not open '%s' for reading" msgstr "nà fhéadfaà '%s' a oscailt le haghaidh léamh" -#: builtin/am.c builtin/rebase.c editor.c sequencer.c wrapper.c #, c-format msgid "could not open '%s' for writing" msgstr "nà féidir '%s' a oscailt le haghaidh scrÃbhneoireachta" -#: builtin/am.c #, c-format msgid "could not parse patch '%s'" msgstr "nà raibh sé in ann paiste '%s' a pháirseáil" -#: builtin/am.c msgid "Only one StGIT patch series can be applied at once" msgstr "" "Nà féidir ach sraith paiste STGit amháin a chur i bhfeidhm ag an am céanna" -#: builtin/am.c msgid "invalid timestamp" msgstr "stampa ama neamhbhailÃ" -#: builtin/am.c msgid "invalid Date line" msgstr "lÃne dáta neamhbhailÃ" -#: builtin/am.c msgid "invalid timezone offset" msgstr "fhritháireamh crios ama neamh" -#: builtin/am.c msgid "Patch format detection failed." msgstr "Theip ar bhrath formáid paiste." -#: builtin/am.c builtin/clone.c #, c-format msgid "failed to create directory '%s'" msgstr "theip ar eolaire '%s' a chruthú" -#: builtin/am.c msgid "Failed to split patches." msgstr "Theip ar phaistà a roinnt." -#: builtin/am.c #, c-format msgid "When you have resolved this problem, run \"%s --continue\".\n" msgstr "" "Nuair a bheidh an fhadhb seo réitithe agat, reáchtáil “%s --continueâ€.\n" -#: builtin/am.c #, c-format msgid "If you prefer to skip this patch, run \"%s --skip\" instead.\n" msgstr "" "Más fearr leat an paiste seo a scipeáil, reáchtáil “%s --skip†ina ionad.\n" -#: builtin/am.c #, c-format msgid "" "To record the empty patch as an empty commit, run \"%s --allow-empty\".\n" @@ -2574,45 +2110,37 @@ msgstr "" "Chun an paiste folamh a thaifeadadh mar thiomantas folamh, reáchtáil “%s --" "allow-emptyâ€.\n" -#: builtin/am.c #, c-format msgid "To restore the original branch and stop patching, run \"%s --abort\"." msgstr "" "Chun an brainse bunaidh a chur ar ais agus stopadh le patáil, reáchtáil “%s " "--abortâ€." -#: builtin/am.c msgid "Patch sent with format=flowed; space at the end of lines might be lost." msgstr "" "Seoladh paiste le formáid = sreabhadh; d'fhéadfaà spás ag deireadh na lÃnte " "a chailleadh." -#: builtin/am.c #, c-format msgid "missing author line in commit %s" msgstr "lÃne údair ar iarraidh i dtiomantas %s" -#: builtin/am.c #, c-format msgid "invalid ident line: %.*s" msgstr "lÃne aitheantais neamhbhailÃ: %.*s" -#: builtin/am.c builtin/checkout.c builtin/clone.c commit-graph.c #, c-format msgid "unable to parse commit %s" -msgstr "nach féidir le tiomantas %s a pharsáil" +msgstr "nà féidir an tiomnú %s a pharsáil" -#: builtin/am.c msgid "Repository lacks necessary blobs to fall back on 3-way merge." msgstr "" "NÃl na blobanna riachtanacha ag an stór chun titim siar ar chumasc trà " "bhealach." -#: builtin/am.c msgid "Using index info to reconstruct a base tree..." msgstr "Eolas innéacs a úsáid chun bonn crann a athchóiriú..." -#: builtin/am.c msgid "" "Did you hand edit your patch?\n" "It does not apply to blobs recorded in its index." @@ -2620,32 +2148,25 @@ msgstr "" "Ar chuir tú do phaiste in eagar de láimh?\n" "Nà bhaineann sé le blobs a taifeadtar ina innéacs." -#: builtin/am.c msgid "Falling back to patching base and 3-way merge..." msgstr "Ag titim ar ais go bonn paiste agus cumasc trà bhealach..." -#: builtin/am.c msgid "Failed to merge in the changes." msgstr "Theip ar na hathruithe a chumasc." -#: builtin/am.c builtin/merge.c sequencer.c msgid "git write-tree failed to write a tree" -msgstr "theip ar git write-tree crann a scrÃobh" +msgstr "git write-tree theip ar chrann a scrÃobh" -#: builtin/am.c msgid "applying to an empty history" msgstr "iarratas a dhéanamh ar stair folamh" -#: builtin/am.c builtin/commit.c builtin/merge.c builtin/replay.c sequencer.c msgid "failed to write commit object" msgstr "theip ar réad tiomanta a scrÃobh" -#: builtin/am.c #, c-format msgid "cannot resume: %s does not exist." msgstr "nà féidir atosú: nÃl %s ann." -#: builtin/am.c msgid "Commit Body is:" msgstr "Is é an Comhlacht Tiomanta:" @@ -2653,59 +2174,47 @@ msgstr "Is é an Comhlacht Tiomanta:" #. in your translation. The program will only accept English #. input at this point. #. -#: builtin/am.c #, c-format msgid "Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all: " msgstr "" "Cuir i bhfeidhm?[y]es/[n]o/[e]dit/[v]iew patch/[a]glacadh le gach rud: " -#: builtin/am.c builtin/commit.c msgid "unable to write index file" -msgstr "in ann comhad innéacs a scrÃobh" +msgstr "nà féidir comhad innéacs a scrÃobh" -#: builtin/am.c #, c-format msgid "Dirty index: cannot apply patches (dirty: %s)" msgstr "Innéacs salach: nà féidir paistà a chur i bhfeidhm (salach: %s)" -#: builtin/am.c #, c-format msgid "Skipping: %.*s" msgstr "Scipeáil: %.*s" -#: builtin/am.c #, c-format msgid "Creating an empty commit: %.*s" msgstr "Tiomantas folamh a chruthú: %.*s" -#: builtin/am.c msgid "Patch is empty." msgstr "Tá paiste folamh." -#: builtin/am.c #, c-format msgid "Applying: %.*s" msgstr "Iarratas a dhéanamh: %.*s" -#: builtin/am.c msgid "No changes -- Patch already applied." msgstr "Gan aon athruithe - paiste curtha i bhfeidhm cheana féin." -#: builtin/am.c #, c-format msgid "Patch failed at %s %.*s" msgstr "Theip ar phaiste ag %s%.*s" -#: builtin/am.c msgid "Use 'git am --show-current-patch=diff' to see the failed patch" msgstr "" "Úsáid 'git am --show-current-patch=diff' chun an paiste theip a fheiceáil" -#: builtin/am.c msgid "No changes - recorded it as an empty commit." msgstr "Gan aon athruithe - taifeadadh é mar thiomantas folamh." -#: builtin/am.c msgid "" "No changes - did you forget to use 'git add'?\n" "If there is nothing left to stage, chances are that something else\n" @@ -2717,7 +2226,6 @@ msgstr "" "tugadh na hathruithe céanna isteach cheana féin; b'fhéidir gur mhaith leat " "an paiste seo a scipeáil." -#: builtin/am.c msgid "" "You still have unmerged paths in your index.\n" "You should 'git add' each file with resolved conflicts to mark them as " @@ -2730,16 +2238,13 @@ msgstr "" "D'fhéadfá `git rm` a reáchtáil ar chomhad chun glacadh le “scriosta ag siad†" "dó." -#: builtin/am.c builtin/reset.c #, c-format msgid "Could not parse object '%s'." msgstr "Nà fhéadfaà réad '%s' a pháirseáil." -#: builtin/am.c msgid "failed to clean index" msgstr "theip ar innéacs a ghlanadh" -#: builtin/am.c msgid "" "You seem to have moved HEAD since the last 'am' failure.\n" "Not rewinding to ORIG_HEAD" @@ -2747,158 +2252,115 @@ msgstr "" "Is cosúil gur bhogadh tú HEAD ón teip 'am' deireanach.\n" "Gan athfhillte chuig ORIG_HEAD" -#: builtin/am.c builtin/bisect.c builtin/tag.c worktree.c #, c-format msgid "failed to read '%s'" msgstr "theip ar '%s' a léamh" -#: builtin/am.c msgid "git am [<options>] [(<mbox> | <Maildir>)...]" msgstr "git am [<options>] [(<mbox> | <Maildir>)...]" -#: builtin/am.c msgid "git am [<options>] (--continue | --skip | --abort)" msgstr "git am [<options>] (--continue | --skip | --abort)" -#: builtin/am.c msgid "run interactively" msgstr "rith idirghnÃomhach" -#: builtin/am.c msgid "bypass pre-applypatch and applypatch-msg hooks" msgstr "seachbhóthar crúcaà réamh-applypatch agus applypatch-msg" -#: builtin/am.c builtin/cat-file.c msgid "historical option -- no-op" msgstr "rogha stairiúil -- no-op" -#: builtin/am.c msgid "allow fall back on 3way merging if needed" msgstr "ligean titim siar ar chumasc 3bhealach más gá" -#: builtin/am.c builtin/init-db.c builtin/prune-packed.c builtin/repack.c -#: builtin/stash.c msgid "be quiet" msgstr "a bheith ciúin" -#: builtin/am.c msgid "add a Signed-off-by trailer to the commit message" msgstr "cuir leantóir sÃnithe amach leis an teachtaireacht tiomanta" -#: builtin/am.c msgid "recode into utf8 (default)" msgstr "athchóiriú isteach i utf8 (réamhshocraithe)" -#: builtin/am.c msgid "pass -k flag to git-mailinfo" msgstr "pas bratach -k chuig git-mailinfo" -#: builtin/am.c msgid "pass -b flag to git-mailinfo" msgstr "pas bratach -b chuig git-mailinfo" -#: builtin/am.c msgid "pass -m flag to git-mailinfo" msgstr "pas bratach -m chuig git-mailinfo" -#: builtin/am.c msgid "pass --keep-cr flag to git-mailsplit for mbox format" msgstr "pas bratach --keep-cr go git-mailsplit le haghaidh formáid mbox" -#: builtin/am.c msgid "strip everything before a scissors line" msgstr "gach rud a tharraingt roimh lÃne siosúr" -#: builtin/am.c msgid "pass it through git-mailinfo" msgstr "cuir ar aghaidh trà git-mailinfo" -#: builtin/am.c msgid "pass it through git-apply" msgstr "cuir isteach é trà git-apply" -#: builtin/am.c builtin/commit.c builtin/fmt-merge-msg.c builtin/grep.c -#: builtin/merge.c builtin/pull.c builtin/rebase.c builtin/repack.c -#: builtin/show-branch.c builtin/show-ref.c builtin/tag.c parse-options.h msgid "n" msgstr "n" -#: builtin/am.c builtin/branch.c builtin/bugreport.c builtin/cat-file.c -#: builtin/clone.c builtin/diagnose.c builtin/for-each-ref.c builtin/init-db.c -#: builtin/ls-files.c builtin/ls-tree.c builtin/refs.c builtin/replace.c -#: builtin/submodule--helper.c builtin/tag.c builtin/verify-tag.c msgid "format" msgstr "formáid" -#: builtin/am.c msgid "format the patch(es) are in" msgstr "formáid atá na paistea/na paiste iontu" -#: builtin/am.c msgid "override error message when patch failure occurs" msgstr "teachtaireacht earráide a shárú nuair a tharlaÃonn teip" -#: builtin/am.c msgid "continue applying patches after resolving a conflict" msgstr "leanúint ar aghaidh ag cur paistà a chur i bhfeidhm tar" -#: builtin/am.c msgid "synonyms for --continue" msgstr "comhchiallaigh do --continue" -#: builtin/am.c msgid "skip the current patch" msgstr "scipeáil an paiste reatha" -#: builtin/am.c msgid "restore the original branch and abort the patching operation" msgstr "" "an bhrainse bunaidh a chur ar ais agus cuir deireadh leis an oibrÃocht paiste" -#: builtin/am.c msgid "abort the patching operation but keep HEAD where it is" msgstr "" "déan deireadh leis an oibrÃocht paisteála ach coinnigh CEAD san áit a bhfuil " "sé" -#: builtin/am.c msgid "show the patch being applied" msgstr "taispeáin an paiste atá á chur i bhfeidhm" -#: builtin/am.c msgid "try to apply current patch again" msgstr "déan iarracht paiste reatha a chur i bhfeidhm" -#: builtin/am.c msgid "record the empty patch as an empty commit" msgstr "taifeadadh an paiste folamh mar thiomantas folamh" -#: builtin/am.c msgid "lie about committer date" msgstr "bréag faoi dháta an choimisiúnaithe" -#: builtin/am.c msgid "use current timestamp for author date" msgstr "bain úsáid as stampa ama reatha le haghaidh dáta an údair" -#: builtin/am.c builtin/commit-tree.c builtin/commit.c builtin/merge.c -#: builtin/pull.c builtin/rebase.c builtin/revert.c builtin/tag.c msgid "key-id" msgstr "id eochair" -#: builtin/am.c builtin/rebase.c msgid "GPG-sign commits" msgstr "Tiomanta comhartha GPG-Comhartha" -#: builtin/am.c msgid "how to handle empty patches" msgstr "conas paistà folamh a láimhseáil" -#: builtin/am.c msgid "(internal use for git-rebase)" msgstr "(úsáid inmheánach le haghaidh git-rebase)" -#: builtin/am.c 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." @@ -2906,16 +2368,13 @@ msgstr "" "Tá an rogha -b/--binary neamh-op le fada an lá, agus\n" "bainfear é. Ná húsáid é nÃos mó le do thoil." -#: builtin/am.c msgid "failed to read the index" msgstr "theip ar an t-innéacs a léamh" -#: builtin/am.c #, c-format msgid "previous rebase directory %s still exists but mbox given." msgstr "eolaire rebase roimhe seo %s ann fós ach tugadh mbox." -#: builtin/am.c #, c-format msgid "" "Stray %s directory found.\n" @@ -2924,128 +2383,105 @@ msgstr "" "Fuarthas eolaire %s stray.\n" "Úsáid “git am --abort†chun é a bhaint." -#: builtin/am.c msgid "Resolve operation not in progress, we are not resuming." msgstr "Réiteach oibrÃocht nach bhfuil ar siúl, nÃl muid ag atosú." -#: builtin/am.c msgid "interactive mode requires patches on the command line" msgstr "éilÃonn modh idirghnÃomhach paistà ar an lÃne ordaithe" -#: builtin/apply.c msgid "git apply [<options>] [<patch>...]" -msgstr "git feidhm [<options>] [<patch>...]" +msgstr "git apply [<options>] [<patch>...]" -#: builtin/archive.c diagnose.c msgid "could not redirect output" msgstr "nà fhéadfaà aschur a atreorú" -#: builtin/archive.c msgid "git archive: expected ACK/NAK, got a flush packet" -msgstr "cartlann git: ag súil le ACK/NAK, fuair sé paicéad sruthán" +msgstr "git archive: bhÃothas ag súil le ACK/NAK, fuair paicéad flush" -#: builtin/archive.c #, c-format msgid "git archive: NACK %s" msgstr "git archive: NACK %s" -#: builtin/archive.c msgid "git archive: protocol error" -msgstr "git cartlann: earráid prótacal" +msgstr "git archive: earráid prótacal" -#: builtin/archive.c msgid "git archive: expected a flush" msgstr "git archive: bhÃothas ag súil le sruthlú" -#: builtin/backfill.c msgid "git backfill [--min-batch-size=<n>] [--[no-]sparse]" msgstr "git backfill [--min-batch-size=<n>] [-- [no-] neart]" -#: builtin/backfill.c msgid "problem loading sparse-checkout" msgstr "fadhb ag luchtú seiceáil neamhchoiti" -#: builtin/backfill.c msgid "Minimum number of objects to request at a time" msgstr "LÃon Ãosta rudaà le iarraidh ag an am" -#: builtin/backfill.c msgid "Restrict the missing objects to the current sparse-checkout" msgstr "Cuir srian ar na rudaà atá in easnamh don tseiceáil neamhchoitianta" -#: builtin/bisect.c msgid "" -"git bisect start [--term-(new|bad)=<term> --term-(old|good)=<term>] [--no-" -"checkout] [--first-parent] [<bad> [<good>...]] [--] [<pathspec>...]" +"git bisect start [--term-(bad|new)=<term-new> --term-(good|old)=<term-old>]\n" +" [--no-checkout] [--first-parent] [<bad> [<good>...]] [--] " +"[<pathspec>...]" msgstr "" -"git bisect start [--term-(new|bad)=<term> --term-(old|good)=<term>] [--no-" -"checkout] [--first-parent] [<bad> [<good>...]] [--] [<pathspec>...]" +"git bisect start [--term-(bad|new)=<term-new> --term-(good|old)=<term-old>]\n" +" [--no-checkout] [--first-parent] [<bad> [<good>...]] [--] " +"[<pathspec>...]" + +msgid "git bisect (bad|new|<term-new>) [<rev>]" +msgstr "git bisect (bad|new|<term-new>) [<rev>]" -#: builtin/bisect.c -msgid "git bisect (good|bad) [<rev>...]" -msgstr "<rev>git bisect (maith|olc) [...]" +msgid "git bisect (good|old|<term-old>) [<rev>...]" +msgstr "git bisect (good|old|<term-old>) [<rev>...]" -#: builtin/bisect.c msgid "git bisect skip [(<rev>|<range>)...]" msgstr "git bisect skip [(<rev>|<range>)...]" -#: builtin/bisect.c msgid "git bisect reset [<commit>]" -msgstr "<commit>athshocrú git bisect []" +msgstr "git bisect reset [<commit>]" -#: builtin/bisect.c msgid "git bisect replay <logfile>" -msgstr "athsheinm git bisect <logfile>" +msgstr "git bisect replay <logfile>" -#: builtin/bisect.c msgid "git bisect run <cmd> [<arg>...]" -msgstr "git bisect a rith <cmd>[<arg>...]" +msgstr "git bisect run <cmd> [<arg>...]" -#: builtin/bisect.c #, c-format msgid "cannot open file '%s' in mode '%s'" msgstr "nà féidir comhad '%s' a oscailt sa mhodh '%s'" -#: builtin/bisect.c #, c-format msgid "could not write to file '%s'" msgstr "nà fhéadfaà scrÃobh chuig comhad '%s'" -#: builtin/bisect.c #, c-format msgid "cannot open file '%s' for reading" msgstr "nà féidir comhad '%s' a oscailt le haghaidh léamh" -#: builtin/bisect.c #, c-format msgid "'%s' is not a valid term" msgstr "Nà téarma bailà é '%s'" -#: builtin/bisect.c #, c-format msgid "can't use the builtin command '%s' as a term" msgstr "nà féidir an t-ordú bunaithe '%s' a úsáid mar théarma" -#: builtin/bisect.c #, c-format msgid "can't change the meaning of the term '%s'" msgstr "nà féidir le brà an téarma '%s' a athrú" -#: builtin/bisect.c msgid "please use two different terms" msgstr "bain úsáid as dhá théarma éagsúla" -#: builtin/bisect.c #, c-format msgid "We are not bisecting.\n" msgstr "NÃlimid ag déileáil.\n" -#: builtin/bisect.c #, c-format msgid "'%s' is not a valid commit" msgstr "Nà gealltanas bailà é '%s'" -#: builtin/bisect.c #, c-format msgid "" "could not check out original HEAD '%s'. Try 'git bisect reset <commit>'." @@ -3053,27 +2489,22 @@ msgstr "" "nà fhéadfaà an HEAD bunaidh '%s' a sheiceáil. <commit>Bain triail as 'git " "bisect reset '." -#: builtin/bisect.c #, c-format msgid "Bad bisect_write argument: %s" msgstr "Droch-argóint bisect_write: %s" -#: builtin/bisect.c #, c-format msgid "couldn't get the oid of the rev '%s'" msgstr "nà raibh in ann oid an rev '%s' a fháil" -#: builtin/bisect.c #, c-format msgid "couldn't open the file '%s'" msgstr "nà raibh in ann an comhad '%s' a oscailt" -#: builtin/bisect.c #, c-format msgid "Invalid command: you're currently in a %s/%s bisect" msgstr "Ordú neamhbhailÃ: tá tú i mbeagán %s/%s faoi láthair" -#: builtin/bisect.c #, c-format msgid "" "You need to give me at least one %s and %s revision.\n" @@ -3082,7 +2513,6 @@ msgstr "" "Nà mór duit athbhreithniú %s agus %s amháin ar a laghad a thabhairt dom.\n" "Is féidir leat “git bisect %s†agus “git bisect %s†a úsáid chuige sin." -#: builtin/bisect.c #, c-format msgid "" "You need to start by \"git bisect start\".\n" @@ -3094,7 +2524,6 @@ msgstr "" "dom.\n" "Is féidir leat “git bisect %s†agus “git bisect %s†a úsáid chuige sin." -#: builtin/bisect.c #, c-format msgid "bisecting only with a %s commit" msgstr "ag déileáil ach amháin le tiomantas %s" @@ -3103,15 +2532,12 @@ msgstr "ag déileáil ach amháin le tiomantas %s" #. translation. The program will only accept English input #. at this point. #. -#: builtin/bisect.c msgid "Are you sure [Y/n]? " msgstr "An bhfuil tú cinnte [Y/n]? " -#: builtin/bisect.c msgid "status: waiting for both good and bad commits\n" msgstr "stádas: ag fanacht le tiomáintà mhaith agus tiomáintà dona\n" -#: builtin/bisect.c #, c-format msgid "status: waiting for bad commit, %d good commit known\n" msgid_plural "status: waiting for bad commit, %d good commits known\n" @@ -3121,15 +2547,12 @@ msgstr[1] "" msgstr[2] "" "stádas: ag fanacht le droch-thiomantas, %d dea-thiomantas ar eolas\n" -#: builtin/bisect.c msgid "status: waiting for good commit(s), bad commit known\n" msgstr "stádas: ag fanacht le tiomáintà maith, droch-tiomantas ar eolas\n" -#: builtin/bisect.c msgid "no terms defined" msgstr "aon téarmaà sainmhÃnithe" -#: builtin/bisect.c #, c-format msgid "" "Your current terms are %s for the old state\n" @@ -3138,7 +2561,6 @@ msgstr "" "Is iad na téarmaà reatha %s don seanstát\n" "agus %s don stát nua.\n" -#: builtin/bisect.c #, c-format msgid "" "invalid argument %s for 'git bisect terms'.\n" @@ -3148,45 +2570,36 @@ msgstr "" "Is iad na roghanna tacaithe ná: --term-good|--term-old agus --term-bad|--" "term-new." -#: builtin/bisect.c #, c-format msgid "could not open '%s' for appending" msgstr "nà fhéadfaà '%s' a oscailt le haghaidh cur isteach" -#: builtin/bisect.c msgid "'' is not a valid term" msgstr "'' nà téarma bailà é" -#: builtin/bisect.c #, c-format msgid "unrecognized option: '%s'" msgstr "rogha gan aithint: '%s'" -#: builtin/bisect.c #, c-format msgid "'%s' does not appear to be a valid revision" msgstr "Nà cosúil gur athbhreithniú bailà é '%s'" -#: builtin/bisect.c msgid "bad HEAD - I need a HEAD" msgstr "droch HEAD - TeastaÃonn HEAD uaim" -#: builtin/bisect.c #, c-format msgid "checking out '%s' failed. Try 'git bisect start <valid-branch>'." msgstr "" "theip ar '%s' a sheiceáil. <valid-branch>Bain triail as 'git bisect start '." -#: builtin/bisect.c msgid "bad HEAD - strange symbolic ref" msgstr "bad HEAD - tagairt siombalach aisteach" -#: builtin/bisect.c #, c-format msgid "invalid ref: '%s'" msgstr "tagairt neamhbhailÃ: '%s'" -#: builtin/bisect.c msgid "You need to start by \"git bisect start\"\n" msgstr "Nà mór duit tosú ag “git bisect startâ€\n" @@ -3194,270 +2607,207 @@ msgstr "Nà mór duit tosú ag “git bisect startâ€\n" #. translation. The program will only accept English input #. at this point. #. -#: builtin/bisect.c msgid "Do you want me to do it for you [Y/n]? " msgstr "An dteastaÃonn uait go ndéanfaidh mé é duit [Y/n]? " -#: builtin/bisect.c msgid "Please call `--bisect-state` with at least one argument" msgstr "Glaoigh ar `--bisect-state` le do thoil le argóint amháin ar a laghad" -#: builtin/bisect.c #, c-format msgid "'git bisect %s' can take only one argument." msgstr "Nà féidir le 'git bisect %s' ach argóint amháin a ghlacadh." -#: builtin/bisect.c #, c-format msgid "Bad rev input: %s" msgstr "Droch-ionchur rev: %s" -#: builtin/bisect.c #, c-format msgid "Bad rev input (not a commit): %s" msgstr "Droch-ionchur rev (nà tiomantas): %s" -#: builtin/bisect.c msgid "We are not bisecting." msgstr "NÃlimid ag déileáil." -#: builtin/bisect.c #, c-format msgid "'%s'?? what are you talking about?" msgstr "'%s'?? cad atá tú ag caint faoi?" -#: builtin/bisect.c #, c-format msgid "cannot read file '%s' for replaying" msgstr "nà féidir comhad '%s' a léamh le haghaidh athsheinm" -#: builtin/bisect.c #, c-format msgid "running %s\n" msgstr "ag rith %s\n" -#: builtin/bisect.c msgid "bisect run failed: no command provided." msgstr "theip ar rith bioctha: nÃl aon ordú curtha ar fáil." -#: builtin/bisect.c #, c-format msgid "unable to verify %s on good revision" -msgstr "nach féidir %s a fhÃorú ar athbhreithniú maith" +msgstr "nà féidir %s a fhÃorú ar athbhreithniú maith" -#: builtin/bisect.c #, c-format msgid "bogus exit code %d for good revision" msgstr "cód imeachta bréagach %d le haghaidh athbhreithniú maith" -#: builtin/bisect.c #, c-format msgid "bisect run failed: exit code %d from %s is < 0 or >= 128" msgstr "< 0 or >Theip ar rith bioctha: is é an cód imeachta %d ó %s = 128" -#: builtin/bisect.c #, c-format msgid "cannot open file '%s' for writing" msgstr "nà féidir comhad '%s' a oscailt le haghaidh scrÃobh" -#: builtin/bisect.c msgid "bisect run cannot continue any more" msgstr "nà féidir le rith bisect leanúint ar aghaidh nÃos mó" -#: builtin/bisect.c msgid "bisect run success" msgstr "rath reatha dhéagsúil" -#: builtin/bisect.c msgid "bisect found first bad commit" msgstr "fuarthas bisect an chéad droch-thiomantas" -#: builtin/bisect.c #, c-format msgid "bisect run failed: 'git bisect %s' exited with error code %d" msgstr "theip ar rith bisect: D'éirigh 'git bisect %s' le cód earráide %d" -#: builtin/bisect.c #, c-format msgid "'%s' requires either no argument or a commit" msgstr "Nà éilÃonn '%s' aon argóint ná tiomantas" -#: builtin/bisect.c #, c-format msgid "'%s' requires 0 or 1 argument" msgstr "ÉilÃonn '%s' argóint 0 nó 1" -#: builtin/bisect.c #, c-format msgid "'%s' requires 0 arguments" msgstr "ÉilÃonn '%s' 0 argóint" -#: builtin/bisect.c msgid "no logfile given" msgstr "nÃl aon logfile tugtha" -#: builtin/bisect.c #, c-format msgid "'%s' failed: no command provided." msgstr "Theip ar '%s': nÃl aon ordú curtha ar fáil." -#: builtin/bisect.c msgid "need a command" msgstr "teastaÃonn ordú" -#: builtin/bisect.c builtin/cat-file.c #, c-format msgid "unknown command: '%s'" msgstr "ordú anaithnid: '%s'" -#: builtin/blame.c msgid "git blame [<options>] [<rev-opts>] [<rev>] [--] <file>" -msgstr "git an mille <options>án [<rev-opts>] [<rev>] [] [--] <file>" +msgstr "git blame [<options>] [<rev-opts>] [<rev>] [--] <file>" -#: builtin/blame.c msgid "git annotate [<options>] [<rev-opts>] [<rev>] [--] <file>" msgstr "git annotate [<options>] [] [<rev-opts><rev>] [--] <file>" -#: builtin/blame.c msgid "<rev-opts> are documented in git-rev-list(1)" msgstr "<rev-opts>iad doiciméadaithe i git-rev-list (1)" -#: builtin/blame.c #, c-format msgid "expecting a color: %s" msgstr "ag súil le dath: %s" -#: builtin/blame.c msgid "must end with a color" msgstr "caithfidh deireadh a chur le dath" -#: builtin/blame.c #, c-format msgid "cannot find revision %s to ignore" msgstr "nà féidir athbhreithniú %s a fháil le neamhair" -#: builtin/blame.c msgid "show blame entries as we find them, incrementally" msgstr "taispeáint iontrálacha milleán de réir mar a aimsÃmid iad, go chéile" -#: builtin/blame.c msgid "do not show object names of boundary commits (Default: off)" msgstr "" "ná taispeáin ainmneacha réada na ngealltanais teorann (Réamhshocraithe: as)" -#: builtin/blame.c msgid "do not treat root commits as boundaries (Default: off)" msgstr "" "ná déileáil le gealltanais fréimhe mar theorainneacha (Réamhshocraithe: as)" -#: builtin/blame.c msgid "show work cost statistics" msgstr "taispeáin staitisticà costas oibre" -#: builtin/blame.c builtin/checkout.c builtin/clone.c builtin/commit-graph.c -#: builtin/fetch.c builtin/merge.c builtin/multi-pack-index.c builtin/pull.c -#: builtin/push.c builtin/remote.c builtin/send-pack.c msgid "force progress reporting" msgstr "tuairisciú dul chun cinn" -#: builtin/blame.c msgid "show output score for blame entries" msgstr "taispeáin scór aschuir d'iontrálacha mille" -#: builtin/blame.c msgid "show original filename (Default: auto)" msgstr "taispeáin ainm comhaid bunaidh (Réamhshocraithe: auto)" -#: builtin/blame.c msgid "show original linenumber (Default: off)" msgstr "taispeáin uimhir lÃne bunaidh (Réamhshocraithe: as)" -#: builtin/blame.c msgid "show in a format designed for machine consumption" msgstr "taispeáint i bhformáid atá deartha le haghaidh tomhaltas meaisÃn" -#: builtin/blame.c msgid "show porcelain format with per-line commit information" msgstr "formáid poircealláin a thaispeáint le faisnéis tiomanta" -#: builtin/blame.c msgid "use the same output mode as git-annotate (Default: off)" msgstr "" "bain úsáid as an modh aschuir céanna le git-annotate (Réamhshocraithe: as)" -#: builtin/blame.c msgid "show raw timestamp (Default: off)" msgstr "taispeáin ama amh (Réamhshocraithe: as)" -#: builtin/blame.c msgid "show long commit SHA1 (Default: off)" msgstr "taispeáin tiomantas fada SHA1 (Réamhshocraithe: as)" -#: builtin/blame.c msgid "suppress author name and timestamp (Default: off)" msgstr "ainm an údair agus stampa ama a chur faoi chois (Réamhshocraithe: as)" -#: builtin/blame.c msgid "show author email instead of name (Default: off)" msgstr "taispeáin rÃomhphost an údair in ionad ainm (Réamhshocraithe: as)" -#: builtin/blame.c msgid "ignore whitespace differences" msgstr "neamhaird a dhéanamh ar dhifrÃochtaà spás b" -#: builtin/blame.c builtin/clone.c builtin/log.c msgid "rev" msgstr "rev" -#: builtin/blame.c msgid "ignore <rev> when blaming" msgstr "neamhaird a <rev>dhéanamh agus an milleán" -#: builtin/blame.c msgid "ignore revisions from <file>" msgstr "neamhaird ar athbhreithnithe <file>" -#: builtin/blame.c msgid "color redundant metadata from previous line differently" msgstr "meiteashonraà iomarcach dath ó lÃne roimhe seo ar bheal" -#: builtin/blame.c msgid "color lines by age" msgstr "lÃnte datha de réir aois" -#: builtin/blame.c msgid "spend extra cycles to find better match" msgstr "timthriallta breise a chaitheamh chun meaitseáil nÃos fearr" -#: builtin/blame.c msgid "use revisions from <file> instead of calling git-rev-list" msgstr "athbhreithnithe a úsáid as in <file>ionad glaoch ar git-rev-list" -#: builtin/blame.c msgid "use <file>'s contents as the final image" msgstr "úsáid <file>ábhar mar an Ãomhá deiridh" -#: builtin/blame.c msgid "score" msgstr "scór" -#: builtin/blame.c msgid "find line copies within and across files" msgstr "faigh cóipeanna lÃne laistigh de chomhaid agus trasna" -#: builtin/blame.c msgid "find line movements within and across files" msgstr "faigh gluaiseachtaà lÃne laistigh de chomhaid agus trasna" -#: builtin/blame.c msgid "range" msgstr "raon" -#: builtin/blame.c msgid "process only line range <start>,<end> or function :<funcname>" msgstr "ach raon lÃne, nó feidh <start>m a <end>phróiseáil: <funcname>" -#: builtin/blame.c msgid "--progress can't be used with --incremental or porcelain formats" msgstr "Nà féidir --progress a úsáid le formáidà --incremental nó poircealláin" @@ -3469,11 +2819,9 @@ msgstr "Nà féidir --progress a úsáid le formáidà --incremental nó poircea #. your language may need more or fewer display #. columns. #. -#: builtin/blame.c msgid "4 years, 11 months ago" msgstr "4 bliana, 11 mhà ó shin" -#: builtin/blame.c #, c-format msgid "file %s has only %lu line" msgid_plural "file %s has only %lu lines" @@ -3481,15 +2829,12 @@ msgstr[0] "comhad %s nÃl ach %lu lÃne" msgstr[1] "comhad %s nÃl ach %lu lÃnte" msgstr[2] "comhad %s nÃl ach %lu lÃnte" -#: builtin/blame.c msgid "Blaming lines" msgstr "An milleán ar lÃnte" -#: builtin/branch.c msgid "git branch [<options>] [-r | -a] [--merged] [--no-merged]" msgstr "git branch [<options>] [-r | -a] [--merged] [--no-merged]" -#: builtin/branch.c msgid "" "git branch [<options>] [-f] [--recurse-submodules] <branch-name> [<start-" "point>]" @@ -3497,31 +2842,24 @@ msgstr "" "git branch [<options>] [-f] [--recurse-submodules] <branch-name> [<start-" "point>]" -#: builtin/branch.c msgid "git branch [<options>] [-l] [<pattern>...]" msgstr "git branch [<options>] [-l] [<pattern>...]" -#: builtin/branch.c msgid "git branch [<options>] [-r] (-d | -D) <branch-name>..." msgstr "git branch [<options>] [-r] (-d | -D) <branch-name>..." -#: builtin/branch.c msgid "git branch [<options>] (-m | -M) [<old-branch>] <new-branch>" msgstr "git branch [<options>] (-m | -M) [<old-branch>] <new-branch>" -#: builtin/branch.c msgid "git branch [<options>] (-c | -C) [<old-branch>] <new-branch>" msgstr "git branch [<options>] (-c | -C) [<old-branch>] <new-branch>" -#: builtin/branch.c msgid "git branch [<options>] [-r | -a] [--points-at]" msgstr "git branch [<options>] [-r | -a] [--points-at]" -#: builtin/branch.c msgid "git branch [<options>] [-r | -a] [--format]" msgstr "git branch [<options>] [-r | -a] [--format]" -#: builtin/branch.c #, c-format msgid "" "deleting branch '%s' that has been merged to\n" @@ -3530,50 +2868,41 @@ msgstr "" "brainse '%s' a bhfuil cumasc orthu a scriosadh\n" " '%s', ach nÃor chumasc le HEAD go fóill" -#: builtin/branch.c #, c-format msgid "" "not deleting branch '%s' that is not yet merged to\n" " '%s', even though it is merged to HEAD" msgstr "" "gan brainse '%s' a scriosadh nach bhfuil cumasc fós leis\n" -" '%s', cé go ndéantar é a chumasc le HEAD" +" '%s', cé go ndéantar é a chumasc le HEAD" -#: builtin/branch.c #, c-format msgid "couldn't look up commit object for '%s'" msgstr "nà raibh in ann réad tiomanta a lorg suas le haghaidh '%s'" -#: builtin/branch.c #, c-format msgid "the branch '%s' is not fully merged" msgstr "nÃl an brainse '%s' cumaisc go hiomlán" -#: builtin/branch.c #, c-format msgid "If you are sure you want to delete it, run 'git branch -D %s'" msgstr "" "Má tá tú cinnte gur mhaith leat é a scriosadh, reáchtáil 'git branch -D %s'" -#: builtin/branch.c msgid "update of config-file failed" msgstr "theip ar nuashonrú comhad config-file" -#: builtin/branch.c msgid "cannot use -a with -d" msgstr "nà féidir -a a úsáid le -d" -#: builtin/branch.c #, c-format msgid "cannot delete branch '%s' used by worktree at '%s'" msgstr "nà féidir brainse '%s' a úsáideann crann oibre ag '%s' a scriosadh" -#: builtin/branch.c #, c-format msgid "remote-tracking branch '%s' not found" msgstr "nÃor aimsÃodh brainse cianrianaithe '%s'" -#: builtin/branch.c #, c-format msgid "" "branch '%s' not found.\n" @@ -3582,96 +2911,76 @@ msgstr "" "nÃor aimsÃodh brainse '%s'.\n" "Ar ndearna tú dearmad ar --remote?" -#: builtin/branch.c #, c-format msgid "branch '%s' not found" msgstr "nÃor aimsÃodh brainse '%s'" -#: builtin/branch.c #, c-format msgid "Deleted remote-tracking branch %s (was %s).\n" msgstr "Brainse cianrianaithe scriosta %s (bhà %s).\n" -#: builtin/branch.c #, c-format msgid "Deleted branch %s (was %s).\n" msgstr "Brainse %s scriosta (%s ba é).\n" -#: builtin/branch.c builtin/tag.c msgid "unable to parse format string" -msgstr "in ann teaghrán formáide a pháirseáil" +msgstr "nà féidir an teaghrán formáidithe a pharsáil" -#: builtin/branch.c msgid "could not resolve HEAD" msgstr "nà fhéadfaà HEAD a réiteach" -#: builtin/branch.c #, c-format msgid "HEAD (%s) points outside of refs/heads/" msgstr "Pointà HEAD (%s) lasmuigh de refs/heads/" -#: builtin/branch.c #, c-format msgid "branch %s is being rebased at %s" msgstr "tá brainse %s á athbhunú ag %s" -#: builtin/branch.c #, c-format msgid "branch %s is being bisected at %s" msgstr "tá brainse %s á dhÃscaoileadh ag %s" -#: builtin/branch.c #, c-format msgid "HEAD of working tree %s is not updated" msgstr "NÃl CEANN an chrainn oibre %s nuashonraithe" -#: builtin/branch.c #, c-format msgid "invalid branch name: '%s'" msgstr "ainm brainse neamhbhailÃ: '%s'" -#: builtin/branch.c #, c-format msgid "no commit on branch '%s' yet" msgstr "nÃl aon gealltanas ar bhrainse '%s' go fóill" -#: builtin/branch.c #, c-format msgid "no branch named '%s'" msgstr "nÃl aon bhrainse darb ainm '%s'" -#: builtin/branch.c msgid "branch rename failed" msgstr "theip ar athainmniú brainse" -#: builtin/branch.c msgid "branch copy failed" msgstr "theip ar chóip brainse" -#: builtin/branch.c #, c-format msgid "created a copy of a misnamed branch '%s'" msgstr "chruthaigh cóip de bhrainse mÃ-ainmnithe '%s'" -#: builtin/branch.c #, c-format msgid "renamed a misnamed branch '%s' away" msgstr "athainmnigh brainse mÃ-ainmnithe '%s' ar shiúl" -#: builtin/branch.c #, c-format msgid "branch renamed to %s, but HEAD is not updated" msgstr "athainmnÃodh brainse go %s, ach nÃl HEAD nuashonraithe" -#: builtin/branch.c msgid "branch is renamed, but update of config-file failed" msgstr "athainmnÃtear brainse, ach theip ar nuashonrú ar chomhad config-file" -#: builtin/branch.c msgid "branch is copied, but update of config-file failed" msgstr "cóipeáiltear brainse, ach theip ar nuashonrú comhad config-file" -#: builtin/branch.c #, c-format msgid "" "Please edit the description for the branch\n" @@ -3682,152 +2991,114 @@ msgstr "" " %s\n" "Déanfar lÃnte a thosaÃonn le '%s' a scriosadh.\n" -#: builtin/branch.c msgid "Generic options" msgstr "Roghanna cineálacha" -#: builtin/branch.c msgid "show hash and subject, give twice for upstream branch" msgstr "taispeáin hash agus ábhar, tabhair faoi dhó don bhrainse suas srutha" -#: builtin/branch.c msgid "suppress informational messages" msgstr "teachtaireachtaà faisnéise a chur" -#: builtin/branch.c builtin/checkout.c builtin/submodule--helper.c msgid "set branch tracking configuration" -msgstr "cumraÃocht rianaithe brainse a shoc" +msgstr "socraigh cumraÃocht rianaithe brainse" -#: builtin/branch.c msgid "do not use" msgstr "ná húsáid" -#: builtin/branch.c msgid "upstream" msgstr "suas sruth" -#: builtin/branch.c msgid "change the upstream info" msgstr "athraigh an fhaisnéis suas sruth" -#: builtin/branch.c msgid "unset the upstream info" msgstr "dÃshocraigh an fhaisnéis suas sruth" -#: builtin/branch.c msgid "use colored output" msgstr "úsáid aschur daite" -#: builtin/branch.c msgid "act on remote-tracking branches" msgstr "gnÃomhú ar bhrainsà cianrianaithe" -#: builtin/branch.c msgid "print only branches that contain the commit" msgstr "ach brainsà a phriontáil ina bhfuil an tiomantas" -#: builtin/branch.c msgid "print only branches that don't contain the commit" msgstr "ach brainsà a phriontáil nach bhfuil an tiomantas" -#: builtin/branch.c msgid "Specific git-branch actions:" msgstr "GnÃomhartha sonracha git-branch:" -#: builtin/branch.c msgid "list both remote-tracking and local branches" msgstr "liostáil brainsà cianrianaithe agus áitiúla araon" -#: builtin/branch.c msgid "delete fully merged branch" msgstr "scrios brainse lánchumaisc" -#: builtin/branch.c msgid "delete branch (even if not merged)" msgstr "brainse a scriosadh (fiú mura bhfuil sé cumasaithe)" -#: builtin/branch.c msgid "move/rename a branch and its reflog" msgstr "brainse a bhogadh/athainmniú agus a athainmniú" -#: builtin/branch.c msgid "move/rename a branch, even if target exists" msgstr "brainse a bhogadh/athainmniú, fiú má tá sprioc ann" -#: builtin/branch.c builtin/for-each-ref.c builtin/tag.c msgid "do not output a newline after empty formatted refs" msgstr "ná aschur lÃne nua tar éis aifeanna formáidithe folamh" -#: builtin/branch.c msgid "copy a branch and its reflog" msgstr "cóipeáil brainse agus a reflog" -#: builtin/branch.c msgid "copy a branch, even if target exists" msgstr "cóipeáil brainse, fiú má tá sprioc ann" -#: builtin/branch.c msgid "list branch names" msgstr "liosta ainmneacha brainse" -#: builtin/branch.c msgid "show current branch name" msgstr "taispeáin ainm brainse reatha" -#: builtin/branch.c builtin/submodule--helper.c msgid "create the branch's reflog" msgstr "athbhreithniú na brainse a chruthú" -#: builtin/branch.c msgid "edit the description for the branch" msgstr "cuir an tuairisc don bhrainse a chur in eagar" -#: builtin/branch.c msgid "force creation, move/rename, deletion" msgstr "cruthú fórsa, gluaise/athainmniú, scriosadh" -#: builtin/branch.c msgid "print only branches that are merged" msgstr "ach brainsà a chumasc a phriontáil" -#: builtin/branch.c msgid "print only branches that are not merged" msgstr "ach brainsà nach ndéantar cumasc a phriontáil" -#: builtin/branch.c msgid "list branches in columns" msgstr "liostáil brainsà i gcolúin" -#: builtin/branch.c builtin/for-each-ref.c builtin/notes.c builtin/tag.c msgid "object" msgstr "réad" -#: builtin/branch.c msgid "print only branches of the object" msgstr "ach brainsà den réad a phriontáil" -#: builtin/branch.c builtin/for-each-ref.c builtin/tag.c msgid "sorting and filtering are case insensitive" msgstr "tá sórtáil agus scagadh neamh-Ãogair ó thaobh cásanna de" -#: builtin/branch.c builtin/ls-files.c msgid "recurse through submodules" msgstr "athshlánú trà fho-mhodúil" -#: builtin/branch.c builtin/for-each-ref.c builtin/ls-files.c builtin/ls-tree.c -#: builtin/tag.c builtin/verify-tag.c msgid "format to use for the output" msgstr "formáid le húsáid don aschur" -#: builtin/branch.c msgid "failed to resolve HEAD as a valid ref" msgstr "theip ar HEAD a réiteach mar thagartha bailÃ" -#: builtin/branch.c builtin/clone.c msgid "HEAD not found below refs/heads!" msgstr "Nà fhaightear CEAD thÃos na refs/heads!" -#: builtin/branch.c msgid "" "branch with --recurse-submodules can only be used if " "submodule.propagateBranches is enabled" @@ -3835,43 +3106,33 @@ msgstr "" "nà féidir brainse le --recurse-submodules a úsáid ach amháin má tá " "submodule.propagateBranches cumasaithe" -#: builtin/branch.c msgid "--recurse-submodules can only be used to create branches" msgstr "Nà féidir --recurse-submodules a úsáid ach chun brainsà a chruthú" -#: builtin/branch.c msgid "branch name required" msgstr "ainm brainse ag teastáil" -#: builtin/branch.c msgid "cannot give description to detached HEAD" msgstr "nà féidir cur sÃos a thabhairt ar HEAD scoite" -#: builtin/branch.c msgid "cannot edit description of more than one branch" msgstr "nà féidir cur sÃos ar nÃos mó ná brainse amháin a chur in eagar" -#: builtin/branch.c msgid "cannot copy the current branch while not on any" msgstr "nà féidir leis an mbrainse reatha a chóipeáil cé nach bhfuil ar aon" -#: builtin/branch.c msgid "cannot rename the current branch while not on any" msgstr "nà féidir leis an mbrainse reatha a athainmniú cé nach bhfuil ar aon" -#: builtin/branch.c msgid "too many branches for a copy operation" msgstr "an iomarca brainsà le haghaidh oibrÃocht cóipeála" -#: builtin/branch.c msgid "too many arguments for a rename operation" msgstr "an iomarca argóintà maidir le hoibrÃocht athainmnithe" -#: builtin/branch.c msgid "too many arguments to set new upstream" msgstr "an iomarca argóintà chun suas an sruth nua a shocrú" -#: builtin/branch.c #, c-format msgid "" "could not set upstream of HEAD to %s when it does not point to any branch" @@ -3879,32 +3140,26 @@ msgstr "" "nà fhéadfaà suas sruth de HEAD a shocrú go %s nuair nach dtugann sé in iúl " "go dtà aon bhrainse" -#: builtin/branch.c #, c-format msgid "no such branch '%s'" msgstr "nÃl brainse den sórt sin '%s'" -#: builtin/branch.c #, c-format msgid "branch '%s' does not exist" msgstr "nÃl brainse '%s' ann" -#: builtin/branch.c msgid "too many arguments to unset upstream" msgstr "an iomarca argóintà le dÃshocrú suas an sruth" -#: builtin/branch.c msgid "could not unset upstream of HEAD when it does not point to any branch" msgstr "" "nà fhéadfaà a dhÃshuiteáil suas an sruth den HEAD nuair nach dtugann sé in " "iúl d'aon bhrainse" -#: builtin/branch.c #, c-format msgid "branch '%s' has no upstream information" msgstr "nÃl aon fhaisnéis suas sruth ag brainse '%s'" -#: builtin/branch.c msgid "" "the -a, and -r, options to 'git branch' do not take a branch name.\n" "Did you mean to use: -a|-r --list <pattern>?" @@ -3912,7 +3167,6 @@ msgstr "" "nà ghlacann na roghanna -a, agus -r, le 'git branch' ainm brainse.\n" "<pattern>An raibh sé i gceist agat úsáid a bhaint as: -a|-r --list?" -#: builtin/branch.c msgid "" "the '--set-upstream' option is no longer supported. Please use '--track' or " "'--set-upstream-to' instead" @@ -3920,33 +3174,27 @@ msgstr "" "nà thacaÃtear leis an rogha '--set-upstream' a thuilleadh. Úsáid '--track' " "nó '--set-upstream-to' ina ionad" -#: builtin/bugreport.c msgid "git version:\n" msgstr "leagan git:\n" -#: builtin/bugreport.c msgid "compiler info: " msgstr "eolas tiomsaitheora: " -#: builtin/bugreport.c msgid "libc info: " msgstr "eolas libc: " -#: builtin/bugreport.c msgid "not run from a git repository - no hooks to show\n" msgstr "gan rith ó stór git - gan aon chrúcaà le taispeáint\n" -#: builtin/bugreport.c msgid "" "git bugreport [(-o | --output-directory) <path>]\n" " [(-s | --suffix) <format> | --no-suffix]\n" " [--diagnose[=<mode>]]" msgstr "" -"<path>git bugreport [(-o | --output-directory)]\n" -" <format>[(-s | --iarmhÃr) | --no-iarmhÃr]\n" -" [--diagnóis [=<mode>]]" +"git bugreport [(-o | --output-directory) <path>]\n" +" [(-s | --suffix) <format> | --no-suffix]\n" +" [--diagnose[=<mode>]]" -#: builtin/bugreport.c msgid "" "Thank you for filling out a Git bug report!\n" "Please answer the following questions to help us understand your issue.\n" @@ -3983,169 +3231,131 @@ msgstr "" "Déan athbhreithniú ar an chuid eile den tuarascáil fabht thÃos.\n" "Is féidir leat aon lÃnte nach dteastaÃonn uait a roinnt a scriosadh.\n" -#: builtin/bugreport.c builtin/commit.c builtin/fast-export.c builtin/rebase.c -#: parse-options.h msgid "mode" msgstr "mód" -#: builtin/bugreport.c msgid "" "create an additional zip archive of detailed diagnostics (default 'stats')" msgstr "" "cruthú cartlann zip breise de dhiagnóiseach mionsonraithe ('stats' " "réamhshocraithe)" -#: builtin/bugreport.c msgid "specify a destination for the bugreport file(s)" msgstr "sonraigh ceann scrÃbe don chomhad (Ã) bugreport" -#: builtin/bugreport.c msgid "specify a strftime format suffix for the filename(s)" msgstr "sonraigh iarmhÃr formáid strftime don ainm (Ã) comhaid" -#: builtin/bugreport.c #, c-format msgid "unknown argument `%s'" msgstr "argóint anaithnid `%s'" -#: builtin/bugreport.c builtin/diagnose.c #, c-format msgid "could not create leading directories for '%s'" msgstr "nà fhéadfaà eolairà tosaigh a chruthú do '%s'" -#: builtin/bugreport.c builtin/diagnose.c #, c-format msgid "unable to create diagnostics archive %s" -msgstr "nach féidir cartlann diagnóiseach %s a chruthú" +msgstr "nà féidir cartlann diagnóisic %s a chruthú" -#: builtin/bugreport.c msgid "System Info" msgstr "Eolas Córais" -#: builtin/bugreport.c msgid "Enabled Hooks" msgstr "Crúcaà Cumasaithe" -#: builtin/bugreport.c #, c-format msgid "unable to write to %s" -msgstr "nach féidir a scrÃobh chuig %s" +msgstr "nà féidir scrÃobh chuig %s" -#: builtin/bugreport.c #, c-format msgid "Created new report at '%s'.\n" msgstr "CruthaÃodh tuarascáil nua ag '%s'.\n" -#: builtin/bundle.c msgid "" "git bundle create [-q | --quiet | --progress]\n" " [--version=<version>] <file> <git-rev-list-args>" msgstr "" -"cruthaigh bonn git [-q | --quiet | --progress]\n" -" <version>[--leagan =] <file><git-rev-list-args>" +"git bundle create [-q | --quiet | --progress]\n" +" [--version=<version>] <file> <git-rev-list-args>" -#: builtin/bundle.c msgid "git bundle verify [-q | --quiet] <file>" -msgstr "fÃorú beartán git [-q | --quiet] <file>" +msgstr "git bundle verify [-q | --quiet] <file>" -#: builtin/bundle.c msgid "git bundle list-heads <file> [<refname>...]" -msgstr "<refname>ceannairà liosta bonn git <file>[...]" +msgstr "git bundle list-heads <file> [<refname>...]" -#: builtin/bundle.c msgid "git bundle unbundle [--progress] <file> [<refname>...]" -msgstr "<refname>dÃbhuntáil bonn git [--progress] <file>[...]" +msgstr "git bundle unbundle [--progress] <file> [<refname>...]" -#: builtin/bundle.c msgid "need a <file> argument" msgstr "teastaÃonn ar <file>góint" -#: builtin/bundle.c builtin/pack-objects.c msgid "do not show progress meter" msgstr "ná taispeáin méadar dul chun cinn" -#: builtin/bundle.c builtin/pack-objects.c msgid "show progress meter" msgstr "taispeáin méadar dul chun cinn" -#: builtin/bundle.c msgid "historical; same as --progress" msgstr "stairiúil; mar an gcéanna le --progress" -#: builtin/bundle.c msgid "historical; does nothing" msgstr "stairiúil; nà dhéanann aon rud" -#: builtin/bundle.c msgid "specify bundle format version" msgstr "leagan formáid beartán a shonrú" -#: builtin/bundle.c msgid "Need a repository to create a bundle." msgstr "TeastaÃonn stór chun beartán a chruthú." -#: builtin/bundle.c msgid "do not show bundle details" msgstr "ná taispeáin sonraà beartán" -#: builtin/bundle.c bundle.c msgid "need a repository to verify a bundle" msgstr "teastaÃonn stór chun beartán a fhÃorú" -#: builtin/bundle.c #, c-format msgid "%s is okay\n" msgstr "%s ceart go leor\n" -#: builtin/bundle.c msgid "Need a repository to unbundle." msgstr "TeastaÃonn stór chun dÃcheangail a dhÃcheangal." -#: builtin/bundle.c msgid "Unbundling objects" msgstr "Rudaà a dhÃcheangal" -#: builtin/cat-file.c #, c-format msgid "cannot read object %s '%s'" msgstr "nà féidir réad %s '%s' a léamh" -#: builtin/cat-file.c msgid "flush is only for --buffer mode" msgstr "nÃl sruth ach le haghaidh mód --buffer" -#: builtin/cat-file.c msgid "empty command in input" msgstr "ordú folamh san ionchur" -#: builtin/cat-file.c #, c-format msgid "whitespace before command: '%s'" msgstr "spás bán roimh an ordú: '%s'" -#: builtin/cat-file.c #, c-format msgid "%s requires arguments" msgstr "TeastaÃonn argóintà %s" -#: builtin/cat-file.c #, c-format msgid "%s takes no arguments" msgstr "Nà ghlacann %s aon argóintÃ" -#: builtin/cat-file.c msgid "only one batch option may be specified" msgstr "nà féidir ach rogha baisc amháin a shonrú" -#: builtin/cat-file.c msgid "git cat-file <type> <object>" msgstr "git cat-file <type> <object>" -#: builtin/cat-file.c msgid "git cat-file (-e | -p | -t | -s) <object>" msgstr "git cat-file (-e | -p | -t | -s) <réad>" -#: builtin/cat-file.c msgid "" "git cat-file (--textconv | --filters)\n" " [<rev>:<path|tree-ish> | --path=<path|tree-ish> <rev>]" @@ -4153,7 +3363,6 @@ msgstr "" "git cat-file (--textconv | --filters)\n" " [<rev>:<path|tree-ish> | --path=<path|tree-ish> <rev>]" -#: builtin/cat-file.c msgid "" "git cat-file (--batch | --batch-check | --batch-command) [--batch-all-" "objects]\n" @@ -4165,82 +3374,63 @@ msgstr "" " [--buffer] [--follow-symlinks] [--unordered]\n" " [--textconv | --filters] [-Z]" -#: builtin/cat-file.c msgid "Check object existence or emit object contents" msgstr "Seiceáil go bhfuil réad ann nó astaigh ábhar réad" -#: builtin/cat-file.c msgid "check if <object> exists" msgstr "seiceáil an bhfuil <object> ann" -#: builtin/cat-file.c msgid "pretty-print <object> content" msgstr "<object> ábhar priontáil álainn" -#: builtin/cat-file.c msgid "Emit [broken] object attributes" msgstr "Easaigh tréithe réada [briste]" -#: builtin/cat-file.c msgid "show object type (one of 'blob', 'tree', 'commit', 'tag', ...)" msgstr "" "taispeáint cineál réad (ceann de 'blob', 'crann', 'tiomantas', 'tag',...)" -#: builtin/cat-file.c msgid "show object size" msgstr "taispeáin méid an réad" -#: builtin/cat-file.c builtin/log.c msgid "use mail map file" msgstr "úsáid comhad léarscáil rÃomhphoist" -#: builtin/cat-file.c msgid "Batch objects requested on stdin (or --batch-all-objects)" msgstr "Baisc rudaà a iarrtar ar stdin (nó --batch-all-objects)" -#: builtin/cat-file.c msgid "show full <object> or <rev> contents" msgstr "taispeáin iomlán <object>nó á <rev>bhar" -#: builtin/cat-file.c msgid "like --batch, but don't emit <contents>" msgstr "cosúil le --batch, ach ná astaÃonn <contents>" -#: builtin/cat-file.c msgid "stdin is NUL-terminated" msgstr "tá stdin foirceanta ag NUL" -#: builtin/cat-file.c msgid "stdin and stdout is NUL-terminated" msgstr "tá stdin agus stdout foirceannta NUL" -#: builtin/cat-file.c msgid "read commands from stdin" msgstr "léigh orduithe ó stdin" -#: builtin/cat-file.c msgid "with --batch[-check]: ignores stdin, batches all known objects" msgstr "" "le --batch [-check]: déanann neamhaird ar stdin, déanann baisceanna gach rud " "aitheanta" -#: builtin/cat-file.c msgid "Change or optimize batch output" msgstr "Athraigh nó barrfheabhsú aschur baisc" -#: builtin/cat-file.c msgid "buffer --batch output" msgstr "maolán --batch baisc" -#: builtin/cat-file.c msgid "follow in-tree symlinks" msgstr "lean naisc shiombailà in-chrann" -#: builtin/cat-file.c msgid "do not order objects before emitting them" msgstr "ná ordaigh rudaà sula n-astaÃonn tú iad" -#: builtin/cat-file.c msgid "" "Emit object (blob or tree) with conversion or filter (stand-alone, or with " "batch)" @@ -4248,70 +3438,55 @@ msgstr "" "Rud a astaÃonn (blob nó crann) le comhshó nó scagaire (neamhspleách, nó le " "baisc)" -#: builtin/cat-file.c msgid "run textconv on object's content" msgstr "reáchtáil textconv ar ábhar an réad" -#: builtin/cat-file.c msgid "run filters on object's content" msgstr "reáchtáil scagairà ar ábhar an rud" -#: builtin/cat-file.c msgid "blob|tree" msgstr "blob | crann" -#: builtin/cat-file.c msgid "use a <path> for (--textconv | --filters); Not with 'batch'" msgstr "úsáid a le <path>haghaidh (--textconv | --filters); Nà le 'baisc'" -#: builtin/cat-file.c msgid "objects filter only supported in batch mode" msgstr "nà thacaÃtear scagaire rudaà ach i mód baisc" -#: builtin/cat-file.c #, c-format msgid "objects filter not supported: '%s'" msgstr "nà thacaÃtear le scagaire réadanna: '%s'" -#: builtin/cat-file.c #, c-format msgid "'%s=<%s>' needs '%s' or '%s'" msgstr "'%s=<%s>' teastaÃonn '%s' nó '%s'" -#: builtin/cat-file.c msgid "path|tree-ish" msgstr "cosán | crann-ish" -#: builtin/cat-file.c #, c-format msgid "'%s' requires a batch mode" msgstr "ÉilÃonn '%s' modh baisc" -#: builtin/cat-file.c #, c-format msgid "'-%c' is incompatible with batch mode" msgstr "NÃl '-%c' comhoiriúnach le mód baisc" -#: builtin/cat-file.c msgid "batch modes take no arguments" msgstr "nà ghlacann modhanna baisc aon argóintÃ" -#: builtin/cat-file.c #, c-format msgid "<rev> required with '%s'" msgstr "<rev>ag teastáil le '%s'" -#: builtin/cat-file.c #, c-format msgid "<object> required with '-%c'" msgstr "<object>ag teastáil le '-%c'" -#: builtin/cat-file.c #, c-format msgid "only two arguments allowed in <type> <object> mode, not %d" msgstr "nà cheadaÃtear ach dhá argóint <type><object>sa mhodh, nà %d" -#: builtin/check-attr.c msgid "" "git check-attr [--source <tree-ish>] [-a | --all | <attr>...] [--] " "<pathname>..." @@ -4319,202 +3494,154 @@ msgstr "" "git check-attr [--source <tree-ish>] [-a | --all | <attr>...] [--] " "<pathname>..." -#: builtin/check-attr.c msgid "" "git check-attr --stdin [-z] [--source <tree-ish>] [-a | --all | <attr>...]" msgstr "" "git check-attr --stdin [-z] [--source <tree-ish>] [-a | --all | <attr>...]" -#: builtin/check-attr.c msgid "report all attributes set on file" msgstr "tuairisc a thabhairt ar gach tréithe atá leagtha sÃos" -#: builtin/check-attr.c msgid "use .gitattributes only from the index" msgstr "bain úsáid as .gitattributs ach ón innéacs" -#: builtin/check-attr.c builtin/check-ignore.c builtin/hash-object.c msgid "read file names from stdin" msgstr "léigh ainmneacha comhaid ó stdin" -#: builtin/check-attr.c builtin/check-ignore.c msgid "terminate input and output records by a NUL character" msgstr "taifid ionchuir agus aschuir a fhoirceannadh le carachtar NUL" -#: builtin/check-attr.c msgid "<tree-ish>" msgstr "<tree-ish>" -#: builtin/check-attr.c msgid "which tree-ish to check attributes at" msgstr "cén crainn le tréithe a sheiceáil ag" -#: builtin/check-ignore.c builtin/checkout.c builtin/gc.c builtin/worktree.c msgid "suppress progress reporting" msgstr "cur chun cinn tuairiscithe" -#: builtin/check-ignore.c msgid "show non-matching input paths" msgstr "cosáin ionchuir neamh-mheaitseála" -#: builtin/check-ignore.c msgid "ignore index when checking" msgstr "neamhaird a dhéanamh ar innéacs agus" -#: builtin/check-ignore.c msgid "cannot specify pathnames with --stdin" msgstr "nà féidir ainmneacha cosáin a shonrú le --stdin" -#: builtin/check-ignore.c msgid "-z only makes sense with --stdin" msgstr "Nà dhéanann -z ciall ach le --stdin" -#: builtin/check-ignore.c msgid "no path specified" msgstr "nÃl aon chosán sonraithe" -#: builtin/check-ignore.c msgid "--quiet is only valid with a single pathname" msgstr "NÃl --quiet bailà ach le ainm cosán amháin" -#: builtin/check-ignore.c msgid "cannot have both --quiet and --verbose" msgstr "nà féidir --quiet agus --verbose araon a bheith agat" -#: builtin/check-ignore.c msgid "--non-matching is only valid with --verbose" msgstr "NÃl --non-matching bailà ach le --verbose" -#: builtin/check-mailmap.c msgid "git check-mailmap [<options>] <contact>..." msgstr "git check-mailmap [<options>] <contact>..." -#: builtin/check-mailmap.c msgid "also read contacts from stdin" msgstr "léigh teagmhálacha ó stdin freisin" -#: builtin/check-mailmap.c msgid "read additional mailmap entries from file" msgstr "léigh iontrálacha rÃomhphoist breise ón gcomhad" -#: builtin/check-mailmap.c msgid "blob" msgstr "blob" -#: builtin/check-mailmap.c msgid "read additional mailmap entries from blob" msgstr "léigh iontrálacha rÃomhphoist breise ó blob" -#: builtin/check-mailmap.c msgid "no contacts specified" msgstr "aon teagmhálacha sonraithe" -#: builtin/checkout--worker.c msgid "git checkout--worker [<options>]" msgstr "git checkout--worker [<options>]" -#: builtin/checkout--worker.c builtin/checkout-index.c builtin/column.c -#: builtin/submodule--helper.c builtin/worktree.c msgid "string" msgstr "teaghrán" -#: builtin/checkout--worker.c builtin/checkout-index.c msgid "when creating files, prepend <string>" msgstr "agus comhaid á gcruthú agat, déan iarracht <string>" -#: builtin/checkout-index.c msgid "git checkout-index [<options>] [--] [<file>...]" msgstr "git checkout-index [<options>] [--] [<file>...]" -#: builtin/checkout-index.c msgid "stage should be between 1 and 3 or all" msgstr "ba chóir go mbeadh an chéim idir 1 agus 3 nó gach ceann" -#: builtin/checkout-index.c msgid "check out all files in the index" msgstr "seiceáil gach comhad san innéacs" -#: builtin/checkout-index.c msgid "do not skip files with skip-worktree set" msgstr "ná scipeáil comhaid le tacar scip-work tree" -#: builtin/checkout-index.c msgid "force overwrite of existing files" msgstr "athscrÃobh fórsa na gcomhaid atá ann cheana" -#: builtin/checkout-index.c msgid "no warning for existing files and files not in index" msgstr "" "gan aon rabhadh maidir le comhaid agus comhaid atá ann cheana nach bhfuil " "san innéacs" -#: builtin/checkout-index.c msgid "don't checkout new files" msgstr "ná seiceáil comhaid nua" -#: builtin/checkout-index.c msgid "update stat information in the index file" msgstr "faisnéis stat a nuashonrú sa chomhad innéacs" -#: builtin/checkout-index.c msgid "read list of paths from the standard input" msgstr "léigh liosta na gcosáin ón ionchur caighdeánach" -#: builtin/checkout-index.c msgid "write the content to temporary files" msgstr "scrÃobh an t-ábhar chuig comhaid sealadacha" -#: builtin/checkout-index.c msgid "copy out the files from named stage" msgstr "cóipeáil amach na comhaid ón gcéim ainmnithe" -#: builtin/checkout.c msgid "git checkout [<options>] <branch>" msgstr "git checkout [<roghanna>] <brainse>" -#: builtin/checkout.c msgid "git checkout [<options>] [<branch>] -- <file>..." msgstr "git checkout [<roghanna>] [<brainse>] --<comhad>..." -#: builtin/checkout.c msgid "git switch [<options>] [<branch>]" -msgstr "git switch [<roghanna>] [<brainse>]" +msgstr "git switch [<options>] [<branch>]" -#: builtin/checkout.c msgid "git restore [<options>] [--source=<branch>] <file>..." -msgstr "git restore [<roghanna>] [--source=<brainse>] <comhad>..." +msgstr "git restore [<options>] [--source=<branch>] <file>..." -#: builtin/checkout.c #, c-format msgid "path '%s' does not have our version" msgstr "nÃl ár leagan ag cosán '%s'" -#: builtin/checkout.c #, c-format msgid "path '%s' does not have their version" msgstr "nÃl a leagan ag cosán '%s'" -#: builtin/checkout.c #, c-format msgid "path '%s' does not have all necessary versions" msgstr "nÃl gach leagan riachtanach ag cosán '%s'" -#: builtin/checkout.c #, c-format msgid "path '%s' does not have necessary versions" msgstr "nÃl leaganacha riachtanacha ag cosán '%s'" -#: builtin/checkout.c #, c-format msgid "path '%s': cannot merge" msgstr "cosán '%s': nà féidir a chumasc" -#: builtin/checkout.c #, c-format msgid "Unable to add merge result for '%s'" msgstr "Nà féidir toradh cumaisc a chur le haghaidh '%s'" -#: builtin/checkout.c #, c-format msgid "Recreated %d merge conflict" msgid_plural "Recreated %d merge conflicts" @@ -4522,7 +3649,6 @@ msgstr[0] "AthchruthaÃodh %d coimhlint chumasc" msgstr[1] "AthchruthaÃodh %d coinbhleachtaà chumaisc" msgstr[2] "AthchruthaÃodh %d coinbhleachtaà chumaisc" -#: builtin/checkout.c #, c-format msgid "Updated %d path from %s" msgid_plural "Updated %d paths from %s" @@ -4530,7 +3656,6 @@ msgstr[0] "NuashonraÃodh %d cosán ó %s" msgstr[1] "NuashonraÃodh %d cosán ó %s" msgstr[2] "NuashonraÃodh %d cosán ó %s" -#: builtin/checkout.c #, c-format msgid "Updated %d path from the index" msgid_plural "Updated %d paths from the index" @@ -4538,54 +3663,43 @@ msgstr[0] "NuashonraÃodh %d cosán ón innéacs" msgstr[1] "NuashonraÃodh %d cosán ón innéacs" msgstr[2] "NuashonraÃodh %d cosán ón innéacs" -#: builtin/checkout.c #, c-format msgid "'%s' cannot be used with updating paths" msgstr "Nà féidir '%s' a úsáid le cosáin a nuashonrú" -#: builtin/checkout.c #, c-format msgid "Cannot update paths and switch to branch '%s' at the same time." msgstr "" "Nà féidir cosáin a nuashonrú agus aistriú go brainse '%s' ag an am céanna." -#: builtin/checkout.c #, c-format msgid "neither '%s' or '%s' is specified" msgstr "nÃl '%s' ná '%s' sonraithe" -#: builtin/checkout.c #, c-format msgid "'%s' must be used when '%s' is not specified" msgstr "Nà mór '%s' a úsáid nuair nach sonraÃtear '%s'" -#: builtin/checkout.c #, c-format msgid "'%s' or '%s' cannot be used with %s" msgstr "Nà féidir '%s' nó '%s' a úsáid le %s" -#: builtin/checkout.c #, c-format msgid "'%s', '%s', or '%s' cannot be used when checking out of a tree" msgstr "" "Nà féidir '%s', '%s', nó '%s' a úsáid agus tú ag seiceáil amach as crann" -#: builtin/checkout.c #, c-format msgid "path '%s' is unmerged" msgstr "tá cosán '%s' neamh-chomhcheangailte" -#: builtin/checkout.c builtin/grep.c builtin/merge-tree.c builtin/reset.c -#: merge-ort.c reset.c sequencer.c tree-walk.c #, c-format msgid "unable to read tree (%s)" -msgstr "nach féidir crann a léamh (%s)" +msgstr "nà féidir crann a léamh (%s)" -#: builtin/checkout.c msgid "you need to resolve your current index first" msgstr "nà mór duit d'innéacs reatha a réiteach ar dtús" -#: builtin/checkout.c #, c-format msgid "" "cannot continue with staged changes in the following files:\n" @@ -4594,50 +3708,40 @@ msgstr "" "nà féidir leanúint ar aghaidh le hathruithe céime sna comhaid seo a leanas:\n" "%s" -#: builtin/checkout.c #, c-format msgid "Can not do reflog for '%s': %s\n" msgstr "Nà féidir athbhreithniú a dhéanamh le haghaidh '%s': %s\n" -#: builtin/checkout.c msgid "HEAD is now at" msgstr "Tá HEAD anois ag" -#: builtin/checkout.c builtin/clone.c msgid "unable to update HEAD" -msgstr "in ann HEAD a nuashonrú" +msgstr "nà féidir HEAD a nuashonrú" -#: builtin/checkout.c #, c-format msgid "Reset branch '%s'\n" msgstr "Athshocraigh brainse '%s'\n" -#: builtin/checkout.c #, c-format msgid "Already on '%s'\n" msgstr "Ar '%s' cheana féin\n" -#: builtin/checkout.c #, c-format msgid "Switched to and reset branch '%s'\n" msgstr "Aistrigh agus athshocraigh brainse '%s'\n" -#: builtin/checkout.c #, c-format msgid "Switched to a new branch '%s'\n" msgstr "Aistrithe go brainse nua '%s'\n" -#: builtin/checkout.c #, c-format msgid "Switched to branch '%s'\n" msgstr "Aistrithe go brainse '%s'\n" -#: builtin/checkout.c #, c-format msgid " ... and %d more.\n" msgstr " ... agus %d nÃos mó.\n" -#: builtin/checkout.c #, c-format msgid "" "Warning: you are leaving %d commit behind, not connected to\n" @@ -4665,7 +3769,6 @@ msgstr[2] "" "\n" "%s\n" -#: builtin/checkout.c #, c-format msgid "" "If you want to keep it by creating a new branch, this may be a good time\n" @@ -4695,19 +3798,15 @@ msgstr[2] "" "\n" "git branch <ainm-brainse-nua> %s\n" -#: builtin/checkout.c msgid "internal error in revision walk" msgstr "earráid inmheánach i dsiúlóid" -#: builtin/checkout.c msgid "Previous HEAD position was" msgstr "Bhà post CEAD roimhe seo" -#: builtin/checkout.c msgid "You are on a branch yet to be born" msgstr "Tá tú ar bhrainse nach rugadh fós" -#: builtin/checkout.c #, c-format msgid "" "'%s' could be both a local file and a tracking branch.\n" @@ -4717,7 +3816,6 @@ msgstr "" "araon.\n" "Úsáid le do thoil -- (agus go roghnach --no-guess) chun a dhÃbhriú" -#: builtin/checkout.c 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" @@ -4740,58 +3838,47 @@ msgstr "" "iargúlta amháin, e.g. an iargúlta 'origin', smaoinigh ar shocrú\n" "checkout.defaultRemote=origin i do chumraÃocht." -#: builtin/checkout.c #, c-format msgid "'%s' matched multiple (%d) remote tracking branches" msgstr "Mheaitseáil '%s' roinnt (%d) brainsà rianaithe iargúlta" -#: builtin/checkout.c msgid "only one reference expected" msgstr "nÃl ach tagairt amháin ag súil leis" -#: builtin/checkout.c #, c-format msgid "only one reference expected, %d given." msgstr "nÃl ach tagairt amháin ag súil leis, %d tugtha." -#: builtin/checkout.c builtin/worktree.c #, c-format msgid "invalid reference: %s" msgstr "tagairt neamhbhailÃ: %s" -#: builtin/checkout.c #, c-format msgid "reference is not a tree: %s" msgstr "nà crann é tagairt: %s" -#: builtin/checkout.c #, c-format msgid "a branch is expected, got tag '%s'" msgstr "táthar ag súil le brainse, faightear tag '%s'" -#: builtin/checkout.c #, c-format msgid "a branch is expected, got remote branch '%s'" msgstr "táthar ag súil le brainse, fuair brainse iargúlta '%s'" -#: builtin/checkout.c #, c-format msgid "a branch is expected, got '%s'" msgstr "táthar ag súil le brainse, fuair '%s'" -#: builtin/checkout.c #, c-format msgid "a branch is expected, got commit '%s'" msgstr "táthar ag súil le brainse, fuair sé tiomantas '%s'" -#: builtin/checkout.c msgid "" "If you want to detach HEAD at the commit, try again with the --detach option." msgstr "" "Más mian leat HEAD a dhÃcheangal ag an tiomantas, déan iarracht arÃs leis an " "rogha --detach." -#: builtin/checkout.c msgid "" "cannot switch branch while merging\n" "Consider \"git merge --quit\" or \"git worktree add\"." @@ -4799,7 +3886,6 @@ msgstr "" "nà féidir brainse a athrú agus cumasc á dhéanamh\n" "Smaoinigh ar \"git merge --quit\" nó \"git worktree add\"." -#: builtin/checkout.c msgid "" "cannot switch branch in the middle of an am session\n" "Consider \"git am --quit\" or \"git worktree add\"." @@ -4807,7 +3893,6 @@ msgstr "" "nà féidir brainse a athrú i lár seisiún am\n" "Smaoinigh ar \"git am --quit\" nó \"git worktree add\"." -#: builtin/checkout.c msgid "" "cannot switch branch while rebasing\n" "Consider \"git rebase --quit\" or \"git worktree add\"." @@ -4815,7 +3900,6 @@ msgstr "" "nà féidir brainse a athrú agus athbhunú á dhéanamh\n" "Smaoinigh ar \"git rebase --quit\" nó \"git worktree add\"." -#: builtin/checkout.c msgid "" "cannot switch branch while cherry-picking\n" "Consider \"git cherry-pick --quit\" or \"git worktree add\"." @@ -4823,7 +3907,6 @@ msgstr "" "nà féidir brainse a athrú agus tú ag cherry-picking\n" "Smaoinigh ar \"git cherry-pick --quit\" nó \"git worktree add\"." -#: builtin/checkout.c msgid "" "cannot switch branch while reverting\n" "Consider \"git revert --quit\" or \"git worktree add\"." @@ -4831,132 +3914,103 @@ msgstr "" "nà féidir brainse a athrú agus aisiompú á dhéanamh\n" "Smaoinigh ar \"git revert --quit\" nó \"git worktree add\"." -#: builtin/checkout.c msgid "you are switching branch while bisecting" msgstr "tá tú ag athrú brainse agus tú ag déileáil" -#: builtin/checkout.c msgid "paths cannot be used with switching branches" msgstr "nà féidir cosáin a úsáid le brainsà a athrú" -#: builtin/checkout.c #, c-format msgid "'%s' cannot be used with switching branches" msgstr "Nà féidir '%s' a úsáid le brainsà a athrú" -#: builtin/checkout.c #, c-format msgid "'%s' needs the paths to check out" msgstr "TeastaÃonn '%s' na cosáin chun seiceáil" -#: builtin/checkout.c #, c-format msgid "'%s' cannot be used with '%s'" msgstr "Nà féidir '%s' a úsáid le '%s'" -#: builtin/checkout.c #, c-format msgid "'%s' cannot take <start-point>" msgstr "Nà féidir '%s' a ghlacadh <start-point>" -#: builtin/checkout.c #, c-format msgid "Cannot switch branch to a non-commit '%s'" msgstr "Nà féidir brainse a aistriú go '%s' neamh-thiomanta" -#: builtin/checkout.c msgid "missing branch or commit argument" msgstr "brainse ar iarraidh nó argóint a dhéanamh" -#: builtin/checkout.c #, c-format msgid "unknown conflict style '%s'" msgstr "stÃl choimhlinte anaithnid '%s'" -#: builtin/checkout.c msgid "perform a 3-way merge with the new branch" msgstr "cumasc 3 bhealach a dhéanamh leis an mbrainse nua" -#: builtin/checkout.c builtin/log.c builtin/range-diff.c parse-options.h msgid "style" msgstr "stÃl" -#: builtin/checkout.c msgid "conflict style (merge, diff3, or zdiff3)" msgstr "stÃl choimhlinte (cumaisc, diff3, nó zdiff3)" -#: builtin/checkout.c builtin/worktree.c msgid "detach HEAD at named commit" msgstr "dÃcheangail HEAD ag an tiomnú ainmnithe" -#: builtin/checkout.c msgid "force checkout (throw away local modifications)" msgstr "seiceáil fórsa (caith modhnuithe áitiúla)" -#: builtin/checkout.c msgid "new-branch" msgstr "brainse-nua" -#: builtin/checkout.c msgid "new unborn branch" msgstr "brainse nua gan breith" -#: builtin/checkout.c builtin/merge.c msgid "update ignored files (default)" msgstr "nuashonrú comhaid a dhéantar neamhaird orthu" -#: builtin/checkout.c msgid "do not check if another worktree is using this branch" msgstr "" "ná seiceáil an bhfuil crann oibre eile á úsáid ag baint úsáide as an " "mbrainse seo" -#: builtin/checkout.c msgid "checkout our version for unmerged files" msgstr "seiceáil ár leagan le haghaidh comhaid neamh-chumasaithe" -#: builtin/checkout.c msgid "checkout their version for unmerged files" msgstr "seiceáil a leagan le haghaidh comhaid neamh-chumasaithe" -#: builtin/checkout.c msgid "do not limit pathspecs to sparse entries only" msgstr "ná teorainn le speisiúintà cosáin le hiontrálacha neamhchoitianta" -#: builtin/checkout.c #, c-format msgid "options '-%c', '-%c', and '%s' cannot be used together" msgstr "nà féidir na roghanna '-%c', '-%c', agus '%s' a úsáid le chéile" -#: builtin/checkout.c msgid "--track needs a branch name" msgstr "--track tá ainm brainse ag teastáil" -#: builtin/checkout.c #, c-format msgid "missing branch name; try -%c" msgstr "ainm brainse ar iarraidh; iarracht -%c" -#: builtin/checkout.c #, c-format msgid "could not resolve %s" msgstr "nà fhéadfaà %s a réiteach" -#: builtin/checkout.c msgid "invalid path specification" -msgstr "sonraÃocht cosáin nebhail" +msgstr "sonraÃocht chosáin neamhbhailÃ" -#: builtin/checkout.c #, c-format msgid "'%s' is not a commit and a branch '%s' cannot be created from it" msgstr "Nà tiomantas é '%s' agus nà féidir brainse '%s' a chruthú uaidh" -#: builtin/checkout.c #, c-format msgid "git checkout: --detach does not take a path argument '%s'" msgstr "git checkout: --detach nà ghlacann argóint cosáin '%s'" -#: builtin/checkout.c msgid "" "git checkout: --ours/--theirs, --force and --merge are incompatible when\n" "checking out of the index." @@ -4964,118 +4018,91 @@ msgstr "" "git checkout: --ours/--theirs, --force agus --merge neamhoiriúnach nuair\n" "seiceáil amach as an innéacs." -#: builtin/checkout.c msgid "you must specify path(s) to restore" msgstr "nà mór duit cosáin(Ã) a shonrú chun athchóiriú" -#: builtin/checkout.c builtin/clone.c builtin/remote.c builtin/replay.c -#: builtin/submodule--helper.c builtin/worktree.c msgid "branch" msgstr "brainse" -#: builtin/checkout.c msgid "create and checkout a new branch" msgstr "brainse nua a chruthú agus a sheiceáil" -#: builtin/checkout.c msgid "create/reset and checkout a branch" msgstr "cruthaigh/athshocraigh agus seiceáil amach brainse" -#: builtin/checkout.c msgid "create reflog for new branch" msgstr "cruthú reflog do bhrainse nua" -#: builtin/checkout.c msgid "second guess 'git checkout <no-such-branch>' (default)" msgstr "an dara tuairim 'git check <no-such-branch>'(réamhshocraithe)" -#: builtin/checkout.c msgid "use overlay mode (default)" msgstr "úsáid modh forleagtha (réamhshocraithe)" -#: builtin/checkout.c msgid "create and switch to a new branch" msgstr "cruthú agus aistrigh go brainse nua" -#: builtin/checkout.c msgid "create/reset and switch to a branch" msgstr "cruthú/athshocraigh agus aistrigh go brainse" -#: builtin/checkout.c msgid "second guess 'git switch <no-such-branch>'" msgstr "buille faoi thuairim eile 'git switch <gan-bhrainse-den-sórt-sin>'" -#: builtin/checkout.c msgid "throw away local modifications" msgstr "modhnuithe áitiúla a chaitheamh" -#: builtin/checkout.c msgid "which tree-ish to checkout from" msgstr "cén crainn le seiceáil uaidh" -#: builtin/checkout.c msgid "restore the index" msgstr "an t-innéacs a chur ar ais" -#: builtin/checkout.c msgid "restore the working tree (default)" msgstr "an crann oibre a chur ar ais (réamhshocraithe)" -#: builtin/checkout.c msgid "ignore unmerged entries" msgstr "neamhaird a dhéanamh ar iontrálacha" -#: builtin/checkout.c msgid "use overlay mode" msgstr "úsáid modh forleagtha" -#: builtin/clean.c msgid "" "git clean [-d] [-f] [-i] [-n] [-q] [-e <pattern>] [-x | -X] [--] " "[<pathspec>...]" msgstr "" -"<pathspec>git glan [-d] [-f] [-i] [-n] [-q] [-e] [- <pattern>x | -X] [--] " -"[...]" +"git clean [-d] [-f] [-i] [-n] [-q] [-e <pattern>] [-x | -X] [--] " +"[<pathspec>...]" -#: builtin/clean.c #, c-format msgid "Removing %s\n" msgstr "Ag baint %s\n" -#: builtin/clean.c #, c-format msgid "Would remove %s\n" msgstr "Bainfeadh %s\n" -#: builtin/clean.c #, c-format msgid "Skipping repository %s\n" msgstr "Ag scipeáil an stóras %s\n" -#: builtin/clean.c #, c-format msgid "Would skip repository %s\n" msgstr "Scaipfeadh stóras %s\n" -#: builtin/clean.c midx.c #, c-format msgid "failed to remove %s" msgstr "theip ar %s a bhaint" -#: builtin/clean.c #, c-format msgid "could not lstat %s\n" msgstr "nà fhéadfaà lstat %s\n" -#: builtin/clean.c msgid "Refusing to remove current working directory\n" msgstr "Ag diúltú an t-eolaire oibre reatha a bhaint\n" -#: builtin/clean.c msgid "Would refuse to remove current working directory\n" msgstr "Dhiúltódh sé/sà an t-eolaire oibre reatha a bhaint\n" -#: builtin/clean.c #, c-format msgid "" "Prompt help:\n" @@ -5084,11 +4111,10 @@ msgid "" " - (empty) select nothing\n" msgstr "" "Cabhair pras:\n" -"1 - roghnaigh mÃr uimhrithe\n" -"foo - roghnaigh mÃr bunaithe ar réimÃr uathúil\n" -" - (folamh) roghnaigh aon rud\n" +"1 - roghnaigh mÃr uimhrithe\n" +"foo - roghnaigh mÃr bunaithe ar réimÃr uathúil\n" +" - (folamh) roghnaigh aon rud\n" -#: builtin/clean.c #, c-format msgid "" "Prompt help:\n" @@ -5101,40 +4127,34 @@ msgid "" " - (empty) finish selecting\n" msgstr "" "Cabhair pras:\n" -"1 - roghnaigh mÃr amháin\n" -"3-5 - roghnaigh raon earraÃ\n" +"1 - roghnaigh mÃr amháin\n" +"3-5 - roghnaigh raon earraÃ\n" "2-3,6-9 - roghnaigh raonta iolracha\n" -"foo - roghnaigh mÃr bunaithe ar réimÃr uathúil\n" -"-... - mÃreanna sonraithe a dhÃroghnú\n" -"* - roghnaigh gach earra\n" -" - (folamh) bailchrÃoch a roghnú\n" +"foo - roghnaigh mÃr bunaithe ar réimÃr uathúil\n" +"-... - mÃreanna sonraithe a dhÃroghnú\n" +"* - roghnaigh gach earra\n" +" - (folamh) bailchrÃoch a roghnú\n" -#: builtin/clean.c #, c-format msgid "Huh (%s)?\n" msgstr "Huh (%s)?\n" -#: builtin/clean.c #, c-format msgid "Input ignore patterns>> " msgstr "Patrúin neamhaird ionchuir >> " -#: builtin/clean.c #, c-format msgid "WARNING: Cannot find items matched by: %s" msgstr "RABHADH: Nà féidir mÃreanna a mheaitseáil le: %s a aimsiú" -#: builtin/clean.c msgid "Select items to delete" msgstr "Roghnaigh mÃreanna le scriosadh" #. TRANSLATORS: Make sure to keep [y/N] as is -#: builtin/clean.c #, c-format msgid "Remove %s [y/N]? " msgstr "Bain %s [y/N]? " -#: builtin/clean.c msgid "" "clean - start cleaning\n" "filter by pattern - exclude items from deletion\n" @@ -5144,129 +4164,104 @@ msgid "" "help - this screen\n" "? - help for prompt selection" msgstr "" -"glan - tosú ag glanadh\n" -"scagadh de réir patrún - eisiamh mÃreanna ó scriosadh\n" -"roghnaigh de réir uimhreacha - roghnaigh mÃreanna atá le scriosadh de réir\n" -"fiafraigh gach ceann - deimhnigh gach scriosadh (cosúil le “rm -iâ€)\n" -"scor - stop glanadh\n" -"cabhair - an scáileán seo\n" -"? - cabhair le haghaidh roghnú pras" +"glan - tosú ag glanadh\n" +"scagadh de réir patrún - eisiamh mÃreanna ó scriosadh\n" +"roghnaigh de réir uimhreacha - roghnaigh mÃreanna atá le scriosadh de " +"réir\n" +"fiafraigh gach ceann - deimhnigh gach scriosadh (cosúil le “rm " +"-iâ€)\n" +"scor - stop glanadh\n" +"cabhair - an scáileán seo\n" +"? - cabhair le haghaidh roghnú pras" -#: builtin/clean.c msgid "Would remove the following item:" msgid_plural "Would remove the following items:" msgstr[0] "Bhainfeadh sé an mhÃr seo a leanas:" msgstr[1] "Bainfà na mÃreanna seo a leanas:" msgstr[2] "Bainfà na mÃreanna seo a leanas:" -#: builtin/clean.c msgid "No more files to clean, exiting." msgstr "NÃl aon nÃos mó comhaid le glanadh, ag imeacht amach." -#: builtin/clean.c msgid "do not print names of files removed" msgstr "ná priontáil ainmneacha na gcomhaid a bhaintear" -#: builtin/clean.c msgid "force" msgstr "fórsa" -#: builtin/clean.c msgid "interactive cleaning" msgstr "glanadh idirghnÃ" -#: builtin/clean.c msgid "remove whole directories" msgstr "bain eolairà iomlána" -#: builtin/clean.c builtin/config.c builtin/describe.c builtin/grep.c -#: builtin/log.c builtin/ls-files.c builtin/name-rev.c builtin/pack-refs.c -#: builtin/show-ref.c ref-filter.h msgid "pattern" msgstr "patrún" -#: builtin/clean.c msgid "add <pattern> to ignore rules" msgstr "cuir leis <pattern>na rialacha a neamhaird" -#: builtin/clean.c msgid "remove ignored files, too" msgstr "bain comhaid a neamhaird orthu, freisin" -#: builtin/clean.c msgid "remove only ignored files" msgstr "bain ach comhaid a neamhaird orthu" -#: builtin/clean.c msgid "clean.requireForce is true and -f not given: refusing to clean" msgstr "tá clean.requireForce fÃor agus nà thugtar -f: diúltú glanadh" -#: builtin/clone.c #, c-format msgid "info: Could not add alternate for '%s': %s\n" msgstr "eolas: Nà féidir malartach a chur le haghaidh '%s': %s\n" -#: builtin/clone.c builtin/diff.c builtin/rm.c grep.c setup.c #, c-format msgid "failed to stat '%s'" msgstr "theip ar '%s' a stáil" -#: builtin/clone.c #, c-format msgid "%s exists and is not a directory" msgstr "Tá %s ann agus nà eolaire é" -#: builtin/clone.c #, c-format msgid "'%s' is a symlink, refusing to clone with --local" msgstr "Is nasc comhsheasmhach é '%s', ag diúltú clónú le --local" -#: builtin/clone.c #, c-format msgid "failed to start iterator over '%s'" msgstr "theip ar an iterator a thosú thar '%s'" -#: builtin/clone.c #, c-format msgid "symlink '%s' exists, refusing to clone with --local" msgstr "tá nasc symlink '%s' ann, ag diúltú clónú le --local" -#: builtin/clone.c compat/precompose_utf8.c #, c-format msgid "failed to unlink '%s'" msgstr "theip ar '%s' a dhÃnascadh" -#: builtin/clone.c #, c-format msgid "hardlink cannot be checked at '%s'" msgstr "nà féidir crua-nasc a sheiceáil ag '%s'" -#: builtin/clone.c #, c-format msgid "hardlink different from source at '%s'" msgstr "crua-nasc difriúil ó fhoinse ag '%s'" -#: builtin/clone.c #, c-format msgid "failed to create link '%s'" msgstr "theip ar nasc '%s' a chruthú" -#: builtin/clone.c #, c-format msgid "failed to copy file to '%s'" msgstr "theip ar chomhad a chóipeáil chuig '%s'" -#: builtin/clone.c refs/files-backend.c #, c-format msgid "failed to iterate over '%s'" msgstr "theip ar athrá thar '%s'" -#: builtin/clone.c #, c-format msgid "done.\n" msgstr "déanta.\n" -#: builtin/clone.c msgid "" "Clone succeeded, but checkout failed.\n" "You can inspect what was checked out with 'git status'\n" @@ -5277,393 +4272,300 @@ msgstr "" "status'\n" "agus déan iarracht arÃs le 'git restore --source=HEAD : /'\n" -#: builtin/clone.c fetch-pack.c msgid "remote did not send all necessary objects" msgstr "nÃor sheol iargúlta gach rud riachtanach" -#: builtin/clone.c #, c-format msgid "unable to update %s" -msgstr "nach féidir %s a nuashonrú" +msgstr "nà féidir %s a nuashonrú" -#: builtin/clone.c msgid "failed to initialize sparse-checkout" msgstr "theip ar sheiceáil éagsúil a thosú" -#: builtin/clone.c msgid "remote HEAD refers to nonexistent ref, unable to checkout" msgstr "" "tagraÃonn iargúlta HEAD do thagartha nach bhfuil ann, nach féidir a sheiceáil" -#: builtin/clone.c msgid "unable to checkout working tree" -msgstr "in ann crann oibre a sheiceáil" +msgstr "nà féidir crann oibre a sheiceáil amach" -#: builtin/clone.c msgid "unable to write parameters to config file" -msgstr "in ann paraiméadair a scrÃobh chuig comhad cumraithe" +msgstr "nà féidir paraiméadair a scrÃobh chuig an gcomhad cumraÃochta" -#: builtin/clone.c msgid "cannot repack to clean up" msgstr "nà féidir athphacáil chun glanadh" -#: builtin/clone.c msgid "cannot unlink temporary alternates file" msgstr "nà féidir le comhad malartacha sealadacha a dhÃnascadh" -#: builtin/clone.c msgid "don't clone shallow repository" msgstr "ná clóin stór éadomhain" -#: builtin/clone.c msgid "don't create a checkout" msgstr "ná cruthaigh seiceáil" -#: builtin/clone.c builtin/init-db.c msgid "create a bare repository" msgstr "stóras lom a chruthú" -#: builtin/clone.c msgid "create a mirror repository (implies --bare)" msgstr "stóras scátháin a chruthú (tugann le tuiscint --bare)" -#: builtin/clone.c msgid "to clone from a local repository" msgstr "a chlónú ó stór áitiúil" -#: builtin/clone.c msgid "don't use local hardlinks, always copy" msgstr "ná húsáid crua-naisc áitiúla, cóipeáil i gcónaÃ" -#: builtin/clone.c msgid "setup as shared repository" msgstr "socrú mar stór roinnte" -#: builtin/clone.c msgid "pathspec" msgstr "sonraÃocht chosáin" -#: builtin/clone.c msgid "initialize submodules in the clone" msgstr "fo-mhodúil a thionscnamh sa chlón" -#: builtin/clone.c msgid "number of submodules cloned in parallel" msgstr "lÃon na bhfo-mhodúil atá clónaithe go comhthreomhar" -#: builtin/clone.c builtin/init-db.c msgid "template-directory" msgstr "eolaire teimpléad" -#: builtin/clone.c builtin/init-db.c msgid "directory from which templates will be used" msgstr "eolaire as a n-úsáidfear teimpléid" -#: builtin/clone.c builtin/submodule--helper.c msgid "reference repository" msgstr "stór tagartha" -#: builtin/clone.c builtin/submodule--helper.c msgid "use --reference only while cloning" msgstr "bain úsáid as --reference amháin agus tú ag clónú" -#: builtin/clone.c builtin/column.c builtin/fmt-merge-msg.c builtin/init-db.c -#: builtin/merge-file.c builtin/merge.c builtin/pack-objects.c builtin/repack.c -#: builtin/submodule--helper.c t/helper/test-simple-ipc.c msgid "name" msgstr "ainm" -#: builtin/clone.c msgid "use <name> instead of 'origin' to track upstream" msgstr "úsáid in <name> ionad 'origin' chun suas an sruth a rianú" -#: builtin/clone.c msgid "checkout <branch> instead of the remote's HEAD" msgstr "seiceáil <brainse> in ionad CEAD an iargúlta" -#: builtin/clone.c msgid "clone single revision <rev> and check out" msgstr "clónáil athbhreithniú aonair <rev> agus seiceáil amach" -#: builtin/clone.c msgid "path to git-upload-pack on the remote" msgstr "cosán chuig git-upload-pack ar an gcianrialtán" -#: builtin/clone.c builtin/fetch.c builtin/pull.c msgid "depth" msgstr "doimhneacht" -#: builtin/clone.c msgid "create a shallow clone of that depth" msgstr "clón éadomhain den doimhneacht sin a chruthú" -#: builtin/clone.c msgid "create a shallow clone since a specific time" msgstr "clón éadrom a chruthú ó am ar leith" -#: builtin/clone.c builtin/fetch.c builtin/pull.c msgid "ref" msgstr "tagairt" -#: builtin/clone.c builtin/fetch.c builtin/pull.c msgid "deepen history of shallow clone, excluding ref" msgstr "stair an chlóin éadomhain a dhoimhniú, gan tagairt" -#: builtin/clone.c builtin/submodule--helper.c msgid "clone only one branch, HEAD or --branch" msgstr "clóin ach brainse amháin, HEAD nó --branch" -#: builtin/clone.c msgid "clone tags, and make later fetches not to follow them" msgstr "clibeanna clóin, agus tógáil nÃos déanaà a dhéanamh gan iad a leanúint" -#: builtin/clone.c msgid "any cloned submodules will be shallow" msgstr "beidh aon fho-mhodúil clónaithe éadrom" -#: builtin/clone.c builtin/init-db.c msgid "gitdir" msgstr "gitdir" -#: builtin/clone.c builtin/init-db.c msgid "separate git dir from working tree" msgstr "git dir ar leithligh ó chrann oibre" -#: builtin/clone.c builtin/init-db.c builtin/submodule--helper.c msgid "specify the reference format to use" msgstr "sonraigh an fhormáid tagartha le húsáid" -#: builtin/clone.c msgid "key=value" msgstr "eochair=luach" -#: builtin/clone.c msgid "set config inside the new repository" msgstr "socraigh cumraÃocht taobh istigh den stór nua" -#: builtin/clone.c builtin/fetch.c builtin/ls-remote.c builtin/pull.c -#: builtin/push.c builtin/send-pack.c msgid "server-specific" msgstr "freastalaÃ-shonrach" -#: builtin/clone.c builtin/fetch.c builtin/ls-remote.c builtin/pull.c -#: builtin/push.c builtin/send-pack.c msgid "option to transmit" msgstr "rogha a tharchur" -#: builtin/clone.c msgid "apply partial clone filters to submodules" msgstr "cuir scagairà clóin páirteacha i bhfeidhm" -#: builtin/clone.c msgid "any cloned submodules will use their remote-tracking branch" msgstr "úsáidfidh aon fho-mhodúil clónaithe a mbrainse cianrianaithe" -#: builtin/clone.c msgid "initialize sparse-checkout file to include only files at root" msgstr "" "comhad seiceála neamhchoitianta a thosú chun comhaid amháin a áireamh ag " "fréamh" -#: builtin/clone.c msgid "uri" msgstr "uri" -#: builtin/clone.c msgid "a URI for downloading bundles before fetching from origin remote" msgstr "" "a URI chun cuachtaà a Ãoslódáil sula n-iarrtar iad ó chianchéim tionscnaimh" -#: builtin/clone.c msgid "git clone [<options>] [--] <repo> [<dir>]" msgstr "git clone [<roghanna>] [--] <stóras>[<eolaire>]" -#: builtin/clone.c msgid "Too many arguments." msgstr "An iomarca argóintÃ." -#: builtin/clone.c scalar.c msgid "You must specify a repository to clone." msgstr "Nà mór duit stór a shonrú le clónú." -#: builtin/clone.c builtin/init-db.c builtin/refs.c builtin/submodule--helper.c -#: setup.c #, c-format msgid "unknown ref storage format '%s'" msgstr "formáid stórála tagartha anaithnid '%s'" -#: builtin/clone.c #, c-format msgid "repository '%s' does not exist" msgstr "nÃl an stóras '%s' ann" -#: builtin/clone.c builtin/fetch.c #, c-format msgid "depth %s is not a positive number" msgstr "nà uimhir dhearfach é doimhneacht %s" -#: builtin/clone.c #, c-format msgid "destination path '%s' already exists and is not an empty directory." msgstr "tá cosán ceann scrÃbe '%s' ann cheana féin agus nà eolaire folamh é." -#: builtin/clone.c #, c-format msgid "repository path '%s' already exists and is not an empty directory." msgstr "tá cosán stórais '%s' ann cheana féin agus nà eolaire folamh é." -#: builtin/clone.c #, c-format msgid "working tree '%s' already exists." msgstr "tá crann oibre '%s' ann cheana féin." -#: builtin/clone.c builtin/difftool.c builtin/log.c builtin/worktree.c #, c-format msgid "could not create leading directories of '%s'" msgstr "nà fhéadfaà eolairà tosaigh de '%s' a chruthú" -#: builtin/clone.c #, c-format msgid "could not create work tree dir '%s'" msgstr "nà fhéadfaà crann oibre a chruthú dir '%s'" -#: builtin/clone.c #, c-format msgid "Cloning into bare repository '%s'...\n" msgstr "Clónáil isteach i stóras lom '%s'...\n" -#: builtin/clone.c #, c-format msgid "Cloning into '%s'...\n" msgstr "Clónáil isteach '%s'...\n" -#: builtin/clone.c msgid "" "clone --recursive is not compatible with both --reference and --reference-if-" "able" msgstr "" "nÃl clón --recursive comhoiriúnach le --reference agus --reference-if-able" -#: builtin/clone.c builtin/remote.c #, c-format msgid "'%s' is not a valid remote name" msgstr "Nà ainm iargúlta bailà é '%s'" -#: builtin/clone.c msgid "--depth is ignored in local clones; use file:// instead." msgstr "" "--depth déantar neamhaird de i gclóin áitiúla; bain úsáid as comhad:// ina " "ionad." -#: builtin/clone.c msgid "--shallow-since is ignored in local clones; use file:// instead." msgstr "" "--shallow-since déantar neamhaird de i gclóin áitiúla; bain úsáid as file:// " "ina ionad." -#: builtin/clone.c msgid "--shallow-exclude is ignored in local clones; use file:// instead." msgstr "" "--shallow-exclude déantar neamhaird de i gclóin áitiúla; bain úsáid as " "file:// ina ionad." -#: builtin/clone.c msgid "--filter is ignored in local clones; use file:// instead." msgstr "" "--filter déantar neamhaird de i gclóin áitiúla; bain úsáid as file:// ina " "ionad." -#: builtin/clone.c fetch-pack.c msgid "source repository is shallow, reject to clone." msgstr "tá stóras foinse éadrom, diúltaigh clóin." -#: builtin/clone.c msgid "source repository is shallow, ignoring --local" msgstr "tá stóras foinse éadrom, ag neamhaird a dhéanamh ar --local" -#: builtin/clone.c msgid "--local is ignored" msgstr "--local déantar neamhaird de" -#: builtin/clone.c msgid "cannot clone from filtered bundle" msgstr "nà féidir clónú ó bhearta scagtha" -#: builtin/clone.c msgid "failed to initialize the repo, skipping bundle URI" msgstr "theip ar an repo a thionscnamh, ag scipeáil URI beartán" -#: builtin/clone.c #, c-format msgid "failed to fetch objects from bundle URI '%s'" msgstr "theip ar rudaà a fháil ó URI '%s'" -#: builtin/clone.c msgid "failed to fetch advertised bundles" msgstr "theip orthu beartáin fógraithe a fháil" -#: builtin/clone.c msgid "remote transport reported error" msgstr "earráid tuairiscithe ar iompar" -#: builtin/clone.c #, c-format msgid "Remote branch %s not found in upstream %s" msgstr "NÃor aimsÃodh brainse iargúlta %s i suas sruth %s" -#: builtin/clone.c #, c-format msgid "Remote revision %s not found in upstream %s" msgstr "Nà aimsÃodh athbhreithniú iargúlta %s i suas sruth %s" -#: builtin/clone.c msgid "You appear to have cloned an empty repository." msgstr "Is cosúil gur chlónaigh tú stór folamh." -#: builtin/column.c msgid "git column [<options>]" -msgstr "colún git [<options>]" +msgstr "git column [<options>]" -#: builtin/column.c msgid "lookup config vars" msgstr "earraà cumraÃochta cuardaigh" -#: builtin/column.c msgid "layout to use" msgstr "leagan amach le húsáid" -#: builtin/column.c msgid "maximum width" msgstr "leithead uasta" -#: builtin/column.c msgid "padding space on left border" msgstr "spás padding ar an teorainn chlé" -#: builtin/column.c msgid "padding space on right border" msgstr "spás padding ar an teorainn dheis" -#: builtin/column.c msgid "padding space between columns" msgstr "spás padding idir colúin" -#: builtin/column.c #, c-format msgid "%s must be non-negative" msgstr "Caithfidh %s a bheith neamh-diúltach" -#: builtin/column.c msgid "--command must be the first argument" msgstr "Nà mór gurb é --command an chéad argóint" -#: builtin/commit-graph.c msgid "" "git commit-graph verify [--object-dir <dir>] [--shallow] [--[no-]progress]" msgstr "" "git commit-graph verify [--object-dir <dir>] [--shallow] [--[no-]progress]" -#: builtin/commit-graph.c msgid "" "git commit-graph write [--object-dir <dir>] [--append]\n" " [--split[=<strategy>]] [--reachable | --stdin-packs | " @@ -5679,168 +4581,129 @@ msgstr "" "[no-]progress]\n" " <split-options>" -#: builtin/commit-graph.c builtin/fetch.c builtin/gc.c builtin/log.c -#: builtin/repack.c msgid "dir" msgstr "redir" -#: builtin/commit-graph.c msgid "the object directory to store the graph" msgstr "an eolaire réada chun an graf a stóráil" -#: builtin/commit-graph.c msgid "if the commit-graph is split, only verify the tip file" msgstr "má tá an graf coimite scoilte, nà fhÃoraigh ach an comhad leid" -#: builtin/commit-graph.c #, c-format msgid "Could not open commit-graph '%s'" msgstr "NÃor féidir graf coimisiúnaithe '%s' a oscailt" -#: builtin/commit-graph.c #, c-format msgid "could not open commit-graph chain '%s'" msgstr "nà fhéadfaà slabhra coimisi-graf '%s' a oscailt" -#: builtin/commit-graph.c #, c-format msgid "unrecognized --split argument, %s" msgstr "argóint --split gan aithint, %s" -#: builtin/commit-graph.c #, c-format msgid "unexpected non-hex object ID: %s" msgstr "id réada neamh-heicsidheachúlach gan choinne: %s" -#: builtin/commit-graph.c #, c-format msgid "invalid object: %s" msgstr "réad neamhbhailÃ: %s" -#: builtin/commit-graph.c parse-options-cb.c #, c-format msgid "option `%s' expects a numerical value" msgstr "tá rogha `%s' ag súil le luach uimhriúil" -#: builtin/commit-graph.c msgid "start walk at all refs" msgstr "tosú ag siúl ag gach ceann" -#: builtin/commit-graph.c msgid "scan pack-indexes listed by stdin for commits" msgstr "" "scanadh innéacsanna pacáiste atá liostaithe ag stdin le haghaidh gealltanais" -#: builtin/commit-graph.c msgid "start walk at commits listed by stdin" msgstr "tosú ag siúl ag gealltanais atá liostaithe ag stdin" -#: builtin/commit-graph.c msgid "include all commits already in the commit-graph file" msgstr "" "áireamh na gealltanais go léir cheana féin sa chomhad gráf coimisiúnaithe" -#: builtin/commit-graph.c msgid "enable computation for changed paths" msgstr "rÃomh a chumasú le haghaidh cosáin athraithe" -#: builtin/commit-graph.c msgid "allow writing an incremental commit-graph file" msgstr "ligean comhad gráf choimisiúnaithe a scrÃobh" -#: builtin/commit-graph.c msgid "maximum number of commits in a non-base split commit-graph" msgstr "uaslÃon na ngealltanais i ngráf coiste scoilte neamh-bhonn" -#: builtin/commit-graph.c msgid "maximum ratio between two levels of a split commit-graph" msgstr "cóimheas uasta idir dhá leibhéal de ghraf coimiste scoilte" -#: builtin/commit-graph.c msgid "only expire files older than a given date-time" msgstr "nà rachaidh in éag ach comhaid nÃos sine ná dáta-am ar leith" -#: builtin/commit-graph.c msgid "maximum number of changed-path Bloom filters to compute" msgstr "lÃon uasta scagairà Bloom cosáin athraithe le rÃomh" -#: builtin/commit-graph.c msgid "use at most one of --reachable, --stdin-commits, or --stdin-packs" msgstr "" "bain úsáid as ceann de --reachable, --stdin-commits, nó --stdin-packs ar a " "mhéad" -#: builtin/commit-graph.c msgid "Collecting commits from input" msgstr "Gealltanais a bhailiú ó ionchur" -#: builtin/commit-tree.c msgid "git commit-tree <tree> [(-p <parent>)...]" -msgstr "<parent>git commit-tree <tree>[(-p)...]" +msgstr "git commit-tree <tree> [(-p <parent>)...]" -#: builtin/commit-tree.c msgid "" "git commit-tree [(-p <parent>)...] [-S[<keyid>]] [(-m <message>)...]\n" " [(-F <file>)...] <tree>" msgstr "" -"<parent>git commit-tree [(-p)...] [-S [<keyid>]] [(-m<message>)...]\n" -" [(-F<file>)...] <tree>" +"git commit-tree [(-p <parent>)...] [-S[<keyid>]] [(-m <message>)...]\n" +" [(-F <file>)...] <tree>" -#: builtin/commit-tree.c #, c-format msgid "duplicate parent %s ignored" msgstr "neamhaird déanta ar thuismitheoir dúblach %s" -#: builtin/commit-tree.c builtin/log.c #, c-format msgid "not a valid object name %s" msgstr "nà ainm réad bailà %s" -#: builtin/commit-tree.c #, c-format msgid "git commit-tree: failed to read '%s'" msgstr "git commit-tree: theip ar '%s' a léamh" -#: builtin/commit-tree.c #, c-format msgid "git commit-tree: failed to close '%s'" msgstr "git commit-tree: theip ar '%s' a dhúnadh" -#: builtin/commit-tree.c msgid "parent" msgstr "tuismitheoir" -#: builtin/commit-tree.c msgid "id of a parent commit object" msgstr "id réad tiomanta tuismitheora" -#: builtin/commit-tree.c builtin/commit.c builtin/merge.c builtin/notes.c -#: builtin/stash.c builtin/tag.c msgid "message" msgstr "teachtaireacht" -#: builtin/commit-tree.c builtin/commit.c msgid "commit message" msgstr "teachtaireacht a thabhairt" -#: builtin/commit-tree.c msgid "read commit log message from file" msgstr "léigh teachtaireacht logála tiomanta ón gcomhad" -#: builtin/commit-tree.c builtin/commit.c builtin/merge.c builtin/pull.c -#: builtin/revert.c msgid "GPG sign commit" msgstr "Tiomantas comhartha GPG" -#: builtin/commit-tree.c msgid "must give exactly one tree" msgstr "caithfidh crann amháin a thabhairt go dÃreach" -#: builtin/commit-tree.c msgid "git commit-tree: failed to read" msgstr "git commit-tree: theip ar léamh" -#: builtin/commit.c msgid "" "git commit [-a | --interactive | --patch] [-s] [-v] [-u[<mode>]] [--amend]\n" " [--dry-run] [(-c | -C | --squash) <commit> | --fixup [(amend|" @@ -5862,11 +4725,9 @@ msgstr "" " [(--trailer <token>[(=|:)<value>])...] [-S[<keyid>]]\n" " [--] [<pathspec>...]" -#: builtin/commit.c msgid "git status [<options>] [--] [<pathspec>...]" -msgstr "stádas git [<options>] [--] [<pathspec>...]" +msgstr "git status [<options>] [--] [<pathspec>...]" -#: builtin/commit.c msgid "" "You asked to amend the most recent commit, but doing so would make\n" "it empty. You can repeat your command with --allow-empty, or you can\n" @@ -5877,7 +4738,6 @@ msgstr "" "leat\n" "bain an tiomantas go hiomlán le “git reset HEAD^â€.\n" -#: builtin/commit.c msgid "" "The previous cherry-pick is now empty, possibly due to conflict resolution.\n" "If you wish to commit it anyway, use:\n" @@ -5892,15 +4752,12 @@ msgstr "" " git commit --allow-empty\n" "\n" -#: builtin/commit.c msgid "Otherwise, please use 'git rebase --skip'\n" msgstr "Seachas sin, bain úsáid as 'git rebase --skip'\n" -#: builtin/commit.c msgid "Otherwise, please use 'git cherry-pick --skip'\n" msgstr "Seachas sin, bain úsáid as 'git cherry-pick --skip'\n" -#: builtin/commit.c msgid "" "and then use:\n" "\n" @@ -5921,123 +4778,96 @@ msgstr "" "\n" " git cherry-pick --skip\n" -#: builtin/commit.c read-cache.c msgid "updating files failed" msgstr "theip ar nuashonrú comhaid" -#: builtin/commit.c msgid "failed to unpack HEAD tree object" msgstr "theip orthu réad crann HEAD a dhÃphacáil" -#: builtin/commit.c msgid "No paths with --include/--only does not make sense." msgstr "NÃl ciall ag aon chosáin le --include/--only." -#: builtin/commit.c msgid "unable to create temporary index" -msgstr "in ann innéacs sealadach a chruthú" +msgstr "nà féidir innéacs sealadach a chruthú" -#: builtin/commit.c msgid "interactive add failed" msgstr "theip ar chur idirghnÃomh" -#: builtin/commit.c msgid "unable to update temporary index" -msgstr "in ann innéacs sealadach a nuashonrú" +msgstr "nà féidir an t-innéacs sealadach a nuashonrú" -#: builtin/commit.c msgid "Failed to update main cache tree" msgstr "Theip ar phrÃomhchrann taisce a nuashonrú" -#: builtin/commit.c msgid "cannot do a partial commit during a merge." msgstr "nà féidir le tiomantas páirteach a dhéanamh le linn cumaisc." -#: builtin/commit.c msgid "cannot do a partial commit during a cherry-pick." msgstr "nà féidir le tiomantas páirteach a dhéanamh le linn pioc silÃnÃ." -#: builtin/commit.c msgid "cannot do a partial commit during a rebase." msgstr "nà féidir le tiomantas páirteach a dhéanamh le linn athbhunaithe." -#: builtin/commit.c msgid "cannot read the index" msgstr "nà féidir leis an innéacs a léamh" -#: builtin/commit.c msgid "unable to write temporary index file" -msgstr "in ann comhad innéacs sealadach a scrÃobh" +msgstr "nà féidir comhad innéacs sealadach a scrÃobh" -#: builtin/commit.c #, c-format msgid "commit '%s' lacks author header" msgstr "nÃl ceannteideal údair ag comhoiriú '%s'" -#: builtin/commit.c #, c-format msgid "commit '%s' has malformed author line" msgstr "comtal tá lÃne údair mÃfhoirmithe ag '%s'" -#: builtin/commit.c msgid "malformed --author parameter" msgstr "paraiméadar --author mÃfhoirmithe" -#: builtin/commit.c ident.c #, c-format msgid "invalid date format: %s" msgstr "formáid dáta neamhbhailÃ: %s" -#: builtin/commit.c msgid "" "unable to select a comment character that is not used\n" "in the current commit message" msgstr "" -"nach féidir carachtar tráchta a roghnú nach n-úsáidtear\n" -"sa teachtaireacht tiomanta reatha" +"nà féidir carachtar tráchta nach bhfuil in úsáid \n" +"sa teachtaireacht tiomantais reatha a roghnú" -#: builtin/commit.c #, c-format msgid "could not lookup commit '%s'" msgstr "nà fhéadfaà cuardach a dhéanamh ar '%s'" -#: builtin/commit.c builtin/shortlog.c #, c-format msgid "(reading log message from standard input)\n" msgstr "(teachtaireacht log a léamh ó ionchur caighdeánach)\n" -#: builtin/commit.c msgid "could not read log from standard input" msgstr "nà raibh in ann log a léamh ó ionchur caighdeánach" -#: builtin/commit.c #, c-format msgid "could not read log file '%s'" msgstr "nà raibh in ann comhad logála '%s' a léamh" -#: builtin/commit.c #, c-format msgid "options '%s' and '%s:%s' cannot be used together" msgstr "nà féidir roghanna '%s' agus '%s: %s' a úsáid le chéile" -#: builtin/commit.c msgid "could not read SQUASH_MSG" msgstr "nà raibh in ann SQUASH_MSG a léamh" -#: builtin/commit.c msgid "could not read MERGE_MSG" msgstr "nà raibh in ann MERGE_MSG a léamh" -#: builtin/commit.c bundle.c rerere.c sequencer.c #, c-format msgid "could not open '%s'" msgstr "nà fhéadfaà '%s' a oscailt" -#: builtin/commit.c msgid "could not write commit template" msgstr "nà raibh sé in ann teimpléad tiomanta a" -#: builtin/commit.c #, c-format msgid "" "Please enter the commit message for your changes. Lines starting\n" @@ -6047,7 +4877,6 @@ msgstr "" "tosú\n" "déanfar neamhaird le '%s'.\n" -#: builtin/commit.c #, c-format msgid "" "Please enter the commit message for your changes. Lines starting\n" @@ -6058,7 +4887,6 @@ msgstr "" "déanfar neamhaird le '%s', agus déanfar teachtaireacht folamh deireadh leis " "an tiomantas.\n" -#: builtin/commit.c #, c-format msgid "" "Please enter the commit message for your changes. Lines starting\n" @@ -6068,7 +4896,6 @@ msgstr "" "tosú\n" "coimeádfar le '%s'; féadfaidh tú iad a bhaint féin más mian leat.\n" -#: builtin/commit.c #, c-format msgid "" "Please enter the commit message for your changes. Lines starting\n" @@ -6080,7 +4907,6 @@ msgstr "" "coimeádfar le '%s'; féadfaidh tú iad a bhaint féin más mian leat.\n" "Déanann teachtaireacht folamh deireadh leis an tiomantas.\n" -#: builtin/commit.c msgid "" "\n" "It looks like you may be committing a merge.\n" @@ -6094,7 +4920,6 @@ msgstr "" "git update-ref -d MERGE_HEAD\n" "agus déan iarracht arÃs.\n" -#: builtin/commit.c msgid "" "\n" "It looks like you may be committing a cherry-pick.\n" @@ -6108,143 +4933,112 @@ msgstr "" "\tgit update-ref -d CHERRY_PICK_HEAD\n" "agus déan iarracht arÃs.\n" -#: builtin/commit.c #, c-format msgid "%sAuthor: %.*s <%.*s>" msgstr "%sÚdar: %.*s <%.*s>" -#: builtin/commit.c #, c-format msgid "%sDate: %s" msgstr "%sDáta: %s" -#: builtin/commit.c #, c-format msgid "%sCommitter: %.*s <%.*s>" msgstr "%sCeannasaÃ: %.*s <%.*s>" -#: builtin/commit.c msgid "Cannot read index" msgstr "Nà féidir innéacs a léamh" -#: builtin/commit.c builtin/tag.c msgid "unable to pass trailers to --trailers" -msgstr "nach féidir leantóirà a chur chuig --trailers" +msgstr "nà féidir trailers a thabhairt do --trailers" -#: builtin/commit.c msgid "Error building trees" msgstr "Earráid ag tógáil crainn" -#: builtin/commit.c builtin/tag.c #, c-format msgid "Please supply the message using either -m or -F option.\n" msgstr "" "Soláthair an teachtaireacht le do thoil ag baint úsáide as rogha -m nó -F.\n" -#: builtin/commit.c #, c-format msgid "--author '%s' is not 'Name <email>' and matches no existing author" msgstr "" "Nà 'Ainm' é --author '%s' agus nà mheaitseálann <email>aon údar atá ann " "cheana" -#: builtin/commit.c #, c-format msgid "Invalid ignored mode '%s'" msgstr "Modh neamhbhailà neamhaird '%s'" -#: builtin/commit.c #, c-format msgid "Invalid untracked files mode '%s'" msgstr "Modh comhaid neamhrianaithe neamhbhailà '%s'" -#: builtin/commit.c msgid "You are in the middle of a merge -- cannot reword." msgstr "Tá tú i lár cumaisc - nà féidir athfhocal a athfhocal." -#: builtin/commit.c msgid "You are in the middle of a cherry-pick -- cannot reword." msgstr "Tá tú i lár pioc silÃnà - nà féidir athfhocal a athfhocal." -#: builtin/commit.c #, c-format msgid "reword option of '%s' and path '%s' cannot be used together" msgstr "nà féidir rogha athfhocal de '%s' agus cosán '%s' a úsáid le chéile" -#: builtin/commit.c #, c-format msgid "reword option of '%s' and '%s' cannot be used together" msgstr "nà féidir rogha athfhocal de '%s' agus '%s' a úsáid le chéile" -#: builtin/commit.c msgid "You have nothing to amend." msgstr "NÃl aon rud le leasú agat." -#: builtin/commit.c msgid "You are in the middle of a merge -- cannot amend." msgstr "Tá tú i lár cumaisc - nà féidir leat leasú." -#: builtin/commit.c msgid "You are in the middle of a cherry-pick -- cannot amend." msgstr "Tá tú i lár rogha silÃnà - nà féidir leat leasú." -#: builtin/commit.c msgid "You are in the middle of a rebase -- cannot amend." msgstr "Tá tú i lár athbhunaithe - nà féidir leat leasú." -#: builtin/commit.c msgid "--reset-author can be used only with -C, -c or --amend." msgstr "Nà féidir --reset-author a úsáid ach le -C, -c nó --amend." -#: builtin/commit.c #, c-format msgid "unknown option: --fixup=%s:%s" msgstr "rogha anaithnid: --fixup=%s:%s" -#: builtin/commit.c #, c-format msgid "paths '%s ...' with -a does not make sense" msgstr "nà chiallaÃonn cosáin '%s... 'le -a" -#: builtin/commit.c msgid "show status concisely" msgstr "taispeáin stádas go hachomair" -#: builtin/commit.c msgid "show branch information" msgstr "taispeáin faisnéis bhrainse" -#: builtin/commit.c msgid "show stash information" msgstr "taispeáin faisnéis stash" -#: builtin/commit.c msgid "compute full ahead/behind values" msgstr "luachanna iomlána/taobh thiar de na luachanna a rÃomh" -#: builtin/commit.c msgid "version" msgstr "leagan" -#: builtin/commit.c builtin/fetch.c builtin/push.c builtin/worktree.c msgid "machine-readable output" msgstr "aschur inléite meaisÃn" -#: builtin/commit.c msgid "show status in long format (default)" msgstr "stádas taispeáint i bhformáid fhada (réamhshocraithe)" -#: builtin/commit.c msgid "terminate entries with NUL" msgstr "foirceannadh na hiontrálacha" -#: builtin/commit.c msgid "show untracked files, optional modes: all, normal, no. (Default: all)" msgstr "" "taispeáin comhaid neamhrianaithe, modhanna roghnacha: gach, gnáth, nÃl. " "(Réamhshocraithe: gach)" -#: builtin/commit.c msgid "" "show ignored files, optional modes: traditional, matching, no. (Default: " "traditional)" @@ -6252,11 +5046,9 @@ msgstr "" "taispeáint comhaid neamhaird orthu, modhanna roghnacha: traidisiúnta, " "meaitseáil, (Réamhshocraithe: traidisiúnta)" -#: builtin/commit.c parse-options.h msgid "when" msgstr "nuair a" -#: builtin/commit.c msgid "" "ignore changes to submodules, optional when: all, dirty, untracked. " "(Default: all)" @@ -6264,197 +5056,151 @@ msgstr "" "neamhaird a dhéanamh ar athruithe ar fho-mhodúil, roghnach nuair a bhÃonn: " "gach, salach, gan rianú. (Réamhshocraithe: gach)" -#: builtin/commit.c msgid "list untracked files in columns" msgstr "liostáil comhaid neamhrianaithe i gcolúin" -#: builtin/commit.c msgid "do not detect renames" msgstr "ná athainmneacha a bhrath" -#: builtin/commit.c msgid "detect renames, optionally set similarity index" msgstr "athainmneacha a bhrath, innéacs cosúlachta a shocrú go ro" -#: builtin/commit.c msgid "Unsupported combination of ignored and untracked-files arguments" msgstr "Teaglaim gan tacaÃocht d'argóintà comhaid a neamhaird agus gan rianú" -#: builtin/commit.c msgid "suppress summary after successful commit" msgstr "achoimre a chur faoi chois tar éis tiomantas" -#: builtin/commit.c msgid "show diff in commit message template" msgstr "taispeáin diff i teimpléad teachtaireachta tiomanta" -#: builtin/commit.c msgid "Commit message options" msgstr "Tiomanta roghanna teachtaire" -#: builtin/commit.c builtin/merge.c builtin/tag.c msgid "read message from file" msgstr "léigh teachtaireacht ón gcomhad" -#: builtin/commit.c msgid "author" msgstr "údar" -#: builtin/commit.c msgid "override author for commit" msgstr "an t-údar a shárú le haghaidh tiomantas" -#: builtin/commit.c builtin/gc.c msgid "date" msgstr "dáta" -#: builtin/commit.c msgid "override date for commit" msgstr "dáta athsháraithe le haghaidh tiomanta" -#: builtin/commit.c parse-options.h ref-filter.h msgid "commit" msgstr "tiomantas" -#: builtin/commit.c msgid "reuse and edit message from specified commit" msgstr "teachtaireacht a athúsáid agus a chur in eagar ó thiomantas" -#: builtin/commit.c msgid "reuse message from specified commit" msgstr "teachtaireacht athúsáid ó thiomantas sonraithe" #. TRANSLATORS: Leave "[(amend|reword):]" as-is, #. and only translate <commit>. #. -#: builtin/commit.c msgid "[(amend|reword):]commit" msgstr "[(leaso|athfhocal):] comhartha" -#: builtin/commit.c msgid "" "use autosquash formatted message to fixup or amend/reword specified commit" msgstr "" "úsáid teachtaireacht fhormáidithe autosquash chun gealltanas sonraithe a " "shocrú nó a leasú/athfhocal" -#: builtin/commit.c msgid "use autosquash formatted message to squash specified commit" msgstr "" "úsáid teachtaireacht fhormáidithe autosquash chun tiomantas sonraithe squash" -#: builtin/commit.c msgid "the commit is authored by me now (used with -C/-c/--amend)" msgstr "tá an gealltanas údar agam anois (úsáidtear le -C/-c/--amend)" -#: builtin/commit.c builtin/interpret-trailers.c builtin/tag.c msgid "trailer" msgstr "leantóir" -#: builtin/commit.c builtin/tag.c msgid "add custom trailer(s)" msgstr "cuir leantóir (Ã) saincheaptha" -#: builtin/commit.c builtin/log.c builtin/merge.c builtin/pull.c -#: builtin/revert.c msgid "add a Signed-off-by trailer" msgstr "cuir leantóir sÃnithe as" -#: builtin/commit.c msgid "use specified template file" msgstr "úsáid comhad teimpléad sonraithe" -#: builtin/commit.c msgid "force edit of commit" msgstr "eagarthóireacht fórsa ar thiomantas" -#: builtin/commit.c msgid "include status in commit message template" msgstr "áireamh stádas i dteimpléad teachtaireachta" -#: builtin/commit.c msgid "Commit contents options" msgstr "Tiomnaigh roghanna ábhair" -#: builtin/commit.c msgid "commit all changed files" msgstr "gach comhad athraithe a thiomnú" -#: builtin/commit.c msgid "add specified files to index for commit" msgstr "cuir comhaid sonraithe leis an innéacs le haghaidh tiomanta" -#: builtin/commit.c msgid "interactively add files" msgstr "cuir comhaid idirghnÃomhach" -#: builtin/commit.c msgid "interactively add changes" msgstr "cuir athruithe idirghnÃomhach" -#: builtin/commit.c msgid "commit only specified files" msgstr "ach comhaid shonraithe a dhéanamh" -#: builtin/commit.c msgid "bypass pre-commit and commit-msg hooks" msgstr "seachbhóthar crúcaà réamh-thiomanta agus comh-msg" -#: builtin/commit.c msgid "show what would be committed" msgstr "taispeáint cad a bheadh tiomanta" -#: builtin/commit.c msgid "amend previous commit" msgstr "leasú a leasú" -#: builtin/commit.c msgid "bypass post-rewrite hook" msgstr "seachbhóthar crúca iar-athsc" -#: builtin/commit.c msgid "ok to record an empty change" msgstr "ceart go leor chun athrú folamh a thaifeadadh" -#: builtin/commit.c msgid "ok to record a change with an empty message" msgstr "ceart go leor chun athrú a thaifeadadh le teachtaireacht folamh" -#: builtin/commit.c sequencer.c msgid "could not parse HEAD commit" msgstr "nà fhéadfadh sé gealltanas HEAD a pharsáil" -#: builtin/commit.c #, c-format msgid "Corrupt MERGE_HEAD file (%s)" msgstr "Comhad truaillithe MERGE_HEAD (%s)" -#: builtin/commit.c msgid "could not read MERGE_MODE" msgstr "nà raibh in ann MERGE_MODE a léamh" -#: builtin/commit.c #, c-format msgid "could not read commit message: %s" msgstr "nà féidir teachtaireacht tiomanta a léamh: %s" -#: builtin/commit.c #, c-format msgid "Aborting commit due to empty commit message.\n" msgstr "Tiomantas a ghabháil mar gheall ar theachtaireacht tiomanta folamh\n" -#: builtin/commit.c #, c-format msgid "Aborting commit; you did not edit the message.\n" msgstr "Tiomantas a ghearradh; nÃor chuir tú an teachtaireacht in eagar.\n" -#: builtin/commit.c #, c-format msgid "Aborting commit due to empty commit message body.\n" msgstr "" "Tiomantas a ghabháil mar gheall ar chorp teachtaireachta tiomanta folamh.\n" -#: builtin/commit.c msgid "" "repository has been updated, but unable to write\n" "new index file. Check that disk is not full and quota is\n" @@ -6465,220 +5211,176 @@ msgstr "" "lán agus nach bhfuil an cuóta sáraithe, agus ansin \"git restore --staged :/" "\" chun é a aisghabháil." -#: builtin/config.c msgid "git config list [<file-option>] [<display-option>] [--includes]" msgstr "liosta config git [<file-option>] [<display-option>] [--include]" -#: builtin/config.c msgid "" "git config get [<file-option>] [<display-option>] [--includes] [--all] [--" -"regexp] [--value=<value>] [--fixed-value] [--default=<default>] <name>" +"regexp] [--value=<pattern>] [--fixed-value] [--default=<default>] [--" +"url=<url>] <name>" msgstr "" -"<value><default>git config a fháil [<file-option>] [] [--include<display-" -"option>] [--all] [--regexp] [--value=] [--luach seasta] [--default=] <name>" +"git config get [<file-option>] [<display-option>] [--includes] [--all] [--" +"regexp] [--value=<pattern>] [--fixed-value] [--default=<default>] [--" +"url=<url>] <name>" -#: builtin/config.c msgid "" -"git config set [<file-option>] [--type=<type>] [--all] [--value=<value>] [--" -"fixed-value] <name> <value>" +"git config set [<file-option>] [--type=<type>] [--all] [--value=<pattern>] " +"[--fixed-value] <name> <value>" msgstr "" -"<value>git config set [<file-option>] [--type =] [--all] [--value=<type>] [--" -"luach seasta] <name><value>" +"git config set [<file-option>] [--type=<type>] [--all] [--value=<pattern>] " +"[--fixed-value] <name> <value>" -#: builtin/config.c msgid "" -"git config unset [<file-option>] [--all] [--value=<value>] [--fixed-value] " +"git config unset [<file-option>] [--all] [--value=<pattern>] [--fixed-value] " "<name>" msgstr "" -"<value>git config gan socrú [] [--gach<file-option>] [--value=] [--luach " -"seasta] <name>" +"git config unset [<file-option>] [--all] [--value=<pattern>] [--fixed-value] " +"<name>" -#: builtin/config.c msgid "git config rename-section [<file-option>] <old-name> <new-name>" msgstr "<file-option>roinn athainmnithe git config [] <old-name><new-name>" -#: builtin/config.c msgid "git config remove-section [<file-option>] <name>" msgstr "<file-option>roinn aistrithe git config [] <name>" -#: builtin/config.c msgid "git config edit [<file-option>]" -msgstr "<file-option>Eagarthóireacht config git []" +msgstr "git config edit [<file-option>]" -#: builtin/config.c msgid "git config [<file-option>] --get-colorbool <name> [<stdout-is-tty>]" -msgstr "<name><stdout-is-tty>git config [<file-option>] --get-colorbool []" +msgstr "git config [<file-option>] --get-colorbool <name> [<stdout-is-tty>]" -#: builtin/config.c msgid "" "git config get [<file-option>] [<display-option>] [--includes] [--all] [--" -"regexp=<regexp>] [--value=<value>] [--fixed-value] [--default=<default>] " +"regexp=<regexp>] [--value=<pattern>] [--fixed-value] [--default=<default>] " "<name>" msgstr "" -"<value><default>git config a fháil [<file-option>] [] [--include<display-" -"option>] [--all] [--regexp=] [-- <regexp>value=] [--luach seasta] [--" -"default=] <name>" +"git config get [<file-option>] [<display-option>] [--includes] [--all] [--" +"regexp=<regexp>] [--value=<pattern>] [--fixed-value] [--default=<default>] " +"<name>" -#: builtin/config.c msgid "" "git config set [<file-option>] [--type=<type>] [--comment=<message>] [--all] " -"[--value=<value>] [--fixed-value] <name> <value>" +"[--value=<pattern>] [--fixed-value] <name> <value>" msgstr "" -"<value>git config set [<file-option>] [--type =] [--comment =<type>] [--all] " -"[--value=<message>] [--luach seasta] <name><value>" +"git config set [<file-option>] [--type=<type>] [--comment=<message>] [--all] " +"[--value=<pattern>] [--fixed-value] <name> <value>" -#: builtin/config.c msgid "Config file location" msgstr "SuÃomh comhad Config" -#: builtin/config.c msgid "use global config file" msgstr "bain úsáid as comhad cumraÃochta domhanda" -#: builtin/config.c msgid "use system config file" msgstr "bain úsáid as comhad cumraÃochta córais" -#: builtin/config.c msgid "use repository config file" msgstr "bain úsáid as comhad cumraÃochta stórais" -#: builtin/config.c msgid "use per-worktree config file" msgstr "bain úsáid as comhad cumraÃochta in aghaidh an chrann oibre" -#: builtin/config.c builtin/gc.c msgid "use given config file" msgstr "bain úsáid as comhad cumraÃochta tugtha" -#: builtin/config.c msgid "blob-id" msgstr "blob-id" -#: builtin/config.c msgid "read config from given blob object" msgstr "léigh cumraÃocht ó réad blob a thugtar" -#: builtin/config.c msgid "Type" msgstr "Cineál" -#: builtin/config.c builtin/hash-object.c msgid "type" msgstr "cineál" -#: builtin/config.c msgid "value is given this type" msgstr "tugtar luach an cineál seo" -#: builtin/config.c msgid "value is \"true\" or \"false\"" msgstr "tá luach “fÃor†nó “bréagachâ€" -#: builtin/config.c msgid "value is decimal number" msgstr "is é luach uimhir deachúil" -#: builtin/config.c msgid "value is --bool or --int" msgstr "is é luach --bool nó --int" -#: builtin/config.c msgid "value is --bool or string" msgstr "is é luach --bool nó teaghrán" -#: builtin/config.c msgid "value is a path (file or directory name)" msgstr "is cosán é luach (ainm comhad nó eolaire)" -#: builtin/config.c msgid "value is an expiry date" msgstr "is dáta éaga é luach" -#: builtin/config.c msgid "Display options" msgstr "Roghanna taispeána" -#: builtin/config.c msgid "terminate values with NUL byte" msgstr "foirceannadh luachanna le nóta NUL" -#: builtin/config.c msgid "show variable names only" msgstr "taispeáin ainmneacha athróg amháin" -#: builtin/config.c msgid "show origin of config (file, standard input, blob, command line)" msgstr "" "taispeáint bunús an chumraÃochta (comhad, ionchur caighdeánach, blob, lÃne " "ordaithe)" -#: builtin/config.c msgid "show scope of config (worktree, local, global, system, command)" msgstr "" "taispeáin raon feidhme an chumraÃochta (crann oibre, áitiúil, domhanda, " "córas, ordú)" -#: builtin/config.c msgid "show config keys in addition to their values" msgstr "taispeáin eochracha cumraithe i dteannta lena luachanna" -#: builtin/config.c #, c-format msgid "unrecognized --type argument, %s" msgstr "argóint --type gan aithint, %s" -#: builtin/config.c msgid "only one type at a time" msgstr "ach cineál amháin ag an am" -#: builtin/config.c #, c-format msgid "wrong number of arguments, should be %d" msgstr "lÃon mÃcheart na n-argóintÃ, ba chóir go mbeadh %d" -#: builtin/config.c #, c-format msgid "wrong number of arguments, should be from %d to %d" msgstr "ba chóir go mbeadh lÃon mÃcheart na n-argóintà ó %d go %d" -#: builtin/config.c #, c-format msgid "invalid key pattern: %s" msgstr "patrún eochair neamhbhailÃ: %s" -#: builtin/config.c config.c #, c-format msgid "invalid pattern: %s" msgstr "patrún neamhbhailÃ: %s" -#: builtin/config.c #, c-format msgid "failed to format default config value: %s" msgstr "theip ar luach cumraÃochta réamhshocraithe a fhormáidiú: %s" -#: builtin/config.c #, c-format msgid "cannot parse color '%s'" msgstr "nà féidir dath '%s' a pháirseáil" -#: builtin/config.c msgid "unable to parse default color value" -msgstr "in ann luach dath réamhshocraithe a pharsáil" +msgstr "nà féidir luach datha réamhshocraithe a pharsáil" -#: builtin/config.c msgid "not in a git directory" msgstr "nach bhfuil i eolaire git" -#: builtin/config.c msgid "writing to stdin is not supported" msgstr "nà thacaÃtear le scrÃobh chuig stdin" -#: builtin/config.c msgid "writing config blobs is not supported" msgstr "nà thacaÃtear le blobs cumraÃochta a scrÃobh" -#: builtin/config.c #, c-format msgid "" "# This is Git's per-user configuration file.\n" @@ -6693,27 +5395,21 @@ msgstr "" "#\tainm = %s\n" "#\trÃomhphost = %s\n" -#: builtin/config.c msgid "only one config file at a time" msgstr "ach comhad cumraithe amháin ag an am" -#: builtin/config.c msgid "--local can only be used inside a git repository" msgstr "Nà féidir --local a úsáid ach taobh istigh de stór git" -#: builtin/config.c msgid "--blob can only be used inside a git repository" msgstr "Nà féidir --blob a úsáid ach taobh istigh de stór git" -#: builtin/config.c msgid "--worktree can only be used inside a git repository" msgstr "Nà féidir --worktree a úsáid ach taobh istigh de stór git" -#: builtin/config.c builtin/gc.c msgid "$HOME not set" msgstr "NÃl $HOME socraithe" -#: builtin/config.c msgid "" "--worktree cannot be used with multiple working trees unless the config\n" "extension worktreeConfig is enabled. Please read \"CONFIGURATION FILE\"\n" @@ -6724,99 +5420,76 @@ msgstr "" "Tá sÃneadh WorkTreeConfig cumasaithe. Léigh “COMHAD CUMRAÃOCHTAâ€\n" "roinn i “git help worktree†le haghaidh sonraÃ" -#: builtin/config.c msgid "Other" msgstr "Eile" -#: builtin/config.c msgid "respect include directives on lookup" msgstr "meas lena n-áirÃtear treoracha maidir le cuardach" -#: builtin/config.c #, c-format msgid "unable to read config file '%s'" -msgstr "nach féidir an comhad cumraithe '%s' a léamh" +msgstr "nà féidir an comhad cumraÃochta '%s' a léamh" -#: builtin/config.c msgid "error processing config file(s)" msgstr "comhad (Ã) cumraÃochta próiseála earráide" -#: builtin/config.c msgid "Filter options" msgstr "Roghanna scagaire" -#: builtin/config.c msgid "return all values for multi-valued config options" msgstr "" "gach luach a thabhairt ar ais le haghaidh roghanna cumraithe illuachmhara" -#: builtin/config.c msgid "interpret the name as a regular expression" msgstr "léirmhÃniú an t-ainm mar abairt rialta" -#: builtin/config.c msgid "show config with values matching the pattern" msgstr "taispeáin cumraÃocht le luachanna a mheaitseann an phatrún" -#: builtin/config.c msgid "use string equality when comparing values to value pattern" msgstr "bain úsáid as comhionannas sreangán agus luachanna á gcomparáid" -#: builtin/config.c msgid "URL" msgstr "URL" -#: builtin/config.c msgid "show config matching the given URL" msgstr "taispeáin configà a mheaitseáil leis an URL tugtha" -#: builtin/config.c msgid "value" msgstr "luach" -#: builtin/config.c msgid "use default value when missing entry" msgstr "bain úsáid as luach réamhshocraithe agus iontráil" -#: builtin/config.c msgid "--fixed-value only applies with 'value-pattern'" msgstr "Nà bhaineann --fixed-value ach le 'patrún luacha'" -#: builtin/config.c msgid "--default= cannot be used with --all or --url=" msgstr "Nà féidir --default= a úsáid le --all nó --url =" -#: builtin/config.c msgid "--url= cannot be used with --all, --regexp or --value" msgstr "Nà féidir --url = a úsáid le --all, --regexp nó --value" -#: builtin/config.c msgid "Filter" msgstr "Scagaire" -#: builtin/config.c msgid "replace multi-valued config option with new value" msgstr "luach nua a chur in ionad rogha cumraÃochta illuachmhara" -#: builtin/config.c msgid "human-readable comment string (# will be prepended as needed)" msgstr "" "teaghrán tráchtaireachta inléite don duine (déanfar # a ullmhú de réir mar " "is gá)" -#: builtin/config.c msgid "add a new line without altering any existing values" msgstr "lÃne nua a chur leis gan aon luachanna atá ann cheana a athrú" -#: builtin/config.c msgid "--fixed-value only applies with --value=<pattern>" msgstr "nà bhaineann --fixed-value ach le --value=<pattern>" -#: builtin/config.c msgid "--append cannot be used with --value=<pattern>" msgstr "Nà féidir --append a úsáid le --value=<pattern>" -#: builtin/config.c #, c-format msgid "" "cannot overwrite multiple values with a single value\n" @@ -6825,101 +5498,77 @@ msgstr "" "nà féidir luachanna iolracha a fhorscrÃobh le luach amháin\n" " Úsáid regexp, --add nó --replace-all chun %s a athrú." -#: builtin/config.c #, c-format msgid "no such section: %s" msgstr "gan aon chuid den sórt sin: %s" -#: builtin/config.c msgid "editing stdin is not supported" msgstr "nà thacaÃtear le stdin eagarthóireachta" -#: builtin/config.c msgid "editing blobs is not supported" msgstr "nà thacaÃtear le blobs eagarthóireachta" -#: builtin/config.c #, c-format msgid "cannot create configuration file %s" msgstr "nà féidir comhad cumraÃochta %s a chruthú" -#: builtin/config.c msgid "Action" msgstr "GnÃomhaÃocht" -#: builtin/config.c msgid "get value: name [<value-pattern>]" msgstr "luach a fháil: ainm [<value-pattern>]" -#: builtin/config.c msgid "get all values: key [<value-pattern>]" msgstr "faigh na luachanna go léir: eochair [<value-pattern>]" -#: builtin/config.c msgid "get values for regexp: name-regex [<value-pattern>]" msgstr "<value-pattern>luachanna a fháil do regexp: ainm-regex []" -#: builtin/config.c msgid "get value specific for the URL: section[.var] URL" msgstr "faigh luach sonrach don URL: rannán [.var] URL" -#: builtin/config.c msgid "replace all matching variables: name value [<value-pattern>]" msgstr "athróg meaitseála go léir in ionad: luach ainm [<value-pattern>]" -#: builtin/config.c msgid "add a new variable: name value" msgstr "cuir athróg nua leis: luach ainm" -#: builtin/config.c msgid "remove a variable: name [<value-pattern>]" msgstr "bhaint athróg: ainm [<value-pattern>]" -#: builtin/config.c msgid "remove all matches: name [<value-pattern>]" msgstr "bhaint gach cluiche: ainm [<value-pattern>]" -#: builtin/config.c msgid "rename section: old-name new-name" msgstr "athainmnigh an chuid: sean-ainm nua-ainm" -#: builtin/config.c msgid "remove a section: name" msgstr "cuid a bhaint: ainm" -#: builtin/config.c msgid "list all" msgstr "liostáil go léir" -#: builtin/config.c msgid "open an editor" msgstr "eagarthóir a oscailt" -#: builtin/config.c msgid "find the color configured: slot [<default>]" msgstr "faigh an dath cumraithe: sliotán [<default>]" -#: builtin/config.c msgid "find the color setting: slot [<stdout-is-tty>]" msgstr "faigh an socrú dath: sliotán [<stdout-is-tty>]" -#: builtin/config.c msgid "with --get, use default value when missing entry" msgstr "le --get, bain úsáid as luach réamhshocraithe agus iontráil in easnamh" -#: builtin/config.c msgid "--get-color and variable type are incoherent" msgstr "Tá --get-color agus cineál athraitheach neamhchomhtháite" -#: builtin/config.c msgid "no action specified" msgstr "aon ghnÃomh sonraithe" -#: builtin/config.c msgid "--name-only is only applicable to --list or --get-regexp" msgstr "NÃl --name-only infheidhme ach le --list nó --get-regexp" -#: builtin/config.c msgid "" "--show-origin is only applicable to --get, --get-all, --get-regexp, and --" "list" @@ -6927,20 +5576,16 @@ msgstr "" "NÃl --show-origin infheidhme ach le --get, --get-all, --get-regexp, agus --" "list" -#: builtin/config.c msgid "--default is only applicable to --get" msgstr "NÃl --default infheidhme ach le --get" -#: builtin/config.c msgid "--comment is only applicable to add/set/replace operations" msgstr "" "NÃl --comment infheidhme ach le hoibrÃochtaà a chur leis /socraÃ/athsholáthar" -#: builtin/count-objects.c msgid "print sizes in human readable format" msgstr "méideanna priontála i bhformáid inléite don duine" -#: builtin/credential-cache--daemon.c #, c-format msgid "" "The permissions on your socket directory are too loose; other\n" @@ -6954,79 +5599,63 @@ msgstr "" "\n" " chmod 0700 %s" -#: builtin/credential-cache--daemon.c msgid "print debugging messages to stderr" msgstr "teachtaireachtaà dÃfhabhtaithe a phriontáil chuig stderr" -#: builtin/credential-cache--daemon.c msgid "credential-cache--daemon unavailable; no unix socket support" msgstr "credential-cache--daemon ar fáil; gan aon tacaÃocht soicéad unix" -#: builtin/credential-cache.c msgid "credential-cache unavailable; no unix socket support" msgstr "taisce creidiúnaithe ar fáil; gan aon tacaÃocht soicéad unix" -#: builtin/credential-store.c #, c-format msgid "unable to get credential storage lock in %d ms" -msgstr "in ann glas stórála creidiúnaithe a fháil in %d ms" +msgstr "nà féidir glas stórála dintiúir a fháil i %d ms" -#: builtin/describe.c msgid "" "git describe [--all] [--tags] [--contains] [--abbrev=<n>] [<commit-ish>...]" msgstr "" "git describe [--all] [--tags] [--contains] [--abbrev=<n>] [<commit-ish>...]" -#: builtin/describe.c msgid "" "git describe [--all] [--tags] [--contains] [--abbrev=<n>] --dirty[=<mark>]" msgstr "" "git describe [--all] [--tags] [--contains] [--abbrev=<n>] --dirty[=<mark>]" -#: builtin/describe.c msgid "git describe <blob>" -msgstr "git cur sÃos <blob>" +msgstr "git describe <blob>" -#: builtin/describe.c msgid "head" -msgstr "ceann" +msgstr "head" -#: builtin/describe.c msgid "lightweight" msgstr "éadrom" -#: builtin/describe.c msgid "annotated" msgstr "anótáilte" -#: builtin/describe.c #, c-format msgid "annotated tag %s not available" msgstr "nÃl clib anótáilte %s ar fáil" -#: builtin/describe.c #, c-format msgid "tag '%s' is externally known as '%s'" msgstr "tugtar '%s' ar an gclib '%s' go seachtrach" -#: builtin/describe.c #, c-format msgid "no tag exactly matches '%s'" msgstr "nÃl aon chlib ag teacht go dÃreach le '%s'" -#: builtin/describe.c #, c-format msgid "No exact match on refs or tags, searching to describe\n" msgstr "" "NÃl aon mheaitseáil cruinn ar thaifeanna nó clibeanna, ag cuardach chun cur " "sÃos\n" -#: builtin/describe.c #, c-format msgid "finished search at %s\n" msgstr "cuardach crÃochnaithe ag %s\n" -#: builtin/describe.c #, c-format msgid "" "No annotated tags can describe '%s'.\n" @@ -7035,7 +5664,6 @@ msgstr "" "Nà féidir le haon chlibeanna anótaithe cur sÃos a dhéanamh ar '%s'.\n" "Mar sin féin, bhà clibeanna gan anótáil ann: triail as --tags." -#: builtin/describe.c #, c-format msgid "" "No tags can describe '%s'.\n" @@ -7044,242 +5672,199 @@ msgstr "" "Nà féidir le clibeanna cur sÃos a dhéanamh ar '%s'.\n" "Bain triail as --always, nó cruthaigh roinnt clibeanna." -#: builtin/describe.c #, c-format msgid "traversed %lu commits\n" msgstr "gealltanais %lu a thrasnaÃodh\n" -#: builtin/describe.c #, c-format msgid "found %i tags; gave up search at %s\n" msgstr "fuarthas %i clibeanna; thréig an cuardach ag %s\n" -#: builtin/describe.c +#, c-format +msgid "cannot search for blob '%s' on an unborn branch" +msgstr "nà féidir cuardach a dhéanamh ar bloba '%s' ar bhrainse neamhbheirthe" + +#, c-format +msgid "blob '%s' not reachable from HEAD" +msgstr "ni féidir teacht ar an blob '%s' ó HEAD" + #, c-format msgid "describe %s\n" msgstr "déan cur sÃos ar %s\n" -#: builtin/describe.c #, c-format msgid "Not a valid object name %s" msgstr "Nà ainm réad bailà %s" -#: builtin/describe.c #, c-format msgid "%s is neither a commit nor blob" msgstr "Nà gealltanas ná blob é %s" -#: builtin/describe.c msgid "find the tag that comes after the commit" msgstr "faigh an chlib a thagann tar éis an tiomanta" -#: builtin/describe.c msgid "debug search strategy on stderr" msgstr "straitéis cuardaigh dÃfhabhtú ar stderr" -#: builtin/describe.c msgid "use any ref" msgstr "bain úsáid as aon tagairt" -#: builtin/describe.c msgid "use any tag, even unannotated" msgstr "úsáid aon chlib, fiú gan anótáil" -#: builtin/describe.c msgid "always use long format" msgstr "úsáid formáid fada i gcónaÃ" -#: builtin/describe.c msgid "only follow first parent" msgstr "lean ach an chéad thuismitheoir" -#: builtin/describe.c msgid "only output exact matches" msgstr "ach cluichà cruinne aschuir" -#: builtin/describe.c msgid "consider <n> most recent tags (default: 10)" msgstr "machnamh <n>ar na clibeanna is déanaà (réamhshocraithe: 10)" -#: builtin/describe.c msgid "only consider tags matching <pattern>" msgstr "nà mheas ach meaitseáil clibeanna <pattern>" -#: builtin/describe.c msgid "do not consider tags matching <pattern>" msgstr "ná smaoinigh ar mheaitseáil clibeanna <pattern>" -#: builtin/describe.c builtin/name-rev.c msgid "show abbreviated commit object as fallback" msgstr "taispeáint réad tiomanta giorraithe mar fhilleadh" -#: builtin/describe.c msgid "mark" msgstr "marc" -#: builtin/describe.c msgid "append <mark> on dirty working tree (default: \"-dirty\")" msgstr "cuir isteach <mark>ar chrann oibre salach (réamhshocraithe: “-salachâ€)" -#: builtin/describe.c msgid "append <mark> on broken working tree (default: \"-broken\")" msgstr "cuir isteach <mark>ar chrann oibre briste (réamhshocraithe: “-brokenâ€)" -#: builtin/describe.c msgid "No names found, cannot describe anything." msgstr "" "NÃor aimsÃodh aon ainmneacha, nà féidir cur sÃos a dhéanamh ar aon rud." -#: builtin/describe.c #, c-format msgid "option '%s' and commit-ishes cannot be used together" msgstr "nà féidir rogha '%s' agus coimistà a úsáid le chéile" -#: builtin/diagnose.c msgid "" "git diagnose [(-o | --output-directory) <path>] [(-s | --suffix) <format>]\n" " [--mode=<mode>]" msgstr "" -"<format>git diagnosis [(-o | --output-directory)] [(-s | -- <path>suffix)]\n" -" <mode>[--mód =]" +"git diagnose [(-o | --output-directory) <path>] [(-s | --suffix) <format>]\n" +" [--mode=<mode>]" -#: builtin/diagnose.c msgid "specify a destination for the diagnostics archive" msgstr "sonraigh ceann scrÃbe don chartlann diagnóisic" -#: builtin/diagnose.c msgid "specify a strftime format suffix for the filename" msgstr "sonraigh iarmhÃr formáid strftime don ainm comhaid" -#: builtin/diagnose.c msgid "specify the content of the diagnostic archive" msgstr "sonraigh ábhar an chartlann dhiagnóiseach" -#: builtin/diff-pairs.c #, c-format msgid "unable to parse mode: %s" -msgstr "nach féidir modh a pháirseáil: %s" +msgstr "nà féidir an modh parsála a dhéanamh: %s" -#: builtin/diff-pairs.c #, c-format msgid "unable to parse object id: %s" -msgstr "nach féidir id réad a pháirseáil: %s" +msgstr "nà féidir aitheantas an réada a pharsáil: %s" -#: builtin/diff-pairs.c msgid "git diff-pairs -z [<diff-options>]" msgstr "git diff-pairs -z [<diff-options>]" -#: builtin/diff-pairs.c builtin/log.c builtin/replay.c builtin/shortlog.c -#: bundle.c #, c-format msgid "unrecognized argument: %s" msgstr "argóint gan aithint: %s" -#: builtin/diff-pairs.c msgid "working without -z is not supported" msgstr "nà thacaÃtear le bheith ag obair gan -z" -#: builtin/diff-pairs.c msgid "pathspec arguments not supported" msgstr "argóintà pathspec nach dtacaÃtear leis" -#: builtin/diff-pairs.c msgid "revision arguments not allowed" msgstr "argóintà athbhreithnithe nach" -#: builtin/diff-pairs.c msgid "invalid raw diff input" msgstr "ionchur diff amh neamhbhailÃ" -#: builtin/diff-pairs.c msgid "tree objects not supported" msgstr "rudaà crann nach dtacaÃtear leis" -#: builtin/diff-pairs.c msgid "got EOF while reading path" msgstr "fuair EOF agus tú ag léamh cosán" -#: builtin/diff-pairs.c msgid "got EOF while reading destination path" msgstr "fuair EOF agus tú ag léamh cosán ceann scrÃbe" -#: builtin/diff-pairs.c #, c-format msgid "unable to parse rename/copy score: %s" -msgstr "nach féidir scór athainmniú/cóipeáil a pháirseáil: %s" +msgstr "nà féidir an scór a athainmniú/a chóipeáil a pharsáil: %s" -#: builtin/diff-pairs.c #, c-format msgid "unknown diff status: %c" msgstr "stádas diff anaithnid: %c" -#: builtin/diff-tree.c msgid "--merge-base only works with two commits" msgstr "Nà oibrÃonn --merge-base ach le dhá thiomantas" -#: builtin/diff.c #, c-format msgid "'%s': not a regular file or symlink" msgstr "'%s': nà comhad rialta nó comhnasc" -#: builtin/diff.c msgid "no merge given, only parents." msgstr "nà thugtar aon chumasc, tuismitheoirà amháin." -#: builtin/diff.c #, c-format msgid "invalid option: %s" msgstr "rogha neamhbhailÃ: %s" -#: builtin/diff.c #, c-format msgid "%s...%s: no merge base" msgstr "%s... %s: gan aon bhonn cumaisc" -#: builtin/diff.c +msgid "cannot come back to cwd" +msgstr "nà féidir teacht ar ais chuig cwd" + msgid "Not a git repository" -msgstr "Nà stór git" +msgstr "Nà stór git é" -#: builtin/diff.c builtin/grep.c #, c-format msgid "invalid object '%s' given." msgstr "réad neamhbhailà '%s' tugtha." -#: builtin/diff.c #, c-format msgid "more than two blobs given: '%s'" msgstr "nÃos mó ná dhá bhlob a thugtar: '%s'" -#: builtin/diff.c #, c-format msgid "unhandled object '%s' given." msgstr "réad neamh-láimhseáilte '%s' tugtha." -#: builtin/diff.c #, c-format msgid "%s...%s: multiple merge bases, using %s" msgstr "%s... %s: bonn cumaisc iolracha, ag baint úsáide as %s" -#: builtin/difftool.c msgid "git difftool [<options>] [<commit> [<commit>]] [--] [<path>...]" msgstr "git difftool [[<options>]] <commit>[[<commit>]] [--] [<path>...]" -#: builtin/difftool.c #, c-format msgid "could not read symlink %s" msgstr "nà fhéadfaà nasc simtéarach %s a léamh" -#: builtin/difftool.c #, c-format msgid "could not read symlink file %s" msgstr "nà raibh in ann comhad simnasc %s a léamh" -#: builtin/difftool.c #, c-format msgid "could not read object %s for symlink %s" msgstr "nà raibh in ann réad %s a léamh le haghaidh nasc simtéarach %s" -#: builtin/difftool.c msgid "" "combined diff formats ('-c' and '--cc') are not supported in\n" "directory diff mode ('-d' and '--dir-diff')." @@ -7287,63 +5872,49 @@ msgstr "" "nà thacaÃtear le formáidà diff comhcheangailte ('-c' agus '--cc') i\n" "modh diff eolaire ('-d' agus '--dir-diff')." -#: builtin/difftool.c #, c-format msgid "both files modified: '%s' and '%s'." msgstr "modhnaigh an dá chomhad: '%s' agus '%s'." -#: builtin/difftool.c msgid "working tree file has been left." msgstr "tá comhad crann oibre fágtha." -#: builtin/difftool.c sequencer.c #, c-format msgid "could not copy '%s' to '%s'" msgstr "nà fhéadfaà '%s' a chóipeáil chuig '%s'" -#: builtin/difftool.c #, c-format msgid "temporary files exist in '%s'." msgstr "tá comhaid shealadacha ann i '%s'." -#: builtin/difftool.c msgid "you may want to cleanup or recover these." msgstr "b'fhéidir gur mhaith leat iad seo a ghlanadh nó a aisghabháil." -#: builtin/difftool.c #, c-format msgid "failed: %d" msgstr "theip ar: %d" -#: builtin/difftool.c msgid "use `diff.guitool` instead of `diff.tool`" msgstr "bain úsáid as `diff.guitool` in ionad `diff.tool`" -#: builtin/difftool.c msgid "perform a full-directory diff" msgstr "éagsúlacht eolaire lán-eolaire a dhéanamh" -#: builtin/difftool.c msgid "do not prompt before launching a diff tool" msgstr "ná spreag sula seolann tú uirlis diff" -#: builtin/difftool.c msgid "use symlinks in dir-diff mode" msgstr "bain úsáid as naisc siombailte i mód dir-diff" -#: builtin/difftool.c msgid "tool" msgstr "uirlis" -#: builtin/difftool.c msgid "use the specified diff tool" msgstr "bain úsáid as an uirlis diff sonraithe" -#: builtin/difftool.c msgid "print a list of diff tools that may be used with `--tool`" msgstr "liosta d'uirlisà diff is féidir a úsáid le `--tool` a phriontáil" -#: builtin/difftool.c msgid "" "make 'git-difftool' exit when an invoked diff tool returns a non-zero exit " "code" @@ -7351,240 +5922,744 @@ msgstr "" "imeacht 'git-difftool' a dhéanamh nuair a fhilleann uirlis diff a ghairmtear " "cód imeachta neamh-nialasach" -#: builtin/difftool.c msgid "specify a custom command for viewing diffs" msgstr "sonraigh ordú saincheaptha chun féachaint ar dhifrÃochtaÃ" -#: builtin/difftool.c msgid "passed to `diff`" msgstr "cuireadh chuig `diff`" -#: builtin/difftool.c msgid "difftool requires worktree or --no-index" msgstr "éilÃonn difftool crann oibre nó --no-index" -#: builtin/difftool.c msgid "no <tool> given for --tool=<tool>" msgstr "nÃl aon tu <tool> gadh le haghaidh --tool=<tool>" -#: builtin/difftool.c msgid "no <cmd> given for --extcmd=<cmd>" msgstr "nÃl <cmd> tugtha do --extcmd=<cmd>" -#: builtin/fast-export.c msgid "git fast-export [<rev-list-opts>]" msgstr "git fast-export [<rev-list-opts>]" -#: builtin/fast-export.c -msgid "Error: Cannot export nested tags unless --mark-tags is specified." +#, c-format +msgid "unknown %s mode: %s" +msgstr "mód %s anaithnid: %s" + +#, c-format +msgid "unknown tag-of-filtered mode: %s" +msgstr "clib anaithnid den mhodh scagtha: %s" + +#, c-format +msgid "unknown reencoding mode: %s" +msgstr "samhlacha ionchódaithe anaithnid: %s" + +#, c-format +msgid "could not read blob %s" +msgstr "nÃorbh fhéidir bloba %s a léamh" + +#, c-format +msgid "oid mismatch in blob %s" +msgstr "mÃ-oiriúnacht oid i mblob %s" + +#, c-format +msgid "could not write blob '%s'" +msgstr "nÃorbh fhéidir bloba '%s' a scrÃobh" + +#, c-format +msgid "unexpected comparison status '%c' for %s, %s" +msgstr "stádas comparáide gan choinne '%c' do %s, %s" + +msgid "none" +msgstr "nÃl aon" + +#, c-format +msgid "could not find author in commit %s" +msgstr "nÃorbh fhéidir an t-údar a aimsiú i dtiomantas %s" + +#, c-format +msgid "could not find committer in commit %s" +msgstr "nÃorbh fhéidir an tiomnóir a aimsiú i dtiomnadh %s" + +#, c-format +msgid "" +"encountered commit-specific encoding %.*s in commit %s; use --reencode=[yes|" +"no] to handle it" +msgstr "" +"thángthas ar ionchódú sonrach don tiomantas %.*s i dtiomantas %s; bain úsáid " +"as --reencode=[yes|no] chun é a láimhseáil" + +#, c-format +msgid "encountered signed commit %s; use --signed-commits=<mode> to handle it" +msgstr "" +"bhuail an tiomantas sÃnithe %s; bain úsáid as --signed-commits=<mode> chun é " +"a láimhseáil" + +#, c-format +msgid "exporting %<PRIuMAX> signature(s) for commit %s" +msgstr "ag easpórtáil %<PRIuMAX> sÃnithe le haghaidh tiomnú %s" + +#, c-format +msgid "stripping signature(s) from commit %s" +msgstr "ag baint sÃnithe ó thiomnadh %s" + +#, c-format +msgid "" +"omitting tag %s,\n" +"since tags of trees (or tags of tags of trees, etc.) are not supported." +msgstr "" +"ag fágáil an chlib %s ar lár, ós rud é nach dtacaÃtear le clibeanna crainn " +"(nó clibeanna de chlibeanna crainn, srl.)." + +#, c-format +msgid "could not read tag %s" +msgstr "nÃorbh fhéidir an clib %s a léamh" + +#, c-format +msgid "encountered signed tag %s; use --signed-tags=<mode> to handle it" msgstr "" -"Earráid: Nà féidir clibeanna neadaithe a onnmhairiú mura sonraÃtear --mark-" -"tags." +"bhuail mé le clib shÃnithe %s; bain úsáid as --signed-tags=<mode> chun é a " +"láimhseáil" + +#, c-format +msgid "exporting signed tag %s" +msgstr "clib shÃnithe %s á onnmhairiú" + +#, c-format +msgid "stripping signature from tag %s" +msgstr "ag baint sÃniú ón gclib %s" + +#, c-format +msgid "" +"tag %s tags unexported object; use --tag-of-filtered-object=<mode> to handle " +"it" +msgstr "" +"clibeanna %s réad neamh-onnmhairithe; bain úsáid as --tag-of-filtered-" +"object=<mode> chun é a láimhseáil" + +msgid "cannot export nested tags unless --mark-tags is specified." +msgstr "" +"nà féidir clibeanna neadaithe a easpórtáil mura sonraÃtear --mark-tags." + +#, c-format +msgid "tag %s points nowhere?" +msgstr "clib %s pointà in áit ar bith?" + +#, c-format +msgid "%s: unexpected object of type %s, skipping." +msgstr "%s: réad gan choinne de chineál %s, ag scipeáil." + +#, c-format +msgid "tag points to object of unexpected type %s, skipping." +msgstr "" +"tá an clib ag pointeáil chuig réad den chineál gan choinne %s, ag scipeáil." + +#, c-format +msgid "unable to open marks file %s for writing." +msgstr "nà féidir comhad marcanna %s a oscailt le haghaidh scrÃbhneoireachta." + +#, c-format +msgid "unable to write marks file %s." +msgstr "nà féidir comhad marcanna %s a scrÃobh." + +#, c-format +msgid "corrupt mark line: %s" +msgstr "lÃne marcála truaillithe: %s" + +#, c-format +msgid "object not found: %s" +msgstr "nÃor aimsÃodh réad: %s" + +#, c-format +msgid "not a commit? can't happen: %s" +msgstr "nach tiomantas é? nà féidir tarlú: %s" + +#, c-format +msgid "object %s already has a mark" +msgstr "tá marc ar réad %s cheana féin" -#: builtin/fast-export.c msgid "--anonymize-map token cannot be empty" msgstr "Nà féidir le comhartha --anonymize-map a bheith folamh" -#: builtin/fast-export.c msgid "show progress after <n> objects" msgstr "dhul chun cinn a thaispe <n>áint" -#: builtin/fast-export.c msgid "select handling of signed tags" msgstr "roghnaigh láimhseáil na clibeanna" -#: builtin/fast-export.c msgid "select handling of signed commits" msgstr "roghnaigh láimhseáil tiomantas sÃnithe" -#: builtin/fast-export.c msgid "select handling of tags that tag filtered objects" msgstr "roghnaigh láimhseáil clibeanna a ligeann rudaÃ" -#: builtin/fast-export.c msgid "select handling of commit messages in an alternate encoding" msgstr "roghnaigh láimhseáil teachtaireachtaà tiomanta i ionchódú" -#: builtin/fast-export.c msgid "dump marks to this file" msgstr "marcanna dumpáil chuig an gcomhad seo" -#: builtin/fast-export.c msgid "import marks from this file" msgstr "marcanna iompórtáil ón gcomhad seo" -#: builtin/fast-export.c msgid "import marks from this file if it exists" msgstr "marcanna a iompórtáil ón gcomhad seo má tá sé ann" -#: builtin/fast-export.c msgid "fake a tagger when tags lack one" msgstr "clibeoir bréige nuair nach bhfuil ceann ag clibeanna" -#: builtin/fast-export.c msgid "output full tree for each commit" msgstr "aschur crann iomlán do gach tiomantas" -#: builtin/fast-export.c msgid "use the done feature to terminate the stream" msgstr "úsáid an ghné déanta chun an sruth a fhoirceannadh" -#: builtin/fast-export.c msgid "skip output of blob data" msgstr "scipeáil aschur sonraà blob" -#: builtin/fast-export.c builtin/log.c msgid "refspec" msgstr "refspec" -#: builtin/fast-export.c msgid "apply refspec to exported refs" msgstr "refspec a chur i bhfeidhm ar thaifeanna onnmhair" -#: builtin/fast-export.c msgid "anonymize output" msgstr "aschur gan ainm" -#: builtin/fast-export.c msgid "from:to" msgstr "ó:go" -#: builtin/fast-export.c msgid "convert <from> to <to> in anonymized output" msgstr "tiontaigh <from>go <to>in aschur gan ainm" -#: builtin/fast-export.c msgid "reference parents which are not in fast-export stream by object id" msgstr "" "tuismitheoirà tagartha nach bhfuil i sruth tapa onnmhairithe de réir id réad" -#: builtin/fast-export.c msgid "show original object ids of blobs/commits" msgstr "taispeáin id réad bunaidh de bhlobanna/gealltanna" -#: builtin/fast-export.c msgid "label tags with mark ids" msgstr "clibeanna lipéad le id marc" -#: builtin/fast-import.c #, c-format -msgid "Missing from marks for submodule '%s'" -msgstr "Ar iarraidh ó mharcanna don fho-mhodúl '%s'" +msgid "can't write crash report %s" +msgstr "nà féidir tuarascáil tuairteála %s a scrÃobh" + +#, c-format +msgid "fast-import: dumping crash report to %s\n" +msgstr "allmhairiú-tapa: ag dumpáil tuarascáil tuairteála chuig %s\n" + +#, c-format +msgid "mark :%<PRIuMAX> not declared" +msgstr "marc :%<PRIuMAX> gan dearbhú" + +#, c-format +msgid "invalid attempt to create duplicate branch: %s" +msgstr "iarracht neamhbhailà chun brainse dúblach a chruthú: %s" + +#, c-format +msgid "branch name doesn't conform to Git standards: %s" +msgstr "nà chomhlÃonann ainm na brainse caighdeáin Git: %s" + +msgid "internal consistency error creating the index" +msgstr "earráid chomhsheasmhachta inmheánaà agus an t-innéacs á chruthú" + +msgid "cannot create keep file" +msgstr "nà féidir comhad coimeádta a chruthú" + +msgid "failed to write keep file" +msgstr "theip ar an gcomhad keep a scrÃobh" + +msgid "cannot store pack file" +msgstr "nà féidir comhad an phacáiste a stóráil" + +msgid "cannot store index file" +msgstr "nà féidir comhad innéacs a stóráil" + +#, c-format +msgid "failed seeking to start of '%s'" +msgstr "theip ar chuardach tús '%s'" + +#, c-format +msgid "core Git rejected index %s" +msgstr "innéacs diúltaithe Git lárnach %s" + +msgid "cannot truncate pack to skip duplicate" +msgstr "nà féidir an pacáiste a ghiorrú chun dúblach a scipeáil" + +#, c-format +msgid "EOF in data (%<PRIuMAX> bytes remaining)" +msgstr "EOF sna sonraà (%<PRIuMAX> beart fágtha)" + +#, c-format +msgid "unexpected deflate failure: %d" +msgstr "teip dÃbhoilscithe gan choinne: %d" + +#, c-format +msgid "not a tree: %s" +msgstr "nà crann é: %s" + +#, c-format +msgid "can't load tree %s" +msgstr "nà féidir crann %s a luchtú" + +#, c-format +msgid "corrupt mode in %s" +msgstr "mód truaillithe i %s" + +msgid "root cannot be a non-directory" +msgstr "nà féidir leis an bhfréamh a bheith ina eolaire neamh-eolaire" + +msgid "empty path component found in input" +msgstr "comhpháirt chonair folamh aimsithe san ionchur" + +msgid "non-directories cannot have subtrees" +msgstr "nà féidir fochrainn a bheith ag comhaid nach eolairà iad" + +#, c-format +msgid "dropping %s since it would point to itself (i.e. to %s)" +msgstr "" +"ag fágáil %s ós rud é go mbeadh sé ag pointeáil air féin (i.e. chuig %s)" + +#, c-format +msgid "branch %s is missing commits." +msgstr "tá tiomnuithe ar iarraidh sa bhrainse %s." + +#, c-format +msgid "not updating %s (new tip %s does not contain %s)" +msgstr "gan %s a nuashonrú (nÃl %s sa leid nua %s)" + +#, c-format +msgid "unable to create leading directories of %s" +msgstr "nà féidir eolairà tosaigh %s a chruthú" + +#, c-format +msgid "unable to write marks file %s" +msgstr "nà féidir comhad marcanna %s a scrÃobh" + +#, c-format +msgid "unable to write marks file %s: %s" +msgstr "nà féidir comhad marcanna %s a scrÃobh: %s" + +#, c-format +msgid "unable to write file %s" +msgstr "nà féidir comhad %s a scrÃobh" + +#, c-format +msgid "expected 'data n' command, found: %s" +msgstr "ag súil le hordú 'data n', aimsÃodh: %s" + +#, c-format +msgid "EOF in data (terminator '%s' not found)" +msgstr "EOF sna sonraà (nÃor aimsÃodh an crÃochnóir '%s')" + +msgid "data is too large to use in this context" +msgstr "tá an iomarca sonraà le húsáid sa chomhthéacs seo" + +#, c-format +msgid "EOF in data (%lu bytes remaining)" +msgstr "EOF sna sonraà (%lu bearta fágtha)" + +#, c-format +msgid "missing < in ident string: %s" +msgstr "ar iarraidh < sa teaghrán aitheantais: %s" + +#, c-format +msgid "missing space before < in ident string: %s" +msgstr "spás ar iarraidh roimh < sa teaghrán aitheantais: %s" + +#, c-format +msgid "missing > in ident string: %s" +msgstr "ar iarraidh > sa teaghrán aitheantais: %s" + +#, c-format +msgid "missing space after > in ident string: %s" +msgstr "spás ar iarraidh i ndiaidh > sa teaghrán aitheantais: %s" + +#, c-format +msgid "invalid raw date \"%s\" in ident: %s" +msgstr "dáta amh neamhbhailà \"%s\" san aitheantas: %s" + +#, c-format +msgid "invalid rfc2822 date \"%s\" in ident: %s" +msgstr "dáta rfc2822 neamhbhailà \"%s\" san aitheantas: %s" + +#, c-format +msgid "date in ident must be 'now': %s" +msgstr "nà mór don dáta san aitheantas a bheith 'anois': %s" + +#, c-format +msgid "too large fanout (%u)" +msgstr "ró-mhór lucht leanúna (%u)" + +#, c-format +msgid "failed to remove path %s" +msgstr "theip ar an gcosán %s a bhaint" + +#, c-format +msgid "no value after ':' in mark: %s" +msgstr "gan aon luach i ndiaidh ':' sa mharc: %s" + +#, c-format +msgid "garbage after mark: %s" +msgstr "bruscar i ndiaidh marc: %s" + +#, c-format +msgid "missing space after mark: %s" +msgstr "spás ar iarraidh i ndiaidh an mharc: %s" + +#, c-format +msgid "invalid %s: %s" +msgstr "%s neamhbhailÃ: %s" + +#, c-format +msgid "NUL in %s: %s" +msgstr "NUL i %s: %s" + +#, c-format +msgid "garbage after %s: %s" +msgstr "bruscar i ndiaidh %s: %s" + +#, c-format +msgid "missing space after %s: %s" +msgstr "spás ar iarraidh i ndiaidh %s: %s" + +#, c-format +msgid "corrupt mode: %s" +msgstr "mód truaillithe: %s" + +#, c-format +msgid "invalid dataref: %s" +msgstr "tagairt neamhbhailÃ: %s" + +#, c-format +msgid "missing space after SHA1: %s" +msgstr "spás ar iarraidh i ndiaidh SHA1: %s" + +#, c-format +msgid "Git links cannot be specified 'inline': %s" +msgstr "Nà féidir naisc Git a shonrú 'inlÃne': %s" + +#, c-format +msgid "not a commit (actually a %s): %s" +msgstr "nà tiomantas é (%s i ndáirÃre): %s" + +#, c-format +msgid "directories cannot be specified 'inline': %s" +msgstr "nà féidir eolairà a shonrú 'inlÃne': %s" + +#, c-format +msgid "%s not found: %s" +msgstr "%s gan aimsiú: %s" + +msgid "tree" +msgstr "crann" + +#, c-format +msgid "not a %s (actually a %s): %s" +msgstr "nà %s é (%s i ndáirÃre): %s" + +#, c-format +msgid "path %s not in branch" +msgstr "nÃl an cosán %s sa bhrainse" + +msgid "can't add a note on empty branch." +msgstr "nà féidir nóta a chur ar bhrainse folamh." + +#, c-format +msgid "mark :%<PRIuMAX> not a commit" +msgstr "marc :%<PRIuMAX> nà tiomantas é" + +#, c-format +msgid "not a valid commit: %s" +msgstr "nà tiomantas bailà é: %s" + +#, c-format +msgid "invalid ref name or SHA1 expression: %s" +msgstr "ainm tagartha nó abairt SHA1 neamhbhailÃ: %s" + +#, c-format +msgid "not a blob (actually a %s): %s" +msgstr "nà blob é (%s i ndáirÃre): %s" + +#, c-format +msgid "blob not found: %s" +msgstr "bloba gan aimsiú: %s" + +#, c-format +msgid "the commit %s is corrupt" +msgstr "tá an tiomnú %s truaillithe" + +#, c-format +msgid "can't create a branch from itself: %s" +msgstr "nà féidir brainse a chruthú uaidh féin: %s" + +#, c-format +msgid "" +"expected gpgsig format: 'gpgsig <hash-algo> <signature-format>', got 'gpgsig " +"%s'" +msgstr "" +"an fhormáid gpgsign a bhÃothas ag súil léi: 'gpgsign <hash-algo> <signature-" +"format>', le haghaidh 'gpgsign %s'" + +#, c-format +msgid "unknown git hash algorithm in gpgsig: '%s'" +msgstr "algartam haise git anaithnid i gpgsig: '%s'" + +#, c-format +msgid "invalid signature format in gpgsig: '%s'" +msgstr "formáid shÃnithe neamhbhailà i gpgsig: '%s'" + +msgid "'unknown' signature format in gpgsig" +msgstr "Formáid shÃnithe 'anaithnid' i gpgsig" + +#, c-format +msgid "multiple %s signatures found, ignoring additional signature" +msgstr "aimsithe iolracha %s sÃnithe, ag déanamh neamhaird de shÃnithe breise" + +msgid "parse_one_signature() returned unknown hash algo" +msgstr "d’fhill parse_one_signature() algartam haise anaithnid" + +msgid "expected committer but didn't get one" +msgstr "bhà mé ag súil le gealltóir ach nà bhfuair mé ceann" + +msgid "encountered signed commit; use --signed-commits=<mode> to handle it" +msgstr "" +"tháinig ar thiomantas sÃnithe; bain úsáid as --signed-commits=<mode> chun é " +"a láimhseáil" + +msgid "stripping a commit signature" +msgstr "sÃniú tiomantais a bhaint" + +msgid "importing a commit signature verbatim" +msgstr "sÃniú tiomantais a allmhairiú focal ar fhocal" + +msgid "encountered signed tag; use --signed-tags=<mode> to handle it" +msgstr "" +"bhuail mé le clib shÃnithe; bain úsáid as --signed-tags=<mode> chun é a " +"láimhseáil" + +#, c-format +msgid "importing a tag signature verbatim for tag '%s'" +msgstr "ag allmhairiú sÃniú clibe focal ar fhocal don chlib '%s'" + +#, c-format +msgid "stripping a tag signature for tag '%s'" +msgstr "ag baint sÃniú clibe don chlib '%s'" + +#, c-format +msgid "expected 'from' command, got '%s'" +msgstr "ag súil le hordú 'from', fuarthas '%s'" + +msgid "can't tag an empty branch." +msgstr "nà féidir clib a chur ar bhrainse folamh." + +#, c-format +msgid "not a valid object: %s" +msgstr "nà réad bailÃ: %s" + +msgid "write to frontend failed" +msgstr "theip ar scrÃobh chuig an tosaigh" + +#, c-format +msgid "can't read object %s" +msgstr "nà féidir an réad %s a léamh" + +#, c-format +msgid "object %s is a %s but a blob was expected." +msgstr "is %s é réad %s ach bhÃothas ag súil le blob." + +#, c-format +msgid "not a mark: %s" +msgstr "nà marc é: %s" + +#, c-format +msgid "unknown mark: %s" +msgstr "marc anaithnid: %s" + +#, c-format +msgid "garbage after SHA1: %s" +msgstr "bruscar i ndiaidh SHA1: %s" -#: builtin/fast-import.c #, c-format -msgid "Missing to marks for submodule '%s'" -msgstr "Ar iarraidh marcanna don fho-mhodúl '%s'" +msgid "not a tree-ish: %s" +msgstr "nà cosúil le crann é: %s" -#: builtin/fast-import.c #, c-format -msgid "Expected 'mark' command, got %s" -msgstr "Táthar ag súil leis an ordú 'marc', fuair %s" +msgid "can't load object %s" +msgstr "nà féidir an réad %s a luchtú" -#: builtin/fast-import.c #, c-format -msgid "Expected 'to' command, got %s" -msgstr "Táthar ag súil leis an ordú 'to', fuair %s" +msgid "invalid SHA1 in tag: %s" +msgstr "neamhbhailà SHA1 sa chlib: %s" -#: builtin/fast-import.c -msgid "Expected format name:filename for submodule rewrite option" +#, c-format +msgid "invalid SHA1 in commit: %s" +msgstr "neamhbhailà SHA1 sa tiomnú: %s" + +#, c-format +msgid "missing from marks for submodule '%s'" +msgstr "ar iarraidh ó na marcanna don fho-mhodúl '%s'" + +#, c-format +msgid "missing to marks for submodule '%s'" +msgstr "marcanna ar iarraidh don fho-mhodúl '%s'" + +#, c-format +msgid "missing space after tree-ish: %s" +msgstr "spás ar iarraidh i ndiaidh crann-mhaith: %s" + +#, c-format +msgid "not in a commit: %s" +msgstr "nà i gcóipeadh: %s" + +#, c-format +msgid "expected 'mark' command, got %s" +msgstr "ag súil le hordú 'mark', fuarthas %s" + +#, c-format +msgid "expected 'to' command, got %s" +msgstr "ag súil le hordú 'to', fuaireadh %s" + +msgid "only one import-marks command allowed per stream" msgstr "" -"Ainm formáid a bhfuil súil leis ainm comhaid don rogha athscrÃobh fo-mhodúil" +"nà cheadaÃtear ach ordú amháin marcanna-iompórtála in aghaidh an tsrutha" + +#, c-format +msgid "unknown --date-format argument %s" +msgstr "anaithnid --date-format argóint %s" + +#, c-format +msgid "%s: argument must be a non-negative integer" +msgstr "%s: nà mór don argóint a bheith ina slánuimhir neamh-dhiúltach" + +#, c-format +msgid "--depth cannot exceed %u" +msgstr "--depth nà féidir dul thar %u" + +#, c-format +msgid "--cat-blob-fd cannot exceed %d" +msgstr "--cat-blob-fd nà féidir dul thar %d" + +msgid "expected format name:filename for submodule rewrite option" +msgstr "ainm formáide ionchais: ainm comhaid don rogha athscrÃofa fo-mhodúil" + +#, c-format +msgid "max-pack-size is now in bytes, assuming --max-pack-size=%lum" +msgstr "max-pack-size is now in bytes, assuming --max-pack-size=%lum" + +msgid "minimum max-pack-size is 1 MiB" +msgstr "is é 1 MiB an méid uasta Ãosta sa phacáiste" + +#, c-format +msgid "unknown --signed-commits mode '%s'" +msgstr "anaithnid --signed-commits mód '%s'" + +#, c-format +msgid "unknown --signed-tags mode '%s'" +msgstr "mód anaithnid --signed-tags '%s'" -#: builtin/fast-import.c #, c-format msgid "feature '%s' forbidden in input without --allow-unsafe-features" msgstr "feature '%s' forbidden in input without --allow-unsafe-features" -#: builtin/fetch-pack.c +#, c-format +msgid "got feature command '%s' after data command" +msgstr "fuair an t-ordú gné '%s' i ndiaidh an ordaithe sonraÃ" + +#, c-format +msgid "this version of fast-import does not support feature %s." +msgstr "nà thacaÃonn an leagan seo de thapa-iompórtáil leis an ngné %s." + +#, c-format +msgid "got option command '%s' after data command" +msgstr "fuair mé an rogha '%s' i ndiaidh an ordaithe sonraÃ" + +#, c-format +msgid "this version of fast-import does not support option: %s" +msgstr "nà thacaÃonn an leagan seo de thapa-iompórtáil leis an rogha: %s" + +#, c-format +msgid "unknown option %s" +msgstr "rogha anaithnid %s" + +#, c-format +msgid "unknown option --%s" +msgstr "rogha anaithnid --%s" + +#, c-format +msgid "unsupported command: %s" +msgstr "ordú gan tacaÃocht: %s" + +msgid "stream ends early" +msgstr "crÃochnaÃonn an sruth go luath" + #, c-format msgid "Lockfile created but not reported: %s" msgstr "CruthaÃodh comhad Lockfile ach nár tuairiscigh: %s" -#: builtin/fetch.c msgid "git fetch [<options>] [<repository> [<refspec>...]]" msgstr "git fetch [<options>] [<repository> [<refspec>...]]" -#: builtin/fetch.c msgid "git fetch [<options>] <group>" msgstr "git fetch [<options>] <group>" -#: builtin/fetch.c msgid "git fetch --multiple [<options>] [(<repository> | <group>)...]" msgstr "git fetch --multiple [<options>] [(<repository> | <group>)...]" -#: builtin/fetch.c msgid "git fetch --all [<options>]" msgstr "git fetch --all [<options>]" -#: builtin/fetch.c msgid "fetch.parallel cannot be negative" msgstr "nà féidir fetch.parallel a bheith diúltach" -#: builtin/fetch.c msgid "couldn't find remote ref HEAD" msgstr "nà raibh in ann ciantagartha HEAD a fháil" -#: builtin/fetch.c #, c-format msgid "From %.*s\n" msgstr "Ó %.*s\n" -#: builtin/fetch.c #, c-format msgid "object %s not found" msgstr "nÃor aimsÃodh réad %s" -#: builtin/fetch.c msgid "[up to date]" msgstr "[cothrom le dáta]" -#: builtin/fetch.c msgid "[rejected]" msgstr "[diúltaithe]" -#: builtin/fetch.c msgid "can't fetch into checked-out branch" msgstr "nà féidir teacht isteach i mbrainse seiceáilte" -#: builtin/fetch.c msgid "[tag update]" msgstr "[Nuashonrú tag]" -#: builtin/fetch.c msgid "unable to update local ref" -msgstr "in ann tagairt áitiúil a nuashonrú" +msgstr "nà féidir tagairt áitiúil a nuashonrú" -#: builtin/fetch.c msgid "would clobber existing tag" msgstr "chuirfeadh an chlib atá ann cheana" -#: builtin/fetch.c msgid "[new tag]" msgstr "[tag nua]" -#: builtin/fetch.c msgid "[new branch]" msgstr "[brainse nua]" -#: builtin/fetch.c msgid "[new ref]" msgstr "[tagartha nua]" -#: builtin/fetch.c msgid "forced update" msgstr "nuashonrú éigeant" -#: builtin/fetch.c msgid "non-fast-forward" msgstr "neamh-tapa ar aghaidh" -#: builtin/fetch.c builtin/grep.c sequencer.c #, c-format msgid "cannot open '%s'" msgstr "nà féidir '%s' a oscailt" -#: builtin/fetch.c msgid "" "fetch normally indicates which branches had a forced update,\n" "but that check has been disabled; to re-enable, use '--show-forced-updates'\n" @@ -7595,7 +6670,6 @@ msgstr "" "forced-updates'\n" "bratach nó rith 'git config fetch.showForcedUpdates true'" -#: builtin/fetch.c #, c-format msgid "" "it took %.2f seconds to check forced updates; you can use\n" @@ -7609,69 +6683,40 @@ msgstr "" "bréaga'\n" "chun an seiceáil seo a sheachaint\n" -#: builtin/fetch.c #, c-format msgid "%s did not send all necessary objects" msgstr "NÃor sheol %s na rudaà riachtanacha go léir" -#: builtin/fetch.c #, c-format msgid "rejected %s because shallow roots are not allowed to be updated" msgstr "dhiúltaigh %s toisc nach gceadaÃtear fréamhacha éadmhara a nuashonrú" -#: builtin/fetch.c -#, c-format -msgid "" -"some local refs could not be updated; try running\n" -" 'git remote prune %s' to remove any old, conflicting branches" -msgstr "" -"nà fhéadfaà roinnt fios áitiúla a nuashonrú; déan iarracht rith\n" -" 'git remote prune%s' chun aon bhrainsà sean-fhrithsheasmhach a bhaint" - -#: builtin/fetch.c -#, c-format -msgid " (%s will become dangling)" -msgstr " (beidh %s ag crochadh)" - -#: builtin/fetch.c -#, c-format -msgid " (%s has become dangling)" -msgstr " (%s has become dangling)" - -#: builtin/fetch.c msgid "[deleted]" msgstr "[scriosta]" -#: builtin/fetch.c builtin/remote.c msgid "(none)" msgstr "(nÃl aon)" -#: builtin/fetch.c #, c-format msgid "refusing to fetch into branch '%s' checked out at '%s'" msgstr "ag diúltú teacht isteach i mbrainse '%s' a sheiceáil amach ag '%s'" -#: builtin/fetch.c #, c-format msgid "option \"%s\" value \"%s\" is not valid for %s" msgstr "nÃl an rogha “%s†luach “%s†bailà do %s" -#: builtin/fetch.c #, c-format msgid "option \"%s\" is ignored for %s" msgstr "déantar neamhaird ar rogha “%s†do %s" -#: builtin/fetch.c object-store.c #, c-format msgid "%s is not a valid object" msgstr "Nà réad bailà é %s" -#: builtin/fetch.c #, c-format msgid "the object %s does not exist" msgstr "nÃl an réad %s ann" -#: builtin/fetch.c #, c-format msgid "" "Run 'git remote set-head %s %s' to follow the change, or set\n" @@ -7688,11 +6733,54 @@ msgstr "" "dÃchumasófar an rabhadh go dtà go n-athraÃonn an cianda HEAD go rud éigin " "eile." -#: builtin/fetch.c +msgid "" +"You're on a case-insensitive filesystem, and the remote you are\n" +"trying to fetch from has references that only differ in casing. It\n" +"is impossible to store such references with the 'files' backend. You\n" +"can either accept this as-is, in which case you won't be able to\n" +"store all remote references on disk. Or you can alternatively\n" +"migrate your repository to use the 'reftable' backend with the\n" +"following command:\n" +"\n" +" git refs migrate --ref-format=reftable\n" +"\n" +"Please keep in mind that not all implementations of Git support this\n" +"new format yet. So if you use tools other than Git to access this\n" +"repository it may not be an option to migrate to reftables.\n" +msgstr "" +"Tá tú ar chóras comhad neamhÃogair ó thaobh cás de, agus tá tagairtà sa " +"chianrialtán a bhfuil tú\n" +"ag iarraidh a fháil uaidh nach bhfuil ach difrÃocht idir iad ó thaobh cás " +"de. NÃ\n" +"bhfuil sé indéanta tagairtà den sórt sin a stóráil leis an gcúlra 'comhaid'. " +"Is féidir leat\n" +"seo a ghlacadh mar atá, agus sa chás sin nà bheidh tú in ann\n" +"gach tagairt chianrialtán a stóráil ar dhiosca. Nó is féidir leat\n" +"do stór a aistriú chun an cúlra 'reftable' a úsáid leis an\n" +"ordú seo a leanas:\n" +"\n" +"git refs migrate --ref-format=reftable\n" +"\n" +"Coinnigh i gcuimhne nach dtacaÃonn gach cur i bhfeidhm de Git leis an\n" +"formáid nua seo go fóill. Mar sin, mura n-úsáideann tú uirlisà seachas Git " +"chun rochtain a fháil ar an\n" +"stórra seo, b'fhéidir nach rogha é aistriú chuig reftables.\n" + +#, c-format +msgid "" +"some local refs could not be updated; try running\n" +" 'git remote prune %s' to remove any old, conflicting branches" +msgstr "" +"nà fhéadfaà roinnt fios áitiúla a nuashonrú; déan iarracht rith\n" +" 'git remote prune%s' chun aon bhrainsà sean-fhrithsheasmhach a bhaint" + +#, c-format +msgid "fetching ref %s failed: %s" +msgstr "theip ar an tagairt %s a fháil: %s" + msgid "multiple branches detected, incompatible with --set-upstream" msgstr "brainsà iolracha brainsà braite, gan oiriúint le --set-upstream" -#: builtin/fetch.c #, c-format msgid "" "could not set upstream of HEAD to '%s' from '%s' when it does not point to " @@ -7701,19 +6789,15 @@ msgstr "" "nà fhéadfaà suas sruth de HEAD a shocrú go '%s' ó '%s' nuair nach dtugann sé " "in iúl go dtà aon bhrainse." -#: builtin/fetch.c msgid "not setting upstream for a remote remote-tracking branch" msgstr "gan socrú suas sruth do bhrainse cianrianaithe" -#: builtin/fetch.c msgid "not setting upstream for a remote tag" msgstr "gan a shocrú suas sruth le haghaidh clib iargúlta" -#: builtin/fetch.c msgid "unknown branch type" msgstr "cineál brainse anaithnid" -#: builtin/fetch.c msgid "" "no source branch found;\n" "you need to specify exactly one branch with the --set-upstream option" @@ -7721,22 +6805,18 @@ msgstr "" "nà bhfuarthas aon bhrainse foinse;\n" "nà mór duit brainse amháin a shonrú go dÃreach leis an rogha --set-upstream" -#: builtin/fetch.c #, c-format msgid "Fetching %s\n" msgstr "Ag tarraingt %s\n" -#: builtin/fetch.c #, c-format msgid "could not fetch %s" msgstr "nà fhéadfaà %s a fháil" -#: builtin/fetch.c #, c-format msgid "could not fetch '%s' (exit code: %d)\n" msgstr "nÃorbh fhéidir '%s' a fháil (cód scoir: %d)\n" -#: builtin/fetch.c msgid "" "no remote repository specified; please specify either a URL or a\n" "remote name from which new revisions should be fetched" @@ -7744,105 +6824,80 @@ msgstr "" "nÃl aon stór iargúlta sonraithe; sonraigh URL nó a\n" "ainm iargúlta ar chóir athbhreithnithe nua a fháil" -#: builtin/fetch.c msgid "you need to specify a tag name" msgstr "nà mór duit ainm clib a shonrú" -#: builtin/fetch.c builtin/pull.c msgid "fetch from all remotes" msgstr "faigh ó gach iargúlta" -#: builtin/fetch.c builtin/pull.c msgid "set upstream for git pull/fetch" msgstr "socraigh suas sruth le haghaidh git pull/fetch" -#: builtin/fetch.c builtin/pull.c msgid "append to .git/FETCH_HEAD instead of overwriting" msgstr "cuir chuig .git/FETCH_HEAD in ionad athscrÃobh" -#: builtin/fetch.c msgid "use atomic transaction to update references" msgstr "úsáid idirbheart adamach chun tagairtà a nuashonrú" -#: builtin/fetch.c builtin/pull.c msgid "path to upload pack on remote end" msgstr "cosán chun pacáiste a uaslódáil ar iargúlta" -#: builtin/fetch.c msgid "force overwrite of local reference" msgstr "tagairt áitiúil a fhorscrÃobh" -#: builtin/fetch.c msgid "fetch from multiple remotes" msgstr "a fháil ó iomadúla iargúlta" -#: builtin/fetch.c builtin/pull.c msgid "fetch all tags and associated objects" msgstr "gach clib agus rudaà gaolmhara a fháil" -#: builtin/fetch.c msgid "do not fetch all tags (--no-tags)" msgstr "ná faigh gach clib (--no-tags)" -#: builtin/fetch.c msgid "number of submodules fetched in parallel" msgstr "lÃon na bhfo-mhodúil a fuarthas go comhthreomhar" -#: builtin/fetch.c msgid "modify the refspec to place all refs within refs/prefetch/" msgstr "an refspec a mhodhnú chun gach refs a chur laistigh de refs/prefetch/" -#: builtin/fetch.c builtin/pull.c msgid "prune remote-tracking branches no longer on remote" msgstr "brainsà cianrianaithe a ghearradh nach bhfuil ar iargúlta a" -#: builtin/fetch.c msgid "prune local tags no longer on remote and clobber changed tags" msgstr "" "clibeanna áitiúla a ghearradh nach bhfuil ar chlibeanna iargúlta agus " "athraithe clobber" -#: builtin/fetch.c builtin/pull.c msgid "on-demand" msgstr "ar éileamh" -#: builtin/fetch.c msgid "control recursive fetching of submodules" msgstr "tógáil athfhillteach fo-mhodúil a rialú" -#: builtin/fetch.c msgid "write fetched references to the FETCH_HEAD file" msgstr "scrÃobh tagairtà faighte don chomhad FETCH_HEAD" -#: builtin/fetch.c builtin/pull.c msgid "keep downloaded pack" msgstr "pacáiste Ãoslódáilte" -#: builtin/fetch.c msgid "allow updating of HEAD ref" msgstr "cead a thabhairt do nuashonrú HEAD ref" -#: builtin/fetch.c builtin/pull.c msgid "deepen history of shallow clone" msgstr "stair clón éadomhain a dhoimhniú" -#: builtin/fetch.c builtin/pull.c msgid "deepen history of shallow repository based on time" msgstr "stair stór éadomhain a dhoimhniú bunaithe ar am" -#: builtin/fetch.c builtin/pull.c msgid "convert to a complete repository" msgstr "tiontaigh go stór iomlán" -#: builtin/fetch.c msgid "re-fetch without negotiating common commits" msgstr "athghabháil gan gealltanais choiteanna a chaibidliú" -#: builtin/fetch.c msgid "prepend this to submodule path output" msgstr "é seo a chur ar aghaidh chuig aschur cosán fo-mhodúil" -#: builtin/fetch.c msgid "" "default for recursive fetching of submodules (lower priority than config " "files)" @@ -7850,92 +6905,71 @@ msgstr "" "réamhshocraithe maidir le fo-mhodúil a fháil athshlánach (tosaÃocht nÃos " "Ãsle ná comhaid chumraithe)" -#: builtin/fetch.c builtin/pull.c msgid "accept refs that update .git/shallow" msgstr "glacadh le hiarrachtaà a nuashonraÃonn .git/shalach" -#: builtin/fetch.c builtin/pull.c msgid "refmap" msgstr "athléarscáil" -#: builtin/fetch.c builtin/pull.c msgid "specify fetch refmap" msgstr "sonraigh refmap a fháil" -#: builtin/fetch.c builtin/pull.c builtin/rebase.c builtin/replay.c msgid "revision" msgstr "athbhreithiú" -#: builtin/fetch.c builtin/pull.c msgid "report that we have only objects reachable from this object" msgstr "tuairisciú nach bhfuil ach rudaà inrochtana againn ón réad seo" -#: builtin/fetch.c msgid "do not fetch a packfile; instead, print ancestors of negotiation tips" msgstr "" "ná faigh comhad pacáiste; ina ionad sin, priontáil sinsear leideanna " "idirbheartaÃochta" -#: builtin/fetch.c msgid "run 'maintenance --auto' after fetching" msgstr "reáchtáil 'cothabháil --auto' tar éis a fháil" -#: builtin/fetch.c builtin/pull.c msgid "check for forced-updates on all updated branches" msgstr "seiceáil ar nuashonruithe éigeantacha ar gach brainse nuashonraithe" -#: builtin/fetch.c msgid "write the commit-graph after fetching" msgstr "scrÃobh an graf coimisiúnaithe tar éis a fháil" -#: builtin/fetch.c msgid "accept refspecs from stdin" msgstr "glacadh le refspecs ó stdin" -#: builtin/fetch.c msgid "--negotiate-only needs one or more --negotiation-tip=*" msgstr "" "--negotiate-only teastaÃonn ceann amháin nó nÃos mó --negotiation-tip=*" -#: builtin/fetch.c msgid "negative depth in --deepen is not supported" msgstr "nà thacaÃtear le doimhneacht dhiúltach i --deepen" -#: builtin/fetch.c msgid "--unshallow on a complete repository does not make sense" msgstr "nÃl ciall le --unshallow ar stórlann iomlán" -#: builtin/fetch.c #, c-format msgid "failed to fetch bundles from '%s'" msgstr "theip ar bhaclaà a fháil ó '%s'" -#: builtin/fetch.c msgid "fetch --all does not take a repository argument" msgstr "nà ghlacann fetch --all argóint stór" -#: builtin/fetch.c msgid "fetch --all does not make sense with refspecs" msgstr "nà bhÃonn ciall ag teacht --all le refspecs" -#: builtin/fetch.c #, c-format msgid "no such remote or remote group: %s" msgstr "gan aon ghrúpa iargúlta nó cianda den sórt sin: %s" -#: builtin/fetch.c msgid "fetching a group and specifying refspecs does not make sense" msgstr "nÃl ciall grúpa a fháil agus refspecs a shonrú" -#: builtin/fetch.c msgid "must supply remote when using --negotiate-only" msgstr "nà mór iargúlta a sholáthar agus tú ag úsáid --negotiate-only" -#: builtin/fetch.c msgid "protocol does not support --negotiate-only, exiting" msgstr "nà thacaÃonn an prótacal le --negotiate-only, ag scoir" -#: builtin/fetch.c msgid "" "--filter can only be used with the remote configured in " "extensions.partialclone" @@ -7943,170 +6977,134 @@ msgstr "" "--filter Nà féidir ach an scagaire a úsáid ach leis an iargúlta cumraithe in " "extensions.partialclone" -#: builtin/fetch.c msgid "--atomic can only be used when fetching from one remote" msgstr "" "--atomic nà féidir ach adamhach a úsáid ach amháin nuair a bhÃonn sé á fháil " "ó chianrialtán amháin" -#: builtin/fetch.c msgid "--stdin can only be used when fetching from one remote" msgstr "" "Nà féidir --stdin a úsáid ach amháin nuair a bhfaightear é ó iargúlta amháin" -#: builtin/fmt-merge-msg.c msgid "" "git fmt-merge-msg [-m <message>] [--log[=<n>] | --no-log] [--file <file>]" msgstr "" -"<n><file>git fmt-merge-msg [-m<message>] [--log [=] | --no-log] [--comhad]" +"git fmt-merge-msg [-m <message>] [--log[=<n>] | --no-log] [--file <file>]" -#: builtin/fmt-merge-msg.c msgid "populate log with at most <n> entries from shortlog" msgstr "logáil a chomhlánú le hiontrálacha is mó <n>ó ghearrlog" -#: builtin/fmt-merge-msg.c msgid "alias for --log (deprecated)" msgstr "alias le haghaidh --log (mÃsheasmhach)" -#: builtin/fmt-merge-msg.c msgid "text" msgstr "téacs" -#: builtin/fmt-merge-msg.c msgid "use <text> as start of message" msgstr "úsáid <text> mar thús na teachtaireachta" -#: builtin/fmt-merge-msg.c msgid "use <name> instead of the real target branch" msgstr "úsáid in <name> ionad na fÃor-spriocbhrainse" -#: builtin/fmt-merge-msg.c msgid "file to read from" msgstr "comhad le léamh ó" -#: builtin/for-each-ref.c -msgid "git for-each-ref [<options>] [<pattern>]" -msgstr "git for-each-ref [<options>] [<pattern>]" - -#: builtin/for-each-ref.c -msgid "git for-each-ref [--points-at <object>]" -msgstr "git for-each-ref [--points-at <object>]" - -#: builtin/for-each-ref.c -msgid "git for-each-ref [--merged [<commit>]] [--no-merged [<commit>]]" -msgstr "git for-each-ref [--merged [<commit>]] [--no-merged [<commit>]]" - -#: builtin/for-each-ref.c -msgid "git for-each-ref [--contains [<commit>]] [--no-contains [<commit>]]" -msgstr "git for-each-ref [--contains [<commit>]] [--no-contains [<commit>]]" - -#: builtin/for-each-ref.c msgid "quote placeholders suitably for shells" msgstr "sealbhóirà áiteanna a luachan go oiriúnach do" -#: builtin/for-each-ref.c msgid "quote placeholders suitably for perl" msgstr "sealbhóirà áiteanna a luachan go oiriúnach do perl" -#: builtin/for-each-ref.c msgid "quote placeholders suitably for python" msgstr "sealbhóirà áiteanna a luaigh go oiriúnach do python" -#: builtin/for-each-ref.c msgid "quote placeholders suitably for Tcl" msgstr "sealbhóirà áiteanna a luachan go oiriúnach do Tcl" -#: builtin/for-each-ref.c msgid "show only <n> matched refs" msgstr "taispeáin ach sonraà com <n>hoiriúnaithe" -#: builtin/for-each-ref.c builtin/tag.c +msgid "marker" +msgstr "marcóir" + +msgid "start iteration after the provided marker" +msgstr "tosú athrá tar éis an mharcóra a cuireadh ar fáil" + msgid "respect format colors" msgstr "meas dathanna formáid" -#: builtin/for-each-ref.c msgid "print only refs which points at the given object" msgstr "nà phriontáil ach téacsanna a phointÃonn ar an réad a thugtar" -#: builtin/for-each-ref.c msgid "print only refs that are merged" msgstr "nà phriontáil ach scrÃbhneoireachtaà atá cumasaithe" -#: builtin/for-each-ref.c msgid "print only refs that are not merged" msgstr "priontáil ach scrÃbhinnà nach bhfuil cumasc" -#: builtin/for-each-ref.c msgid "print only refs which contain the commit" msgstr "nà phriontáil ach téifeanna ina bhfuil an tiomantas" -#: builtin/for-each-ref.c msgid "print only refs which don't contain the commit" msgstr "nà phriontáil ach scrÃbhneoirà nach bhfuil an tiomantas" -#: builtin/for-each-ref.c msgid "read reference patterns from stdin" msgstr "léigh patrúin tagartha ó stdin" -#: builtin/for-each-ref.c msgid "also include HEAD ref and pseudorefs" msgstr "san áireamh freisin HEAD ref agus pseudorefs" -#: builtin/for-each-ref.c +msgid "cannot use --start-after with custom sort options" +msgstr "nà féidir --start-after a úsáid le roghanna sórtála saincheaptha" + msgid "unknown arguments supplied with --stdin" msgstr "argóintà anaithnid a sholáthraÃtear le --stdin" -#: builtin/for-each-repo.c +msgid "cannot use --start-after with patterns" +msgstr "nà féidir --start-after a úsáid le patrúin" + +msgid "git for-each-ref " +msgstr "git for-each-ref " + msgid "git for-each-repo --config=<config> [--] <arguments>" msgstr "git for-each-repo --config=<config> [--] <arguments>" -#: builtin/for-each-repo.c msgid "config" msgstr "cumraÃocht" -#: builtin/for-each-repo.c msgid "config key storing a list of repository paths" msgstr "eochair chumraithe a stóráil liosta de chosáin stórais" -#: builtin/for-each-repo.c msgid "keep going even if command fails in a repository" msgstr "coinnigh ort fiú má theipeann an t-ordú i stóras" -#: builtin/for-each-repo.c msgid "missing --config=<config>" msgstr "ar iarraidh --config=<config>" -#: builtin/for-each-repo.c #, c-format msgid "got bad config --config=%s" -msgstr "fuair go dona cumraÃocht --config=%s" +msgstr "fuair cumraÃocht go dona --config=%s" -#: builtin/fsck.c msgid "unknown" msgstr "anaithnid" #. TRANSLATORS: e.g. error in tree 01bfda: <more explanation> -#: builtin/fsck.c #, c-format msgid "error in %s %s: %s" msgstr "earráid i %s %s: %s" #. TRANSLATORS: e.g. warning in tree 01bfda: <more explanation> -#: builtin/fsck.c #, c-format msgid "warning in %s %s: %s" msgstr "rabhadh i %s %s: %s" -#: builtin/fsck.c #, c-format msgid "broken link from %7s %s" msgstr "nasc briste ó %7s %s" -#: builtin/fsck.c msgid "wrong object type in link" msgstr "cineál réad mÃcheart i nasc" -#: builtin/fsck.c #, c-format msgid "" "broken link from %7s %s\n" @@ -8115,185 +7113,146 @@ msgstr "" "nasc briste ó %7s %s\n" " chuig %7s %s" -#: builtin/fsck.c builtin/prune.c connected.c msgid "Checking connectivity" msgstr "Nascacht a sheiceáil" -#: builtin/fsck.c #, c-format msgid "missing %s %s" msgstr "%s %s ar iarraidh" -#: builtin/fsck.c #, c-format msgid "unreachable %s %s" msgstr "%s %s neamh-inrochtana" -#: builtin/fsck.c #, c-format msgid "dangling %s %s" msgstr "ag crochadh %s %s" -#: builtin/fsck.c msgid "could not create lost-found" msgstr "nà fhéadfaà a chruthú a aimsÃodh caillte" -#: builtin/fsck.c builtin/gc.c builtin/rebase.c rebase-interactive.c rerere.c -#: sequencer.c #, c-format msgid "could not write '%s'" msgstr "nà fhéadfaà '%s' a scrÃobh" -#: builtin/fsck.c #, c-format msgid "could not finish '%s'" msgstr "nà raibh '%s' in ann a chrÃochnú" -#: builtin/fsck.c #, c-format msgid "Checking %s" msgstr "Seiceáil %s" -#: builtin/fsck.c #, c-format msgid "Checking connectivity (%d objects)" msgstr "Ag seiceáil nascachta (%d réad)" -#: builtin/fsck.c #, c-format msgid "Checking %s %s" msgstr "Seiceáil %s %s" -#: builtin/fsck.c msgid "broken links" msgstr "naisc briste" -#: builtin/fsck.c #, c-format msgid "root %s" msgstr "fréamh %s" -#: builtin/fsck.c #, c-format msgid "tagged %s %s (%s) in %s" msgstr "clib %s %s (%s) i %s" -#: builtin/fsck.c #, c-format msgid "%s: object corrupt or missing" msgstr "%s: réad truaillithe nó ar iarraidh" -#: builtin/fsck.c #, c-format msgid "%s: invalid reflog entry %s" msgstr "%s: iontráil reflog neamhbhailà %s" -#: builtin/fsck.c #, c-format msgid "Checking reflog %s->%s" msgstr "Seiceáil reflog %s->%s" -#: builtin/fsck.c #, c-format msgid "%s: invalid sha1 pointer %s" msgstr "%s: pointeoir sha1 neamhbhailà %s" -#: builtin/fsck.c #, c-format msgid "%s: not a commit" msgstr "%s: nà gealltanas" -#: builtin/fsck.c msgid "notice: No default references" msgstr "fógra: Gan aon tagairtà réamhshocraithe" -#: builtin/fsck.c #, c-format msgid "%s: hash-path mismatch, found at: %s" msgstr "%s: mÃchomhoiriúnú hash-path, le fáil ag: %s" -#: builtin/fsck.c #, c-format msgid "%s: object corrupt or missing: %s" msgstr "%s: réad truaillithe nó ar iarraidh: %s" -#: builtin/fsck.c #, c-format msgid "%s: object could not be parsed: %s" msgstr "%s: nà fhéadfaà réad a pháirseáil: %s" -#: builtin/fsck.c #, c-format msgid "bad sha1 file: %s" msgstr "comhad sha1 olc: %s" -#: builtin/fsck.c msgid "Checking object directory" msgstr "Seiceáil eolaire réada" -#: builtin/fsck.c msgid "Checking object directories" msgstr "Seiceáil eolairà réada" -#: builtin/fsck.c #, c-format msgid "Checking %s link" msgstr "Nasc %s a sheiceáil" -#: builtin/fsck.c builtin/index-pack.c #, c-format msgid "invalid %s" msgstr "%s neamhbhailÃ" -#: builtin/fsck.c #, c-format msgid "%s points to something strange (%s)" msgstr "LéirÃonn %s rud éigin aisteach (%s)" -#: builtin/fsck.c #, c-format msgid "%s: detached HEAD points at nothing" msgstr "%s: pointà HEAD scoite ag aon rud" -#: builtin/fsck.c #, c-format msgid "notice: %s points to an unborn branch (%s)" msgstr "fógra: DÃrÃonn %s chuig brainse neamhbhreithe (%s)" -#: builtin/fsck.c #, c-format msgid "Checking cache tree of %s" msgstr "Crann taisce de %s a sheiceáil" -#: builtin/fsck.c #, c-format msgid "%s: invalid sha1 pointer in cache-tree of %s" msgstr "%s: pointeoir sha1 neamhbhailà i gcrann cache-%s" -#: builtin/fsck.c msgid "non-tree in cache-tree" msgstr "neamh-chrann i gcrann cache-" -#: builtin/fsck.c #, c-format msgid "%s: invalid sha1 pointer in resolve-undo of %s" msgstr "%s: pointeoir sha1 neamhbhailà i réiteach a chealú de %s" -#: builtin/fsck.c #, c-format msgid "unable to load rev-index for pack '%s'" -msgstr "in ann innéacs rev-innéacs a luchtú do phacáiste '%s'" +msgstr "nà féidir innéacs athbhreithnithe a luchtú don phacáiste '%s'" -#: builtin/fsck.c #, c-format msgid "invalid rev-index for pack '%s'" msgstr "innéacs rev-neamhbhailà do phacáiste '%s'" -#: builtin/fsck.c msgid "Checking ref database" msgstr "Seiceáil bunachar sonraà tagairt" -#: builtin/fsck.c msgid "" "git fsck [--tags] [--root] [--unreachable] [--cache] [--no-reflogs]\n" " [--[no-]full] [--strict] [--verbose] [--lost-found]\n" @@ -8305,209 +7264,162 @@ msgstr "" " [-- [gan-] ag crochadh] [-- [gan-] dul chun cinn] [--nascacht amháin]\n" " <object>[-- [no-] ainm-rudaÃ] [-- [aon-] tagairtÃ] [...]" -#: builtin/fsck.c msgid "show unreachable objects" msgstr "taispeáint rudaà dochreidte" -#: builtin/fsck.c msgid "show dangling objects" msgstr "taispeáin rudaà crochtanacha" -#: builtin/fsck.c msgid "report tags" msgstr "clibeanna tuarascála" -#: builtin/fsck.c msgid "report root nodes" msgstr "nóid fréimhe a thuairisc" -#: builtin/fsck.c msgid "make index objects head nodes" msgstr "nóid ceann rudaà innéacs a dhéanamh" -#: builtin/fsck.c msgid "make reflogs head nodes (default)" msgstr "nóid ceann reflogs a dhéanamh (réamhshocraithe)" -#: builtin/fsck.c msgid "also consider packs and alternate objects" msgstr "smaoinigh freisin ar phacáistà agus rudaÃ" -#: builtin/fsck.c msgid "check only connectivity" msgstr "seiceáil ach nascacht" -#: builtin/fsck.c builtin/mktag.c msgid "enable more strict checking" msgstr "cumasú seiceáil nÃos docht" -#: builtin/fsck.c msgid "write dangling objects in .git/lost-found" msgstr "scrÃobh rudaà crochta in .git/lost-found" -#: builtin/fsck.c builtin/prune.c msgid "show progress" msgstr "taispeáin dul chun cinn" -#: builtin/fsck.c msgid "show verbose names for reachable objects" msgstr "taispeáint ainmneacha fabhracha do rudaà inrochtana" -#: builtin/fsck.c msgid "check reference database consistency" msgstr "seiceáil comhsheasmhacht bunachair" -#: builtin/fsck.c builtin/index-pack.c msgid "Checking objects" msgstr "Rud a sheiceáil" -#: builtin/fsck.c #, c-format msgid "%s: object missing" msgstr "%s: réad ar iarraidh" -#: builtin/fsck.c #, c-format msgid "invalid parameter: expected sha1, got '%s'" msgstr "paraiméadar neamhbhailÃ: súil le sha1, fuair '%s'" -#: builtin/fsmonitor--daemon.c msgid "git fsmonitor--daemon start [<options>]" msgstr "git fsmonitor--daemon start [<options>]" -#: builtin/fsmonitor--daemon.c msgid "git fsmonitor--daemon run [<options>]" msgstr "git fsmonitor--daemon run [<options>]" -#: builtin/fsmonitor--daemon.c #, c-format msgid "value of '%s' out of range: %d" msgstr "luach '%s' lasmuigh den raon: %d" -#: builtin/fsmonitor--daemon.c #, c-format msgid "value of '%s' not bool or int: %d" msgstr "luach '%s' gan bool nó int: %d" -#: builtin/fsmonitor--daemon.c #, c-format msgid "fsmonitor-daemon is watching '%s'\n" msgstr "tá fsmonitor-daemon ag féachaint ar '%s'\n" -#: builtin/fsmonitor--daemon.c #, c-format msgid "fsmonitor-daemon is not watching '%s'\n" msgstr "nÃl fsmonitor-daemon ag féachaint ar '%s'\n" -#: builtin/fsmonitor--daemon.c #, c-format msgid "could not create fsmonitor cookie '%s'" msgstr "nà fhéadfaà fianán fsmonitor '%s' a chruthú" -#: builtin/fsmonitor--daemon.c #, c-format msgid "fsmonitor: cookie_result '%d' != SEEN" msgstr "fsmonitor: cookie_result '%d' != SEEN" -#: builtin/fsmonitor--daemon.c #, c-format msgid "could not start IPC thread pool on '%s'" msgstr "nà fhéadfaà linn snáithe IPC a thosú ar '%s'" -#: builtin/fsmonitor--daemon.c msgid "could not start fsmonitor listener thread" msgstr "nà fhéadfaà snáithe éisteora fsmonitor a thosú" -#: builtin/fsmonitor--daemon.c msgid "could not start fsmonitor health thread" msgstr "nà fhéadfaà snáithe sláinte fsmonitor a thosú" -#: builtin/fsmonitor--daemon.c msgid "could not initialize listener thread" msgstr "nà fhéadfadh snáithe éisteora a thionscnamh" -#: builtin/fsmonitor--daemon.c msgid "could not initialize health thread" msgstr "nà fhéadfaà snáithe sláinte a thionscnamh" -#: builtin/fsmonitor--daemon.c #, c-format msgid "could not cd home '%s'" msgstr "nà fhéadfaà cd baile '%s'" -#: builtin/fsmonitor--daemon.c #, c-format msgid "fsmonitor--daemon is already running '%s'" msgstr "tá fsmonitor--daemon ag rith '%s' cheana féin" -#: builtin/fsmonitor--daemon.c #, c-format msgid "running fsmonitor-daemon in '%s'\n" msgstr "ag rith fsmonitor-daemon i '%s'\n" -#: builtin/fsmonitor--daemon.c #, c-format msgid "starting fsmonitor-daemon in '%s'\n" msgstr "ag tosú fsmonitor-daemon i '%s'\n" -#: builtin/fsmonitor--daemon.c msgid "daemon failed to start" msgstr "theip ar daemon a thosú" -#: builtin/fsmonitor--daemon.c msgid "daemon not online yet" msgstr "daemon nach bhfuil ar lÃne fós" -#: builtin/fsmonitor--daemon.c msgid "daemon terminated" msgstr "deireadh le déemon" -#: builtin/fsmonitor--daemon.c msgid "detach from console" msgstr "dÃcheangal ón gconsól" -#: builtin/fsmonitor--daemon.c msgid "use <n> ipc worker threads" msgstr "úsáid snái <n>theanna oibrithe ipc" -#: builtin/fsmonitor--daemon.c msgid "max seconds to wait for background daemon startup" msgstr "soicind uasta chun fanacht le tosú daemon cúlra" -#: builtin/fsmonitor--daemon.c #, c-format msgid "invalid 'ipc-threads' value (%d)" msgstr "luach 'ipc-snáitheanna' neamhbhailà (%d)" -#: builtin/fsmonitor--daemon.c t/helper/test-cache-tree.c #, c-format msgid "Unhandled subcommand '%s'" msgstr "Foordú neamh-láimhseáilte '%s'" -#: builtin/fsmonitor--daemon.c msgid "fsmonitor--daemon not supported on this platform" msgstr "fsmonitor--daemon nach dtacaÃonn sé ar an ardán seo" -#: builtin/gc.c msgid "git gc [<options>]" msgstr "git gc [<options>]" -#: builtin/gc.c #, c-format msgid "Failed to fstat %s: %s" msgstr "Theip ar fstat %s: %s" -#: builtin/gc.c #, c-format msgid "failed to parse '%s' value '%s'" msgstr "theip ar luach '%s' a pharsáil '%s'" -#: builtin/gc.c setup.c #, c-format msgid "cannot stat '%s'" msgstr "nà féidir '%s' a stát" -#: builtin/gc.c #, c-format msgid "" "The last gc run reported the following. Please correct the root cause\n" @@ -8523,68 +7435,56 @@ msgstr "" "\n" "%s" -#: builtin/gc.c msgid "prune unreferenced objects" msgstr "rudaà gan tagairt a ghearradh" -#: builtin/gc.c msgid "pack unreferenced objects separately" msgstr "rudaà gan tagairt a phacáil ar leithligh" -#: builtin/gc.c builtin/repack.c msgid "with --cruft, limit the size of new cruft packs" msgstr "le --cruft, teorainn le méid pacáistà cruft nua" -#: builtin/gc.c msgid "be more thorough (increased runtime)" msgstr "a bheith nÃos crÃochnúla (tréimhse méadaithe)" -#: builtin/gc.c msgid "enable auto-gc mode" msgstr "mód auto-gc a chumasú" -#: builtin/gc.c msgid "perform garbage collection in the background" msgstr "bailiú truflais a dhéanamh sa chúlra" -#: builtin/gc.c msgid "force running gc even if there may be another gc running" msgstr "fórsa ag rith gc fiú má d'fhéadfadh gc eile a bheith ag rith" -#: builtin/gc.c msgid "repack all other packs except the largest pack" msgstr "gach pacáiste eile a athphacáil ach amháin an pacáiste is mó" -#: builtin/gc.c builtin/repack.c msgid "pack prefix to store a pack containing pruned objects" msgstr "réimÃr pacáiste chun pacáiste ina bhfuil rudaà gearrtha a stóráil" -#: builtin/gc.c +msgid "skip maintenance tasks typically done in the foreground" +msgstr "scipeáil tascanna cothabhála a dhéantar de ghnáth sa tulra" + #, c-format msgid "failed to parse gc.logExpiry value %s" msgstr "theip ar luach gc.logExpiry %s a pháirseáil" -#: builtin/gc.c #, c-format msgid "failed to parse prune expiry value %s" msgstr "theip ar luach éaga brúite %s a pharsáil" -#: builtin/gc.c #, c-format msgid "Auto packing the repository in background for optimum performance.\n" msgstr "Pacáil uathoibrÃoch an stór sa chúlra chun an fheidhmÃocht is fearr\n" -#: builtin/gc.c #, c-format msgid "Auto packing the repository for optimum performance.\n" msgstr "Pacáil uathoibrÃoch an stór chun an fheidhmÃocht is fearr\n" -#: builtin/gc.c #, c-format msgid "See \"git help gc\" for manual housekeeping.\n" msgstr "Féach \"git help gc\" le haghaidh obair tà láimhe.\n" -#: builtin/gc.c #, c-format msgid "" "gc is already running on machine '%s' pid %<PRIuMAX> (use --force if not)" @@ -8592,217 +7492,174 @@ msgstr "" "tá gc ag rith cheana féin ar mheaisÃn '%s' pid%<PRIuMAX>(bain úsáid as --" "force mura bhfuil)" -#: builtin/gc.c msgid "" "There are too many unreachable loose objects; run 'git prune' to remove them." msgstr "" "Tá an iomarca rudaà scaoilte neamh-inrochtana ann; reáchtáil 'git prune' " "chun iad a bhaint." -#: builtin/gc.c msgid "" "git maintenance run [--auto] [--[no-]quiet] [--task=<task>] [--schedule]" msgstr "" -"<task>rith cothabhála git [--auto] [-- [no-] ciúin] [--task=] [--schedule]" +"git maintenance run [--auto] [--[no-]quiet] [--task=<task>] [--schedule]" -#: builtin/gc.c msgid "--no-schedule is not allowed" msgstr "Nà cheadaÃtear --no-schedule" -#: builtin/gc.c #, c-format msgid "unrecognized --schedule argument '%s'" msgstr "argóint --schedule gan aithint '%s'" -#: builtin/gc.c msgid "failed to write commit-graph" msgstr "theip orthu graf coimisiúnaithe a scrÃobh" -#: builtin/gc.c msgid "failed to prefetch remotes" msgstr "theip ar iargúlta iargúlta a réamhghabháil" -#: builtin/gc.c msgid "failed to start 'git pack-objects' process" msgstr "theip ar phróiseas 'git pack-objects' a thosú" -#: builtin/gc.c msgid "failed to finish 'git pack-objects' process" msgstr "theip ar phróiseas 'git pack-objects' a chrÃochnú" -#: builtin/gc.c msgid "failed to write multi-pack-index" msgstr "theip ar innéacs il-phacáiste a scrÃobh" -#: builtin/gc.c msgid "'git multi-pack-index expire' failed" msgstr "Theip ar 'git multi-pack-index in éag'" -#: builtin/gc.c msgid "'git multi-pack-index repack' failed" msgstr "Theip ar 'git multi-pack-index repack'" -#: builtin/gc.c msgid "" "skipping incremental-repack task because core.multiPackIndex is disabled" msgstr "" -"tasc athphacáil fáis a scipeáil toisc go bhfuil core.multiPackIndex " -"dÃchumasaithe" +"ag scipeáil an tasc athphacála incriminteach mar go bhfuil " +"core.multiPackIndex dÃchumasaithe" + +msgid "failed to perform geometric repack" +msgstr "theip ar athphacáil gheoiméadrach a dhéanamh" + +#, c-format +msgid "task '%s' failed" +msgstr "theip ar thasc '%s'" -#: builtin/gc.c #, c-format msgid "lock file '%s' exists, skipping maintenance" msgstr "tá comhad glasála '%s' ann, ag scipeáil cothabháil" -#: builtin/gc.c #, c-format -msgid "task '%s' failed" -msgstr "theip ar thasc '%s'" +msgid "unknown maintenance strategy: '%s'" +msgstr "straitéis chothabhála anaithnid: '%s'" -#: builtin/gc.c #, c-format msgid "'%s' is not a valid task" msgstr "Nà tasc bailà é '%s'" -#: builtin/gc.c #, c-format msgid "task '%s' cannot be selected multiple times" msgstr "nà féidir tasc '%s' a roghnú arÃs agus arÃs eile" -#: builtin/gc.c msgid "run tasks based on the state of the repository" msgstr "tascanna a reáchtáil bunaithe ar staid an stór" -#: builtin/gc.c msgid "perform maintenance in the background" msgstr "cothabháil a dhéanamh sa chúlra" -#: builtin/gc.c msgid "frequency" msgstr "minicÃocht" -#: builtin/gc.c msgid "run tasks based on frequency" msgstr "tascanna a rith bunaithe ar mhinicÃocht" -#: builtin/gc.c msgid "do not report progress or other information over stderr" msgstr "ná tuairiscigh dul chun cinn nó faisnéis eile faoi stderr" -#: builtin/gc.c msgid "task" msgstr "tasc" -#: builtin/gc.c msgid "run a specific task" msgstr "tasc ar leith a reáchtáil" -#: builtin/gc.c -msgid "use at most one of --auto and --schedule=<frequency>" -msgstr "bain úsáid as --auto agus --schedule=<frequency> ar a mhéad" - -#: builtin/gc.c #, c-format msgid "unable to add '%s' value of '%s'" -msgstr "nach féidir luach '%s' de '%s' a chur leis" +msgstr "nà féidir luach '%s' de '%s' a chur leis" -#: builtin/gc.c msgid "return success even if repository was not registered" msgstr "rath ar ais fiú mura raibh stór cláraithe" -#: builtin/gc.c #, c-format msgid "unable to unset '%s' value of '%s'" -msgstr "nach féidir luach '%s' de '%s' a dhÃshocrú" +msgstr "nà féidir luach '%s' de '%s' a dhÃshuiteáil" -#: builtin/gc.c #, c-format msgid "repository '%s' is not registered" msgstr "nÃl stór '%s' cláraithe" -#: builtin/gc.c #, c-format msgid "failed to expand path '%s'" msgstr "theip ar an gcosán '%s' a leathnú" -#: builtin/gc.c msgid "failed to start launchctl" msgstr "theip ar launchctl a thosú" -#: builtin/gc.c #, c-format msgid "failed to create directories for '%s'" msgstr "theip ar eolairà a chruthú do '%s'" -#: builtin/gc.c #, c-format msgid "failed to bootstrap service %s" msgstr "theip ar sheirbhÃs bootstrap %s" -#: builtin/gc.c msgid "failed to create temp xml file" msgstr "theip ar chomhad xml temp a chruthú" -#: builtin/gc.c msgid "failed to start schtasks" msgstr "theip ar schasks a thosú" -#: builtin/gc.c msgid "failed to run 'crontab -l'; your system might not support 'cron'" msgstr "" "theip ar 'crontab -l' a reáchtáil; b'fhéidir nach dtacaÃonn do chóras le " "'cron'" -#: builtin/gc.c msgid "failed to create crontab temporary file" msgstr "theip ar chomhad sealadach crontab a chruthú" -#: builtin/gc.c msgid "failed to open temporary file" msgstr "theip ar chomhad sealadach a oscailt" -#: builtin/gc.c msgid "failed to run 'crontab'; your system might not support 'cron'" msgstr "" "theip ar 'crontab' a reáchtáil; b'fhéidir nach dtacaÃonn do chóras le 'cron'" -#: builtin/gc.c msgid "'crontab' died" msgstr "Fuair 'crontab' bás" -#: builtin/gc.c builtin/worktree.c #, c-format msgid "failed to delete '%s'" msgstr "theip ar '%s' a scriosadh" -#: builtin/gc.c rerere.c #, c-format msgid "failed to flush '%s'" msgstr "theip ar '%s' a shruthlú" -#: builtin/gc.c msgid "failed to start systemctl" msgstr "theip ar systemctl a thosú" -#: builtin/gc.c msgid "failed to run systemctl" msgstr "theip ar systemctl a reáchtáil" -#: builtin/gc.c #, c-format msgid "unrecognized --scheduler argument '%s'" msgstr "argóint --scheduler gan aithint '%s'" -#: builtin/gc.c msgid "neither systemd timers nor crontab are available" msgstr "nÃl uaireoirà systemd ná crontab ar fáil" -#: builtin/gc.c #, c-format msgid "%s scheduler is not available" msgstr "NÃl sceidealóir %s ar fáil" -#: builtin/gc.c #, c-format msgid "" "unable to create '%s.lock': %s.\n" @@ -8812,7 +7669,7 @@ msgid "" "then try again. If it still fails, a git-maintenance(1) process may have\n" "crashed in this repository earlier: remove the file manually to continue." msgstr "" -"nach féidir '%s.lock' a chruthú: %s.\n" +"nà féidir '%s.lock' a chruthú: %s.\n" "\n" "Is cosúil go bhfuil próiseas sceidealaithe eile git-maintenance(1) ag rith " "sa\n" @@ -8823,305 +7680,234 @@ msgstr "" "tháinig isteach sa stór seo nÃos luaithe: bain an comhad de láimh chun " "leanúint ar aghaidh." -#: builtin/gc.c msgid "cannot acquire lock for scheduled background maintenance" msgstr "nà féidir glas a fháil le haghaidh cothabháil sceidealta cúlra" -#: builtin/gc.c msgid "git maintenance start [--scheduler=<scheduler>]" -msgstr "<scheduler>tús cothabhála git [--scheduler=]" +msgstr "git maintenance start [--scheduler=<scheduler>]" -#: builtin/gc.c msgid "scheduler" msgstr "sceidealóir" -#: builtin/gc.c msgid "scheduler to trigger git maintenance run" msgstr "sceidealóir chun rith cothabhála git a spreagadh" -#: builtin/gc.c msgid "failed to set up maintenance schedule" msgstr "theip ar sceideal cothabhála a chur ar bun" -#: builtin/gc.c msgid "failed to add repo to global config" msgstr "theip ar repo a chur le cumraÃocht domhanda" -#: builtin/gc.c msgid "git maintenance <subcommand> [<options>]" -msgstr "cothabháil git <subcommand>[<options>]" +msgstr "git maintenance <subcommand> [<options>]" -#: builtin/grep.c msgid "git grep [<options>] [-e] <pattern> [<rev>...] [[--] <path>...]" msgstr "git grep [<options>] [-e] <pattern>[<rev>...] [[--]<path>...]" -#: builtin/grep.c #, c-format msgid "grep: failed to create thread: %s" msgstr "grep: theip ar shnáithe a chruthú: %s" -#: builtin/grep.c #, c-format msgid "invalid number of threads specified (%d) for %s" msgstr "lÃon neamhbhailà na snáitheanna a shonraÃtear (%d) do %s" +#. #-#-#-#-# grep.c.po #-#-#-#-# #. TRANSLATORS: %s is the configuration #. variable for tweaking threads, currently #. grep.threads #. -#: builtin/grep.c builtin/index-pack.c builtin/pack-objects.c #, c-format msgid "no threads support, ignoring %s" msgstr "gan tacaÃocht do shnáitheanna, ag déanamh neamhaird ar %s" -#: builtin/grep.c #, c-format msgid "unable to read tree %s" -msgstr "nach féidir crann %s a léamh" +msgstr "nà féidir crann %s a léamh" -#: builtin/grep.c #, c-format msgid "unable to grep from object of type %s" -msgstr "in ann grep ó réad de chineál %s" +msgstr "nà féidir grep a dhéanamh ó réad de chineál %s" -#: builtin/grep.c #, c-format msgid "switch `%c' expects a numerical value" msgstr "tá an lasc `%c' ag súil le luach uimhriúil" -#: builtin/grep.c msgid "search in index instead of in the work tree" msgstr "cuardaigh san innéacs in ionad sa chrann oibre" -#: builtin/grep.c msgid "find in contents not managed by git" msgstr "aimsigh in ábhar nach mbainistÃonn git" -#: builtin/grep.c msgid "search in both tracked and untracked files" msgstr "cuardach i gcomhaid rianaithe agus neamhrianaithe araon" -#: builtin/grep.c msgid "ignore files specified via '.gitignore'" msgstr "neamhaird a dhéanamh ar chomhaid a shonraÃtear trà '.gitignore'" -#: builtin/grep.c msgid "recursively search in each submodule" msgstr "cuardach athshlánach i ngach fo-mhodúl" -#: builtin/grep.c msgid "show non-matching lines" msgstr "lÃnte neamh-mheaitseála a" -#: builtin/grep.c msgid "case insensitive matching" msgstr "meaitseáil cás neamhÃogair" -#: builtin/grep.c msgid "match patterns only at word boundaries" msgstr "patrúin a mheaitseáil ach ag teorainneacha focal" -#: builtin/grep.c msgid "process binary files as text" msgstr "comhaid dénártha a phróiseáil mar th" -#: builtin/grep.c msgid "don't match patterns in binary files" msgstr "ná meaitseáil patrúin i gcomhaid dénártha" -#: builtin/grep.c msgid "process binary files with textconv filters" msgstr "comhaid dénártha a phróiseáil le scagairà textconv" -#: builtin/grep.c msgid "search in subdirectories (default)" msgstr "cuardaigh i bhfo-eolairà (réamhshocrú)" -#: builtin/grep.c msgid "descend at most <n> levels" msgstr "sÃos ag an bhformhór na <n>leibh" -#: builtin/grep.c msgid "use extended POSIX regular expressions" msgstr "bain úsáid as nathanna rialta POSIX leathnaithe" -#: builtin/grep.c msgid "use basic POSIX regular expressions (default)" msgstr "úsáid abairtà rialta bunúsacha POSIX (réamhshocraithe)" -#: builtin/grep.c msgid "interpret patterns as fixed strings" msgstr "patrúin a léiriú mar teaghráin seasta" -#: builtin/grep.c msgid "use Perl-compatible regular expressions" msgstr "úsáid abairtà rialta atá comhoiriúnach le PERL" -#: builtin/grep.c msgid "show line numbers" msgstr "taispeáin uimhreacha lÃne" -#: builtin/grep.c msgid "show column number of first match" msgstr "taispeáin uimhir cholún an chéad chluiche" -#: builtin/grep.c msgid "don't show filenames" msgstr "ná taispeáin ainmneacha comhaid" -#: builtin/grep.c msgid "show filenames" msgstr "taispeáin ainmneacha comhaid" -#: builtin/grep.c msgid "show filenames relative to top directory" msgstr "ainmneacha comhaid a thaispeáint i gcoibhneas" -#: builtin/grep.c msgid "show only filenames instead of matching lines" msgstr "taispeáint ach ainmneacha comhaid in ionad lÃnte meaitseála" -#: builtin/grep.c msgid "synonym for --files-with-matches" msgstr "comhchiallach do --files-with-matches" -#: builtin/grep.c msgid "show only the names of files without match" msgstr "taispeáint ach ainmneacha na gcomhaid gan meaitseáil" -#: builtin/grep.c msgid "print NUL after filenames" msgstr "priontáil NUL tar éis ainmneacha comhaid" -#: builtin/grep.c msgid "show only matching parts of a line" msgstr "taispeáin ach codanna de lÃne a mheaitseáil" -#: builtin/grep.c msgid "show the number of matches instead of matching lines" msgstr "taispeáint lÃon na gcluichà in ionad lÃnte meaitseála" -#: builtin/grep.c msgid "highlight matches" msgstr "cluichà aibhsithe" -#: builtin/grep.c msgid "print empty line between matches from different files" msgstr "priontáil lÃne folamh idir cluichà ó chomhaid éagsúla" -#: builtin/grep.c msgid "show filename only once above matches from same file" msgstr "" "taispeáin ainm comhaid ach uair amháin thuas na cluichà ón gcomhad céanna" -#: builtin/grep.c msgid "show <n> context lines before and after matches" -msgstr "<n>lÃnte comhthéacs a thaispeáint roimh agus tar" +msgstr "taispeáin lÃnte comhthéacs <n> roimh agus i ndiaidh cluichÃ" -#: builtin/grep.c msgid "show <n> context lines before matches" -msgstr "<n>lÃnte comhthéacs a thaispeáint" +msgstr "taispeáin lÃnte comhthéacs <n> roimh mheaitseálacha" -#: builtin/grep.c msgid "show <n> context lines after matches" -msgstr "<n>lÃnte comhthéacs a thaispeáint" +msgstr "taispeáin lÃnte comhthéacs <n> i ndiaidh cluichÃ" -#: builtin/grep.c msgid "use <n> worker threads" msgstr "úsáid sná <n>itheanna oibrithe" -#: builtin/grep.c msgid "shortcut for -C NUM" msgstr "aicearra le haghaidh -C NUM" -#: builtin/grep.c msgid "show a line with the function name before matches" msgstr "taispeáint lÃne leis an ainm feidhme roimh mheaitseálacha" -#: builtin/grep.c msgid "show the surrounding function" msgstr "taispeáin an fheidhm máguaird" -#: builtin/grep.c msgid "read patterns from file" msgstr "patrúin a léamh ón gcomhad" -#: builtin/grep.c msgid "match <pattern>" msgstr "comhoiriúnú <pattern>" -#: builtin/grep.c msgid "combine patterns specified with -e" msgstr "comhcheangal patrúin a shonraÃtear le -e" -#: builtin/grep.c msgid "indicate hit with exit status without output" msgstr "léirigh bualadh le stádas imeachta gan aschur" -#: builtin/grep.c msgid "show only matches from files that match all patterns" msgstr "taispeáin ach cluichà ó chomhaid a mheaitseálann gach patrún" -#: builtin/grep.c msgid "pager" msgstr "pager" -#: builtin/grep.c msgid "show matching files in the pager" msgstr "taispeáint comhaid mheaitseála sa pager" -#: builtin/grep.c msgid "allow calling of grep(1) (ignored by this build)" msgstr "cead a ghlaoch grep (1) (neamhaird ag an tógáil seo)" -#: builtin/grep.c msgid "maximum number of results per file" msgstr "lÃon uasta na dtorthaà in aghaidh an chomhad" -#: builtin/grep.c msgid "no pattern given" msgstr "aon phatrún a thugtar" -#: builtin/grep.c msgid "--no-index or --untracked cannot be used with revs" msgstr "Nà féidir --no-index nó --untracked a úsáid le hathairÃ" -#: builtin/grep.c #, c-format msgid "unable to resolve revision: %s" -msgstr "nach féidir athbhreithniú a réiteach: %s" +msgstr "nà féidir athbhreithniú a réiteach: %s" -#: builtin/grep.c msgid "--untracked not supported with --recurse-submodules" msgstr "--untracked nach dtacaÃtear le --recurse-submodules" -#: builtin/grep.c msgid "invalid option combination, ignoring --threads" msgstr "teaglaim roghanna neamhbhailÃ, ag neamhaird --threads" -#: builtin/grep.c builtin/pack-objects.c msgid "no threads support, ignoring --threads" msgstr "nÃl aon tacaÃocht do shnáitheanna, ag déanamh neamhaird ar --threads" -#: builtin/grep.c builtin/index-pack.c builtin/pack-objects.c #, c-format msgid "invalid number of threads specified (%d)" msgstr "lÃon neamhbhailà na snáitheanna sonraithe (%d)" -#: builtin/grep.c msgid "--open-files-in-pager only works on the worktree" msgstr "Nà oibrÃonn --open-files-in-pager ach ar an gcrann oibre" -#: builtin/grep.c msgid "--[no-]exclude-standard cannot be used for tracked contents" msgstr "" "- nà féidir caighdeán eisiach [no-] a úsáid le haghaidh ábhar rianaithe" -#: builtin/grep.c msgid "both --cached and trees are given" msgstr "tugtar --cached agus crainn araon" -#: builtin/hash-object.c msgid "" "git hash-object [-t <type>] [-w] [--path=<file> | --no-filters]\n" " [--stdin [--literally]] [--] <file>..." @@ -9129,116 +7915,90 @@ msgstr "" "git hash-object [-t <type>] [-w] [--path=<file> | --no-filters]\n" " [--stdin [--literally]] [--] <file>..." -#: builtin/hash-object.c msgid "git hash-object [-t <type>] [-w] --stdin-paths [--no-filters]" msgstr "git hash-object [-t <type>] [-w] --stdin-paths [--no-filters]" -#: builtin/hash-object.c msgid "object type" msgstr "cineál réad" -#: builtin/hash-object.c msgid "write the object into the object database" msgstr "scrÃobh an réad isteach sa bhunachar sonraà réad" -#: builtin/hash-object.c msgid "read the object from stdin" msgstr "léigh an réad ó stdin" -#: builtin/hash-object.c msgid "store file as is without filters" msgstr "comhad a stóráil mar atá gan scagairÃ" -#: builtin/hash-object.c msgid "" "just hash any random garbage to create corrupt objects for debugging Git" msgstr "" -"nà gá ach aon truflais randamach a chur chun rudaà truaillithe a chruthú le " -"haghaidh dÃfhab" +"nÃl le déanamh ach aon bhruscar randamach a hasháil chun réada truaillithe a " +"chruthú le haghaidh dÃfhabhtaithe Git" -#: builtin/hash-object.c msgid "process file as it were from this path" msgstr "comhad próiseála mar a bhà sé ón gcosán seo" -#: builtin/help.c msgid "print all available commands" msgstr "gach ordú atá ar fáil a phriontáil" -#: builtin/help.c msgid "show external commands in --all" msgstr "taispeáint orduithe seachtracha i --all" -#: builtin/help.c msgid "show aliases in --all" msgstr "taispeáin ainmneacha in --all" -#: builtin/help.c msgid "exclude guides" msgstr "treoracha a eisiamh" -#: builtin/help.c msgid "show man page" msgstr "taispeáin leathanach fear" -#: builtin/help.c msgid "show manual in web browser" msgstr "taispeáin lámhleabhar sa bhrabhsála" -#: builtin/help.c msgid "show info page" msgstr "taispeáin leathanach faisnéise" -#: builtin/help.c msgid "print command description" msgstr "cur sÃos ordaithe priontála" -#: builtin/help.c msgid "print list of useful guides" msgstr "liosta priontáil de threoracha úsáideacha" -#: builtin/help.c msgid "print list of user-facing repository, command and file interfaces" msgstr "" "liosta priontála de stór, comhéadain ordaithe agus comhad atá os comhair " "úsáideora" -#: builtin/help.c msgid "print list of file formats, protocols and other developer interfaces" msgstr "" "liosta priontála formáidà comhaid, prótacail agus comhéadain forbróra eile" -#: builtin/help.c msgid "print all configuration variable names" msgstr "priontáil gach ainm athróg cumraÃochta" -#: builtin/help.c msgid "git help [[-i|--info] [-m|--man] [-w|--web]] [<command>|<doc>]" msgstr "<command><doc>git help [[-i|--eolas] [-m|--fear] [-w|--gréasáin]] [|]" -#: builtin/help.c #, c-format msgid "unrecognized help format '%s'" msgstr "formáid cabhrach gan aithint '%s'" -#: builtin/help.c msgid "Failed to start emacsclient." msgstr "Theip ar emacsclient a thosú." -#: builtin/help.c msgid "Failed to parse emacsclient version." msgstr "Theip ar leagan emacsclient a pháirseáil." -#: builtin/help.c #, c-format msgid "emacsclient version '%d' too old (< 22)." msgstr "leagan imacsclient '%d' ró-sean (< 22)." -#: builtin/help.c #, c-format msgid "failed to exec '%s'" msgstr "theip ar '%s' a fheidhmiú" -#: builtin/help.c #, c-format msgid "" "'%s': path for unsupported man viewer.\n" @@ -9247,7 +8007,6 @@ msgstr "" "'%s': cosán do lucht féachana fear gan tacaÃocht.\n" "Smaoinigh ar 'fear a úsáid le do thoil. <tool>.cmd' ina ionad." -#: builtin/help.c #, c-format msgid "" "'%s': cmd for supported man viewer.\n" @@ -9256,51 +8015,41 @@ msgstr "" "'%s': cmd do lucht féachana fear tacaithe.\n" "Smaoinigh ar 'fear a úsáid le do thoil. <tool>.path' ina ionad sin." -#: builtin/help.c #, c-format msgid "'%s': unknown man viewer." msgstr "'%s': féachtóir fear anaithnid." -#: builtin/help.c msgid "no man viewer handled the request" msgstr "nÃl aon fhéachtóir fear ar an iarraidh" -#: builtin/help.c msgid "no info viewer handled the request" msgstr "nÃl aon fhéachtóir faisnéise ag láimhseáil" -#: builtin/help.c git.c #, c-format msgid "'%s' is aliased to '%s'" msgstr "Tá '%s' aistrithe go '%s'" -#: builtin/help.c git.c #, c-format msgid "bad alias.%s string: %s" msgstr "droch-ainm. Teagán %s: %s" -#: builtin/help.c #, c-format msgid "the '%s' option doesn't take any non-option arguments" msgstr "nà ghlacann an rogha '%s' aon argóintà neamh-rogha" -#: builtin/help.c msgid "" "the '--no-[external-commands|aliases]' options can only be used with '--all'" msgstr "" "nà féidir na roghanna '--no- [external-commands|aliases] 'a úsáid ach le' --" "all '" -#: builtin/help.c #, c-format msgid "usage: %s%s" msgstr "úsáid: %s%s" -#: builtin/help.c msgid "'git help config' for more information" msgstr "'git help config' le haghaidh tuilleadh faisnéise" -#: builtin/hook.c msgid "" "git hook run [--ignore-missing] [--to-stdin=<path>] <hook-name> [-- <hook-" "args>]" @@ -9308,30 +8057,24 @@ msgstr "" "<path><hook-name><hook-args>git hook run [--ignore-missing] [--to-stdin =] " "[--]" -#: builtin/hook.c msgid "silently ignore missing requested <hook-name>" msgstr "neamhaird go ciúin a iarrtar ar <hook-name>" -#: builtin/hook.c msgid "file to read into hooks' stdin" msgstr "comhad le léamh isteach i stdin na hracaÃ" -#: builtin/index-pack.c #, c-format msgid "object type mismatch at %s" msgstr "mÃmheaitseáil cineál réad ag %s" -#: builtin/index-pack.c #, c-format msgid "did not receive expected object %s" msgstr "nár bhfuair sé réad ag súil leis %s" -#: builtin/index-pack.c #, c-format msgid "object %s: expected type %s, found %s" msgstr "réad %s: súil leis an gcineál %s, aimsÃodh %s" -#: builtin/index-pack.c #, c-format msgid "cannot fill %d byte" msgid_plural "cannot fill %d bytes" @@ -9339,64 +8082,50 @@ msgstr[0] "nà féidir %d beart a lÃonadh" msgstr[1] "nà féidir %d beart a lÃonadh" msgstr[2] "nà féidir %d beart a lÃonadh" -#: builtin/index-pack.c msgid "early EOF" msgstr "luath EOF" -#: builtin/index-pack.c msgid "read error on input" msgstr "earráid léigh ar ionchur" -#: builtin/index-pack.c msgid "used more bytes than were available" msgstr "úsáideadh nÃos mó bytes ná mar a bhà ar fáil" -#: builtin/index-pack.c builtin/pack-objects.c msgid "pack too large for current definition of off_t" msgstr "pacáiste ró-mhór le haghaidh sainmhÃniú reatha ar off_t" -#: builtin/index-pack.c #, c-format msgid "pack exceeds maximum allowed size (%s)" msgstr "sáraÃonn an pacáiste an méid uasta ceadaithe (%s)" -#: builtin/index-pack.c msgid "pack signature mismatch" msgstr "mÃmheaitseáil sÃnithe pacáiste" -#: builtin/index-pack.c #, c-format msgid "pack version %<PRIu32> unsupported" msgstr "leagan pacáiste %<PRIu32> gan tacaÃocht" -#: builtin/index-pack.c #, c-format msgid "pack has bad object at offset %<PRIuMAX>: %s" msgstr "tá réad lochtach sa phacáiste ag an bhfritháireamh %<PRIuMAX>: %s" -#: builtin/index-pack.c #, c-format msgid "inflate returned %d" msgstr "infleáil ar ais %d" -#: builtin/index-pack.c msgid "offset value overflow for delta base object" msgstr "ró-shreabhadh luacha a fhritháireamh do réad" -#: builtin/index-pack.c msgid "delta base offset is out of bound" msgstr "tá fhritháireamh bonn delta as ceangailte" -#: builtin/index-pack.c #, c-format msgid "unknown object type %d" msgstr "cineál réad anaithnid %d" -#: builtin/index-pack.c msgid "cannot pread pack file" msgstr "nà féidir comhad pacáiste a roghnú" -#: builtin/index-pack.c #, c-format msgid "premature end of pack file, %<PRIuMAX> byte missing" msgid_plural "premature end of pack file, %<PRIuMAX> bytes missing" @@ -9404,81 +8133,63 @@ msgstr[0] "deireadh roimh am comhaid phacáiste, %<PRIuMAX> beart ar iarraidh" msgstr[1] "deireadh roimh am comhaid phacáiste, %<PRIuMAX> beart ar iarraidh" msgstr[2] "deireadh roimh am comhaid phacáiste, %<PRIuMAX> beart ar iarraidh" -#: builtin/index-pack.c msgid "serious inflate inconsistency" msgstr "neamhchomhsheasmhacht tromchúiseach" -#: builtin/index-pack.c #, c-format msgid "SHA1 COLLISION FOUND WITH %s !" msgstr "FUARTHAS IMBHALL SHA1 LE %s!" -#: builtin/index-pack.c #, c-format msgid "cannot read existing object info %s" msgstr "nà féidir faisnéis réad atá ann cheana %s a léamh" -#: builtin/index-pack.c #, c-format msgid "cannot read existing object %s" msgstr "nà féidir réad %s atá ann cheana a léamh" -#: builtin/index-pack.c #, c-format msgid "invalid blob object %s" msgstr "réad blob neamhbhailà %s" -#: builtin/index-pack.c msgid "fsck error in packed object" msgstr "earráid fsck i réad pacáilte" -#: builtin/index-pack.c #, c-format msgid "Not all child objects of %s are reachable" -msgstr "NÃl gach réad leanbh de %s inrochtana" +msgstr "Nà féidir rochtain a fháil ar gach réad linbh de %s" -#: builtin/index-pack.c msgid "failed to apply delta" msgstr "theip ar delta a chur i bhfeidhm" -#: builtin/index-pack.c msgid "Receiving objects" msgstr "Rudaà a fháil" -#: builtin/index-pack.c msgid "Indexing objects" msgstr "Rudaà innéacsála" -#: builtin/index-pack.c msgid "pack is corrupted (SHA1 mismatch)" msgstr "tá an pacáiste truaillithe (neamhoiriúnú SHA1)" -#: builtin/index-pack.c msgid "cannot fstat packfile" msgstr "nà féidir le pacáiste fstat" -#: builtin/index-pack.c msgid "pack has junk at the end" msgstr "tá bruscar ag an bpacáiste ag an deireadh" -#: builtin/index-pack.c msgid "confusion beyond insanity in parse_pack_objects()" msgstr "mearbhall nÃos faide ná imnà i parse_pack_objects()" -#: builtin/index-pack.c msgid "Resolving deltas" msgstr "Deltas a réiteach" -#: builtin/index-pack.c builtin/pack-objects.c #, c-format msgid "unable to create thread: %s" -msgstr "nach féidir snáithe a chruthú: %s" +msgstr "nà féidir snáithe a chruthú: %s" -#: builtin/index-pack.c msgid "confusion beyond insanity" msgstr "mearbhall nÃos faide ná mar gheall" -#: builtin/index-pack.c #, c-format msgid "completed with %d local object" msgid_plural "completed with %d local objects" @@ -9486,12 +8197,10 @@ msgstr[0] "crÃochnaithe le %d réad áitiúil" msgstr[1] "crÃochnaithe le %d réad áitiúil" msgstr[2] "crÃochnaithe le %d réad áitiúil" -#: builtin/index-pack.c #, c-format msgid "Unexpected tail checksum for %s (disk corruption?)" msgstr "Seicsum eireaball gan choinne do %s (éilliú diosca?)" -#: builtin/index-pack.c #, c-format msgid "pack has %d unresolved delta" msgid_plural "pack has %d unresolved deltas" @@ -9499,56 +8208,45 @@ msgstr[0] "tá %d delta gan réiteach sa phacáiste" msgstr[1] "tá %d deiltà gan réiteach sa phacáiste" msgstr[2] "tá %d deiltà gan réiteach sa phacáiste" -#: builtin/index-pack.c #, c-format msgid "unable to deflate appended object (%d)" -msgstr "nach féidir réad cuibheangailte a dhÃscaoileadh (%d)" +msgstr "nà féidir an réad breise a dhÃbhoilsciú (%d)" -#: builtin/index-pack.c #, c-format msgid "local object %s is corrupt" msgstr "tá réad áitiúil %s truaillithe" -#: builtin/index-pack.c #, c-format msgid "packfile name '%s' does not end with '.%s'" msgstr "nà chrÃochnaÃonn ainm pacáiste '%s' le '.%s'" -#: builtin/index-pack.c #, c-format msgid "cannot write %s file '%s'" msgstr "nà féidir comhad %s '%s' a scrÃobh" -#: builtin/index-pack.c #, c-format msgid "cannot close written %s file '%s'" msgstr "nà féidir comhad %s scrÃofa '%s' a dhúnadh" -#: builtin/index-pack.c #, c-format msgid "unable to rename temporary '*.%s' file to '%s'" -msgstr "in ann athainmniú sealadach '*.%s' comhad chuig '%s'" +msgstr "nà féidir an comhad sealadach '*.%s' a athainmniú go '%s'" -#: builtin/index-pack.c msgid "error while closing pack file" msgstr "earráid agus comhad pacáiste á dúnadh" -#: builtin/index-pack.c builtin/pack-objects.c #, c-format msgid "bad pack.indexVersion=%<PRIu32>" msgstr "droch-pack.indexVersion=%<PRIu32>" -#: builtin/index-pack.c #, c-format msgid "Cannot open existing pack file '%s'" msgstr "Nà féidir comhad pacáiste atá ann cheana '%s' a oscailt" -#: builtin/index-pack.c #, c-format msgid "Cannot open existing pack idx file for '%s'" msgstr "Nà féidir comhad idx pacáiste atá ann cheana a oscailt do '%s'" -#: builtin/index-pack.c #, c-format msgid "non delta: %d object" msgid_plural "non delta: %d objects" @@ -9556,7 +8254,6 @@ msgstr[0] "neamh-delta: %d réad" msgstr[1] "neamh-delta: %d réad" msgstr[2] "neamh-delta: %d réad" -#: builtin/index-pack.c #, c-format msgid "chain length = %d: %lu object" msgid_plural "chain length = %d: %lu objects" @@ -9564,60 +8261,47 @@ msgstr[0] "fad slabhra = %d: %lu réad" msgstr[1] "fad slabhra = %d: %lu réada" msgstr[2] "fad slabhra = %d: %lu réada" -#: builtin/index-pack.c msgid "could not start pack-objects to repack local links" msgstr "nà fhéadfaà pacáiste-earraà a thosú chun naisc áitiúla a athphacáil" -#: builtin/index-pack.c msgid "failed to feed local object to pack-objects" msgstr "theip ar réad áitiúil a bheathú ar rudaà pacáiste" -#: builtin/index-pack.c msgid "index-pack: Expecting full hex object ID lines only from pack-objects." msgstr "" "index-pack: Ag súil le lÃnte aitheantais réada heicsidheachúlach iomlán ó " "pack-objects amháin." -#: builtin/index-pack.c msgid "could not finish pack-objects to repack local links" msgstr "nà fhéadfaà pacáistà a chrÃochnú chun naisc áitiúla a athphacáil" -#: builtin/index-pack.c msgid "Cannot come back to cwd" msgstr "Nà féidir teacht ar ais chuig cwd" -#: builtin/index-pack.c builtin/unpack-objects.c #, c-format msgid "bad --pack_header: %s" msgstr "droch --pack_header: %s" -#: builtin/index-pack.c #, c-format msgid "bad %s" msgstr "droch %s" -#: builtin/index-pack.c builtin/init-db.c setup.c #, c-format msgid "unknown hash algorithm '%s'" msgstr "algartam hais anaithnid '%s'" -#: builtin/index-pack.c msgid "--promisor cannot be used with a pack name" msgstr "--promisor nà féidir é a úsáid le hainm pacáiste" -#: builtin/index-pack.c msgid "--stdin requires a git repository" msgstr "--stdin teastaÃonn stórlann git" -#: builtin/index-pack.c msgid "--verify with no packfile name given" msgstr "--verify gan ainm comhaid pacáiste tugtha" -#: builtin/index-pack.c builtin/unpack-objects.c msgid "fsck error in pack objects" msgstr "fsck earráid i rudaà pacáiste" -#: builtin/init-db.c msgid "" "git init [-q | --quiet] [--bare] [--template=<template-directory>]\n" " [--separate-git-dir <git-dir>] [--object-format=<format>]\n" @@ -9631,37 +8315,29 @@ msgstr "" " [-b <branch-name> | --initial-branch=<branch-name>]\n" " [--shared[=<permissions>]] [<directory>]" -#: builtin/init-db.c msgid "permissions" msgstr "ceadanna" -#: builtin/init-db.c msgid "specify that the git repository is to be shared amongst several users" msgstr "sonraigh go bhfuil an stór git le roinnt i measc roinnt úsáideoirÃ" -#: builtin/init-db.c msgid "override the name of the initial branch" msgstr "ainm na brainse tosaigh a shárú" -#: builtin/init-db.c builtin/verify-pack.c msgid "hash" -msgstr "hash" +msgstr "hais" -#: builtin/init-db.c builtin/show-index.c builtin/verify-pack.c msgid "specify the hash algorithm to use" msgstr "sonraigh an algartam hash le húsáid" -#: builtin/init-db.c #, c-format msgid "cannot mkdir %s" msgstr "nà féidir teacht ar %s" -#: builtin/init-db.c #, c-format msgid "cannot chdir to %s" msgstr "nà féidir teacht chuig %s" -#: builtin/init-db.c #, c-format msgid "" "%s (or --work-tree=<directory>) not allowed without specifying %s (or --git-" @@ -9670,16 +8346,13 @@ msgstr "" "%s (or --work-tree=<directory>) nà cheadaÃtear gan sonrú %s (or --git-" "dir=<directory>)" -#: builtin/init-db.c #, c-format msgid "Cannot access work tree '%s'" msgstr "Nà féidir rochtain a fháil ar chrann oibre '%s'" -#: builtin/init-db.c msgid "--separate-git-dir incompatible with bare repository" msgstr "--separate-git-dir neamhoiriúnach le stór lom" -#: builtin/interpret-trailers.c msgid "" "git interpret-trailers [--in-place] [--trim-empty]\n" " [(--trailer (<key>|<key-alias>)[(=|:)<value>])...]\n" @@ -9689,225 +8362,211 @@ msgstr "" " [(--trailer (<key>|<key-alias>)[(=|:)<value>])...]\n" " [--parse] [<file>...]" -#: builtin/interpret-trailers.c wrapper.c #, c-format msgid "could not stat %s" msgstr "nà raibh ann %s a shástáil" -#: builtin/interpret-trailers.c #, c-format msgid "file %s is not a regular file" msgstr "nà comhad rialta é comhad %s" -#: builtin/interpret-trailers.c #, c-format msgid "file %s is not writable by user" msgstr "nà féidir an t-úsáideoir comhad %s a scrÃobh" -#: builtin/interpret-trailers.c msgid "could not open temporary file" msgstr "nà fhéadfadh comhad sealadach a oscailt" -#: builtin/interpret-trailers.c #, c-format msgid "could not read input file '%s'" msgstr "nà raibh in ann comhad ionchuir '%s' a léamh" -#: builtin/interpret-trailers.c builtin/mktag.c imap-send.c msgid "could not read from stdin" msgstr "nà fhéadfaà léamh ó stdin" -#: builtin/interpret-trailers.c #, c-format msgid "could not rename temporary file to %s" msgstr "nà fhéadfaà comhad sealadach a athainmniú go %s" -#: builtin/interpret-trailers.c msgid "edit files in place" msgstr "comhaid in áit a chur in eagar" -#: builtin/interpret-trailers.c msgid "trim empty trailers" msgstr "leantóirà folamh a ghear" -#: builtin/interpret-trailers.c msgid "placement" msgstr "socrúcháin" -#: builtin/interpret-trailers.c msgid "where to place the new trailer" msgstr "cá háit a chuirfear an leantóir nua" -#: builtin/interpret-trailers.c msgid "action if trailer already exists" msgstr "gnÃomh má tá leantóir ann cheana féin" -#: builtin/interpret-trailers.c msgid "action if trailer is missing" msgstr "gnÃomh má tá leantóir ar iarraidh" -#: builtin/interpret-trailers.c msgid "output only the trailers" msgstr "aschur ach na leantóirÃ" -#: builtin/interpret-trailers.c msgid "do not apply trailer.* configuration variables" msgstr "ná cuir leantóir i bhfeidhm.* athróga cumraÃochta" -#: builtin/interpret-trailers.c msgid "reformat multiline trailer values as single-line values" msgstr "luachanna leantóra illÃne a athfhormáidiú mar luachanna aon-lÃne" -#: builtin/interpret-trailers.c msgid "alias for --only-trailers --only-input --unfold" msgstr "ainm le haghaidh --only-trailers --only-input --unfold" -#: builtin/interpret-trailers.c msgid "do not treat \"---\" as the end of input" msgstr "ná déileáil le “---†mar dheireadh an ionchuir" -#: builtin/interpret-trailers.c msgid "trailer(s) to add" msgstr "leantóir (Ã) le cur leis" -#: builtin/interpret-trailers.c msgid "--trailer with --only-input does not make sense" msgstr "nÃl ciall le --trailer le --only-input" -#: builtin/interpret-trailers.c msgid "no input file given for in-place editing" msgstr "nÃl aon chomhad ionchuir a thugtar le haghaidh eagarthóireachta" -#: builtin/log.c +msgid "last-modified can only operate on one tree at a time" +msgstr "" +"nà féidir leis an modhnaithe deireanach oibriú ach ar chrann amháin ag an am " +"céanna" + +#, c-format +msgid "unknown last-modified argument: %s" +msgstr "argóint anaithnid a modhnaÃodh go deireanach: %s" + +msgid "unable to setup last-modified" +msgstr "nà féidir an modhnú deireanach a shocrú" + +msgid "" +"git last-modified [--recursive] [--show-trees] [<revision-range>] [[--] " +"<path>...]" +msgstr "" +"git last-modified [--recursive] [--show-trees] [<revision-range>] [[--] " +"<path>...]" + +msgid "recurse into subtrees" +msgstr "athshlánú isteach i bhfo-chrainn" + +msgid "show tree entries when recursing into subtrees" +msgstr "taispeáin iontrálacha crainn agus tú ag athfhillteach i bhfochrainn" + msgid "git log [<options>] [<revision-range>] [[--] <path>...]" -msgstr "logáil git [<options>] [<revision-range>] [[--]<path>...]" +msgstr "git log [<options>] [<revision-range>] [[--] <path>...]" -#: builtin/log.c msgid "git show [<options>] <object>..." -msgstr "git show [<options>]<object>..." +msgstr "git show [<options>] <object>..." -#: builtin/log.c #, c-format msgid "invalid --decorate option: %s" msgstr "rogha neamhbhailà --decorate: %s" -#: builtin/log.c diff.c msgid "suppress diff output" msgstr "aschur diff a chur faoi chois" -#: builtin/log.c msgid "show source" msgstr "foinse taispeáin" -#: builtin/log.c msgid "clear all previously-defined decoration filters" msgstr "glan na scagairà maisiúcháin atá sainmhÃnithe roimhe seo" -#: builtin/log.c msgid "only decorate refs that match <pattern>" msgstr "nà mhaisigh ach na cinn a mheaitseálann <pattern>" -#: builtin/log.c msgid "do not decorate refs that match <pattern>" msgstr "ná maisigh na cinn a mheaitseálann <pattern>" -#: builtin/log.c msgid "decorate options" msgstr "roghanna maisiú" -#: builtin/log.c msgid "" "trace the evolution of line range <start>,<end> or function :<funcname> in " "<file>" msgstr "éabhlóid raon lÃne<start>, <end>nó feidhm <funcname>a rianú: i <file>" -#: builtin/log.c msgid "-L<range>:<file> cannot be used with pathspec" msgstr "-L<range>: nà <file>féidir é a úsáid le pathspec" -#: builtin/log.c -#, c-format -msgid "Final output: %d %s\n" -msgstr "Aschur deiridh: %d %s\n" +msgid "" +"\n" +"hint: You can replace 'git whatchanged <opts>' with:\n" +"hint:\tgit log <opts> --raw --no-merges\n" +"hint: Or make an alias:\n" +"hint:\tgit config set --global alias.whatchanged 'log --raw --no-merges'\n" +"\n" +msgstr "" +"\n" +"leid: Is féidir leat 'git whatchanged <opts>' a athsholáthar leis an méid " +"seo a leanas:\n" +"leid:\tgit log <opts> --raw --no-merges\n" +"leid: Nó leasainm a chruthú:\n" +"leid:\tgit config set --global alias.whatchanged 'log --raw --no-merges'\n" +"\n" -#: builtin/log.c #, c-format msgid "git show %s: bad file" msgstr "git show %s: droch-chomhad" -#: builtin/log.c #, c-format msgid "could not read object %s" msgstr "nà raibh in ann réad %s a léamh" -#: builtin/log.c #, c-format msgid "unknown type: %d" msgstr "cineál anaithnid: %d" -#: builtin/log.c #, c-format msgid "%s: invalid cover from description mode" msgstr "%s: clúdach neamhbhailà ó mhodh tuairisc" -#: builtin/log.c msgid "format.headers without value" msgstr "format.headers gan luach" -#: builtin/log.c #, c-format msgid "cannot open patch file %s" msgstr "nà féidir comhad paiste %s a oscailt" -#: builtin/log.c msgid "need exactly one range" msgstr "teastaÃonn raon amháin dÃreach" -#: builtin/log.c msgid "not a range" -msgstr "nà raon" +msgstr "nà raon é" -#: builtin/log.c #, c-format msgid "unable to read branch description file '%s'" -msgstr "nach féidir an comhad tuairisc brainse '%s' a léamh" +msgstr "nà féidir comhad cur sÃos na brainse '%s' a léamh" -#: builtin/log.c msgid "cover letter needs email format" msgstr "teastaÃonn formáid rÃomhphoist ó litir" -#: builtin/log.c msgid "failed to create cover-letter file" msgstr "theip ar chomhad litir chlúdaigh a chruthú" -#: builtin/log.c #, c-format msgid "insane in-reply-to: %s" msgstr "in-fhreagairt daingniúil: %s" -#: builtin/log.c msgid "git format-patch [<options>] [<since> | <revision-range>]" msgstr "git format-patch [<roghanna>] [<ó> | <raon-athbhreithnithe>]" -#: builtin/log.c msgid "two output directories?" msgstr "dhá eolaire aschuir?" -#: builtin/log.c #, c-format msgid "unknown commit %s" msgstr "tiomantas anaithnid %s" -#: builtin/log.c builtin/replace.c #, c-format msgid "failed to resolve '%s' as a valid ref" msgstr "theip ar '%s' a réiteach mar thagartha bailÃ" -#: builtin/log.c msgid "could not find exact merge base" msgstr "nà fhéadfaà bonn cumaisc cruinn a fháil" -#: builtin/log.c 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" @@ -9918,296 +8577,225 @@ msgstr "" "bain úsáid as git branch --set-upstream-to chun brainse iargúlta a rianú.\n" "Nó d'fhéadfá an gealltanas bonn a shonrú trà --base=<base-commit-id> de láimh" -#: builtin/log.c msgid "failed to find exact merge base" msgstr "theip orthu bonn cumaisc cruinn a fháil" -#: builtin/log.c msgid "base commit should be the ancestor of revision list" msgstr "ba cheart gurb é bonn tiomantas ina sinsear an liosta athbhrei" -#: builtin/log.c msgid "base commit shouldn't be in revision list" msgstr "nÃor cheart go mbeadh tiomantas bonn sa liosta athbhrei" -#: builtin/log.c msgid "cannot get patch id" msgstr "nà féidir id paiste a fháil" -#: builtin/log.c msgid "failed to infer range-diff origin of current series" msgstr "theip ar thionscnamh raon difriúil na sraithe reatha a thabhairt amach" -#: builtin/log.c #, c-format msgid "using '%s' as range-diff origin of current series" msgstr "ag baint úsáide as '%s' mar bhunús diff raon na sraithe reatha" -#: builtin/log.c msgid "use [PATCH n/m] even with a single patch" msgstr "bain úsáid as [PATCH n/m] fiú le paiste amháin" -#: builtin/log.c msgid "use [PATCH] even with multiple patches" msgstr "bain úsáid as [PATCH] fiú le paistà iolracha" -#: builtin/log.c msgid "print patches to standard out" msgstr "paistà a phriontáil chun caighdeánach" -#: builtin/log.c msgid "generate a cover letter" msgstr "litir chlúdaigh a ghiniúint" -#: builtin/log.c msgid "use simple number sequence for output file names" msgstr "úsáid seicheamh uimhreacha simplà d'ainmneacha comhaid aschu" -#: builtin/log.c msgid "sfx" msgstr "sfx" -#: builtin/log.c msgid "use <sfx> instead of '.patch'" msgstr "úsáid <sfx>in ionad '.patch'" -#: builtin/log.c msgid "start numbering patches at <n> instead of 1" msgstr "tosú ag uimhriú paistà ag <n>seachas 1" -#: builtin/log.c msgid "reroll-count" msgstr "comhaireamh ath-rollta" -#: builtin/log.c msgid "mark the series as Nth re-roll" msgstr "marcáil an tsraith mar Nú ath-rolla" -#: builtin/log.c msgid "max length of output filename" msgstr "fad uasta ainm an chomhaid aschuir" -#: builtin/log.c msgid "rfc" msgstr "rfc" -#: builtin/log.c msgid "add <rfc> (default 'RFC') before 'PATCH'" msgstr "cuir <rfc>(réamhshocraithe 'RFC') roimh 'PATCH'" -#: builtin/log.c msgid "cover-from-description-mode" msgstr "modh clúdaigh ó-tuairiscrÃbhinnÃ" -#: builtin/log.c msgid "generate parts of a cover letter based on a branch's description" msgstr "codanna de litir chlúdaigh a ghiniúint bunaithe ar thuairisc brainse" -#: builtin/log.c msgid "use branch description from file" msgstr "úsáid cur sÃos brainse ón gcomhad" -#: builtin/log.c msgid "use [<prefix>] instead of [PATCH]" msgstr "úsáid [<prefix>] in ionad [PATCH]" -#: builtin/log.c msgid "store resulting files in <dir>" msgstr "comhaid mar thoradh air a stóráil i <dir>" -#: builtin/log.c msgid "don't strip/add [PATCH]" msgstr "ná stiall/cuir [PATCH] leis" -#: builtin/log.c msgid "don't output binary diffs" msgstr "ná aschur difrÃochtaà dénártha" -#: builtin/log.c msgid "output all-zero hash in From header" msgstr "aschur hash uile-nialas i Ó cheanntásc" -#: builtin/log.c msgid "don't include a patch matching a commit upstream" msgstr "ná cuir paiste a mheaitseann le tiomantas suas an sruth" -#: builtin/log.c msgid "show patch format instead of default (patch + stat)" msgstr "taispeáin formáid paiste in ionad réamhshocraithe (paiste + stat)" -#: builtin/log.c msgid "Messaging" msgstr "TeachtaireachtaÃ" -#: builtin/log.c msgid "header" msgstr "ceanntásc" -#: builtin/log.c msgid "add email header" msgstr "ceanntásc rÃomhphoist leis" -#: builtin/log.c msgid "email" msgstr "rÃomhphost" -#: builtin/log.c msgid "add To: header" msgstr "cuir Le: ceanntásc" -#: builtin/log.c msgid "add Cc: header" msgstr "cuir Cc leis: ceanntásc" -#: builtin/log.c msgid "ident" msgstr "idirghnÃomhaire" -#: builtin/log.c msgid "set From address to <ident> (or committer ident if absent)" msgstr "" "socraigh Ó sheoladh go dtà <ident>(nó aitheantas an tiomantais mura bhfuil " "sé ann)" -#: builtin/log.c msgid "message-id" msgstr "id teachtaireachta" -#: builtin/log.c msgid "make first mail a reply to <message-id>" msgstr "déan freagra ar an gcéad phost <message-id>" -#: builtin/log.c msgid "boundary" msgstr "teorainn" -#: builtin/log.c msgid "attach the patch" msgstr "ceangail an paiste" -#: builtin/log.c msgid "inline the patch" msgstr "inlÃne an paiste" -#: builtin/log.c msgid "enable message threading, styles: shallow, deep" msgstr "cumasú snáithe teachtaireachta, stÃleanna: éadomhain, domhain" -#: builtin/log.c msgid "signature" msgstr "sÃniú" -#: builtin/log.c msgid "add a signature" msgstr "cuir sÃniú" -#: builtin/log.c msgid "base-commit" msgstr "bun-tiomantas" -#: builtin/log.c msgid "add prerequisite tree info to the patch series" msgstr "cuir faisnéis rainn réamhriachtanais leis an tsraith paiste" -#: builtin/log.c msgid "add a signature from a file" msgstr "cuir sÃniú ó chomhad" -#: builtin/log.c msgid "don't print the patch filenames" msgstr "ná priontáil na hainmneacha comhaid paiste" -#: builtin/log.c msgid "show progress while generating patches" msgstr "dul chun cinn a thaispeáint agus paistÃ" -#: builtin/log.c msgid "show changes against <rev> in cover letter or single patch" msgstr "athruithe a thaispeá <rev>int i gcoinne i litir chlúdaigh nó" -#: builtin/log.c msgid "show changes against <refspec> in cover letter or single patch" msgstr "athruithe a thaispeá <refspec>int i gcoinne i litir chlúdaigh nó" -#: builtin/log.c builtin/range-diff.c msgid "percentage by which creation is weighted" msgstr "céatadán faoina n-ualaÃtear an cruthú" -#: builtin/log.c msgid "show in-body From: even if identical to the e-mail header" msgstr "" "taispeáin in-chorp Ó: fiú más comhionann leis an gceannteideal rÃomhphoist" -#: builtin/log.c #, c-format msgid "invalid ident line: %s" msgstr "lÃne aitheantais neamhbhailÃ: %s" -#: builtin/log.c msgid "--name-only does not make sense" msgstr "Nà bhÃonn ciall ag --name-only" -#: builtin/log.c msgid "--name-status does not make sense" msgstr "Nà bhÃonn ciall ag --name-status" -#: builtin/log.c msgid "--check does not make sense" msgstr "Nà bhÃonn ciall ag --check" -#: builtin/log.c msgid "--remerge-diff does not make sense" msgstr "Nà bhÃonn ciall ag --remerge-diff" -#: builtin/log.c builtin/submodule--helper.c rerere.c submodule.c #, c-format msgid "could not create directory '%s'" msgstr "nà fhéadfaà eolaire '%s' a chruthú" -#: builtin/log.c msgid "--interdiff requires --cover-letter or single patch" msgstr "éilÃonn --interdiff --cover-letter nó paiste singil" -#: builtin/log.c msgid "Interdiff:" msgstr "Interdiff:" -#: builtin/log.c #, c-format msgid "Interdiff against v%d:" msgstr "Interdiff i gcoinne v%d:" -#: builtin/log.c msgid "--range-diff requires --cover-letter or single patch" msgstr "ÉilÃonn --range-diff --cover-letter nó paiste aonair" -#: builtin/log.c msgid "Range-diff:" msgstr "DifrÃocht raon:" -#: builtin/log.c #, c-format msgid "Range-diff against v%d:" msgstr "DifrÃocht raon i gcoinne v%d:" -#: builtin/log.c #, c-format msgid "unable to read signature file '%s'" -msgstr "nach féidir an comhad sÃnithe '%s' a léamh" +msgstr "nà féidir comhad sÃnithe '%s' a léamh" -#: builtin/log.c msgid "Generating patches" msgstr "Giniúint paistÃ" -#: builtin/log.c msgid "failed to create output files" msgstr "theip ar chomhaid aschuir a chruthú" -#: builtin/log.c msgid "git cherry [-v] [<upstream> [<head> [<limit>]]]" msgstr "git cherry [-v] [<upstream> [<head> [<limit>]]]" -#: builtin/log.c #, c-format msgid "" "Could not find a tracked remote branch, please specify <upstream> manually.\n" @@ -10215,127 +8803,97 @@ msgstr "" "NÃor féidir brainse iargúlta rianaithe a fháil, sonraigh de láimh le do th " "<upstream>oil.\n" -#: builtin/ls-files.c builtin/ls-tree.c #, c-format msgid "could not get object info about '%s'" msgstr "nà fhéadfaà faisnéis réada a fháil faoi '%s'" -#: builtin/ls-files.c msgid "git ls-files [<options>] [<file>...]" msgstr "git ls-files [<options>] [<file>...]" -#: builtin/ls-files.c builtin/merge-tree.c msgid "separate paths with the NUL character" msgstr "cosáin ar leithligh leis an carachtar NUL" -#: builtin/ls-files.c msgid "identify the file status with tags" msgstr "stádas an chomhaid a aithint le clibeanna" -#: builtin/ls-files.c msgid "use lowercase letters for 'assume unchanged' files" msgstr "" "bain úsáid as litreacha beaga le haghaidh comhaid 'glacadh leis gan " "athraithe'" -#: builtin/ls-files.c msgid "use lowercase letters for 'fsmonitor clean' files" msgstr "bain úsáid as litreacha beaga le haghaidh comhaid 'fsmonitor clean'" -#: builtin/ls-files.c msgid "show cached files in the output (default)" msgstr "taispeáint comhaid taispeána san aschur (réamhshocraithe)" -#: builtin/ls-files.c msgid "show deleted files in the output" msgstr "taispeáint comhaid scriosta san aschur" -#: builtin/ls-files.c msgid "show modified files in the output" msgstr "taispeáint comhaid modhnaithe san aschur" -#: builtin/ls-files.c msgid "show other files in the output" msgstr "taispeáint comhaid eile san aschur" -#: builtin/ls-files.c msgid "show ignored files in the output" msgstr "taispeáint comhaid a neamhaird san aschur" -#: builtin/ls-files.c msgid "show staged contents' object name in the output" msgstr "taispeáin ainm réad ábhair stáitseáilte san aschur" -#: builtin/ls-files.c msgid "show files on the filesystem that need to be removed" msgstr "taispeáint comhaid ar an gcóras comhaid is gá a bhaint" -#: builtin/ls-files.c msgid "show 'other' directories' names only" msgstr "taispeáin ainmneacha 'eile' amháin" -#: builtin/ls-files.c msgid "show line endings of files" msgstr "taispeáint deireadh lÃne na gcomhaid" -#: builtin/ls-files.c msgid "don't show empty directories" msgstr "ná taispeáin eolairà folamh" -#: builtin/ls-files.c msgid "show unmerged files in the output" msgstr "taispeáint comhaid neamh-chumhdaithe san aschur" -#: builtin/ls-files.c msgid "show resolve-undo information" msgstr "taispeáin faisnéis réitigh a chealú" -#: builtin/ls-files.c msgid "skip files matching pattern" -msgstr "patrún meaitseála comhaid scipeála" +msgstr "scipeáil comhaid patrún meaitseála" -#: builtin/ls-files.c msgid "read exclude patterns from <file>" msgstr "léigh patrúin eisiamh ó <file>" -#: builtin/ls-files.c msgid "read additional per-directory exclude patterns in <file>" msgstr "léigh patrúin breise in aghaidh eolaire a eisiamh i <file>" -#: builtin/ls-files.c msgid "add the standard git exclusions" msgstr "cuir na heisiaimh caighdeánacha git" -#: builtin/ls-files.c msgid "make the output relative to the project top directory" msgstr "déan an t-aschur i gcoibhneas le barr-eolaire an tion" -#: builtin/ls-files.c msgid "if any <file> is not in the index, treat this as an error" msgstr "" "mura <file>bhfuil aon cheann san innéacs, déileáil leis seo mar earráid" -#: builtin/ls-files.c builtin/merge-tree.c msgid "tree-ish" msgstr "crainn" -#: builtin/ls-files.c msgid "pretend that paths removed since <tree-ish> are still present" msgstr "ligean go bhfuil cosáin a bhain <tree-ish>tear ó shin fós i láthair" -#: builtin/ls-files.c msgid "show debugging data" msgstr "taispeáin sonraà dÃfhabhtaithe" -#: builtin/ls-files.c msgid "suppress duplicate entries" msgstr "iontrálacha dúbailte a chur" -#: builtin/ls-files.c msgid "show sparse directories in the presence of a sparse index" msgstr "taispeáint eolairà neamhchoitianta i láthair innéacs neamhchoitianta" -#: builtin/ls-files.c msgid "" "--format cannot be used with -s, -o, -k, -t, --resolve-undo, --deduplicate, " "--eol" @@ -10343,7 +8901,6 @@ msgstr "" "Nà féidir --format a úsáid le -s, -o, -k, -t, --resolve-undo, --deduplicate, " "--eol" -#: builtin/ls-remote.c msgid "" "git ls-remote [--branches] [--tags] [--refs] [--upload-pack=<exec>]\n" " [-q | --quiet] [--exit-code] [--get-url] [--sort=<key>]\n" @@ -10353,193 +8910,144 @@ msgstr "" " [-q | --quiet] [--exit-code] [--get-url] [--sort=<key>]\n" " [--symref] [<repository> [<patterns>...]]" -#: builtin/ls-remote.c msgid "do not print remote URL" msgstr "ná priontáil URL iargúlta" -#: builtin/ls-remote.c builtin/rebase.c msgid "exec" msgstr "feidhmiúcháin" -#: builtin/ls-remote.c msgid "path of git-upload-pack on the remote host" msgstr "cosán git-upload-pack ar an óstach cianda" -#: builtin/ls-remote.c msgid "limit to tags" msgstr "teorainn le clibeanna" -#: builtin/ls-remote.c msgid "limit to branches" msgstr "teorainn le brainsÃ" -#: builtin/ls-remote.c builtin/show-ref.c msgid "deprecated synonym for --branches" msgstr "comhchiallach scoite do --branches" -#: builtin/ls-remote.c msgid "do not show peeled tags" msgstr "ná taispeáin clibeanna scáilte" -#: builtin/ls-remote.c msgid "take url.<base>.insteadOf into account" msgstr "glacadh url. <base>.insteadOf san áireamh" -#: builtin/ls-remote.c msgid "exit with exit code 2 if no matching refs are found" msgstr "imeacht le cód imeachta 2 mura bhfaightear aon aifeanna meaitseála" -#: builtin/ls-remote.c msgid "show underlying ref in addition to the object pointed by it" msgstr "taispeáint an tagairt bhunúsach i dteannta leis an réad a thug sé" -#: builtin/ls-tree.c msgid "git ls-tree [<options>] <tree-ish> [<path>...]" -msgstr "<path>git ls-tree [<options>] [...<tree-ish>]" +msgstr "git ls-tree [<options>] <tree-ish> [<path>...]" -#: builtin/ls-tree.c msgid "only show trees" msgstr "ach crainn a thaispeáint" -#: builtin/ls-tree.c -msgid "recurse into subtrees" -msgstr "athshlánú isteach i bhfo-chrainn" - -#: builtin/ls-tree.c msgid "show trees when recursing" -msgstr "crainn a thaispeáint agus tú ag athf" +msgstr "crainn a thaispeáint agus athchúrsaÃocht á déanamh" -#: builtin/ls-tree.c msgid "terminate entries with NUL byte" msgstr "foirceannadh iontrálacha le bait NUL" -#: builtin/ls-tree.c msgid "include object size" msgstr "méid an rud san áireamh" -#: builtin/ls-tree.c msgid "list only filenames" msgstr "ainmneacha comhaid amháin a liostáil" -#: builtin/ls-tree.c msgid "list only objects" msgstr "rudaà amháin a liostáil" -#: builtin/ls-tree.c msgid "use full path names" msgstr "úsáid ainmneacha cosáin iomlána" -#: builtin/ls-tree.c msgid "list entire tree; not just current directory (implies --full-name)" msgstr "" "liostáil crann iomlán; nà hamháin eolaire reatha (tugann le tuiscint --full-" "name)" -#: builtin/ls-tree.c msgid "--format can't be combined with other format-altering options" msgstr "" "Nà féidir --format a chomhcheangal le roghanna eile a athraÃonn formáidÃ" #. TRANSLATORS: keep <> in "<" mail ">" info. -#: builtin/mailinfo.c msgid "git mailinfo [<options>] <msg> <patch> < mail >info" msgstr "git mailinfo [<options>] <msg> <patch> < mail >info" -#: builtin/mailinfo.c msgid "keep subject" msgstr "coinnigh ábhar" -#: builtin/mailinfo.c msgid "keep non patch brackets in subject" msgstr "coinnigh lúibÃnà gan paiste san ábhar" -#: builtin/mailinfo.c msgid "copy Message-ID to the end of commit message" msgstr "" "cóipeáil ID teachtaireachtaà go dtà deireadh na teachtaireachta tiomanta" -#: builtin/mailinfo.c msgid "re-code metadata to i18n.commitEncoding" msgstr "meiteashonraà a athchódú chuig i18N.CommitEncoding" -#: builtin/mailinfo.c msgid "disable charset re-coding of metadata" msgstr "dÃchumasú ath-chódú charset meiteashonraÃ" -#: builtin/mailinfo.c msgid "encoding" msgstr "ionchódú" -#: builtin/mailinfo.c msgid "re-code metadata to this encoding" msgstr "athchódú meiteashonraà don ionchódú seo" -#: builtin/mailinfo.c msgid "use scissors" msgstr "siosúr a úsáid" -#: builtin/mailinfo.c msgid "<action>" msgstr "<action>" -#: builtin/mailinfo.c msgid "action when quoted CR is found" msgstr "gnÃomh nuair a aimsÃtear CR a luaitear" -#: builtin/mailinfo.c msgid "use headers in message's body" msgstr "ceanntásca a úsáid i gcorp na teachtaireachta" -#: builtin/mailsplit.c msgid "reading patches from stdin/tty..." msgstr "paistà a léamh ó stdin/tty..." -#: builtin/mailsplit.c #, c-format msgid "empty mbox: '%s'" msgstr "mbox folamh: '%s'" -#: builtin/merge-base.c msgid "git merge-base [-a | --all] <commit> <commit>..." msgstr "git merge-base [-a | --all] <commit> <commit>..." -#: builtin/merge-base.c msgid "git merge-base [-a | --all] --octopus <commit>..." msgstr "git merge-base [-a | --all] --octopus <commit>..." -#: builtin/merge-base.c msgid "git merge-base --is-ancestor <commit> <commit>" msgstr "git merge-base --is-ancestor <commit> <commit>" -#: builtin/merge-base.c msgid "git merge-base --independent <commit>..." msgstr "git merge-base --independent <commit>..." -#: builtin/merge-base.c msgid "git merge-base --fork-point <ref> [<commit>]" msgstr "git merge-base --fork-point <ref> [<commit>]" -#: builtin/merge-base.c msgid "output all common ancestors" msgstr "aschur gach sinsear coitianta" -#: builtin/merge-base.c msgid "find ancestors for a single n-way merge" msgstr "aimsigh sinsear le haghaidh cumasc n-bhealach amháin" -#: builtin/merge-base.c msgid "list revs not reachable from others" msgstr "liosta revs nach féidir teacht ó dhaoine eile" -#: builtin/merge-base.c msgid "is the first one ancestor of the other?" msgstr "an é an chéad sinsear amháin den duine eile?" -#: builtin/merge-base.c msgid "find where <commit> forked from reflog of <ref>" msgstr "faigh cén áit a <commit> bhforcáladh ó athbhreithniú <ref>" -#: builtin/merge-file.c msgid "" "git merge-file [<options>] [-L <name1> [-L <orig> [-L <name2>]]] <file1> " "<orig-file> <file2>" @@ -10547,69 +9055,50 @@ msgstr "" "git merge-file [<options>] [-L <name1> [-L <orig> [-L <name2>]]] <file1> " "<orig-file> <file2>" -#: builtin/merge-file.c diff.c msgid "" "option diff-algorithm accepts \"myers\", \"minimal\", \"patience\" and " "\"histogram\"" msgstr "" "glacann difr-algartam rogha le “myersâ€, “Ãostaâ€, “foighne†agus “histogramâ€" -#: builtin/merge-file.c msgid "send results to standard output" msgstr "torthaà a sheoladh chuig aschur caigh" -#: builtin/merge-file.c msgid "use object IDs instead of filenames" msgstr "úsáid ID réad in ionad ainmneacha comhaid" -#: builtin/merge-file.c msgid "use a diff3 based merge" msgstr "bain úsáid as cumaisc atá bunaithe ar diff3" -#: builtin/merge-file.c msgid "use a zealous diff3 based merge" msgstr "bain úsáid as cumaisc dÃograiseach bunaithe ar diff3" -#: builtin/merge-file.c diff.c msgid "<algorithm>" msgstr "<algorithm>" -#: builtin/merge-file.c diff.c msgid "choose a diff algorithm" msgstr "roghnaigh algartam diff" -#: builtin/merge-file.c msgid "for conflicts, use this marker size" msgstr "le haghaidh coinbhleachtaÃ, bain úsáid as an méid marcóra" -#: builtin/merge-file.c msgid "do not warn about conflicts" msgstr "ná tabhair rabhadh faoi choimhlintÃ" -#: builtin/merge-file.c msgid "set labels for file1/orig-file/file2" -msgstr "lipéid a shocrú le haghaidh comhad1/orig-file/file2" +msgstr "socraigh lipéid do chomhad1/bunchomhad/comhad2" -#: builtin/merge-file.c #, c-format msgid "object '%s' does not exist" msgstr "nÃl réad '%s' ann" -#: builtin/merge-file.c msgid "Could not write object file" msgstr "Nà fhéadfaà comhad réad a scrÃobh" -#: builtin/merge-recursive.c -#, c-format -msgid "unknown option %s" -msgstr "rogha anaithnid %s" - -#: builtin/merge-recursive.c #, c-format msgid "could not parse object '%s'" msgstr "nà fhéadfaà réad '%s' a pháirseáil" -#: builtin/merge-recursive.c #, c-format msgid "cannot handle more than %d base. Ignoring %s." msgid_plural "cannot handle more than %d bases. Ignoring %s." @@ -10617,274 +9106,210 @@ msgstr[0] "nà féidir nÃos mó ná %d bonn a láimhseáil. Ag neamhaird de %s. msgstr[1] "nà féidir nÃos mó ná %d bonn a láimhseáil. Ag neamhaird de %s." msgstr[2] "nà féidir nÃos mó ná %d bonn a láimhseáil. Ag neamhaird de %s." -#: builtin/merge-recursive.c msgid "not handling anything other than two heads merge." msgstr "gan láimhseáil aon rud seachas dhá cheann a chumasc." -#: builtin/merge-recursive.c #, c-format msgid "could not resolve ref '%s'" msgstr "nà fhéadfaà tagairt '%s' a réiteach" -#: builtin/merge-recursive.c #, c-format msgid "Merging %s with %s\n" msgstr "Cumasc %s le %s\n" -#: builtin/merge-tree.c #, c-format msgid "could not parse as tree '%s'" msgstr "nà fhéadfaà parsáil mar chrann '%s'" -#: builtin/merge-tree.c builtin/merge.c msgid "not something we can merge" msgstr "nà rud is féidir linn a chumasc" -#: builtin/merge-tree.c builtin/merge.c msgid "refusing to merge unrelated histories" msgstr "diúltú stair neamhghaolmhara a chumasc" -#: builtin/merge-tree.c msgid "failure to merge" msgstr "teip a chumasc" -#: builtin/merge-tree.c msgid "git merge-tree [--write-tree] [<options>] <branch1> <branch2>" msgstr "git merge-tree [--write-tree] [<options>] <branch1> <branch2>" -#: builtin/merge-tree.c msgid "git merge-tree [--trivial-merge] <base-tree> <branch1> <branch2>" -msgstr "git merge-tree [--trivial-cumaisc] <base-tree><branch1><branch2>" +msgstr "git merge-tree [--trivial-merge] <base-tree> <branch1> <branch2>" -#: builtin/merge-tree.c msgid "do a real merge instead of a trivial merge" msgstr "déan fÃor-chumasc in ionad cumaisc triobháideach" -#: builtin/merge-tree.c msgid "do a trivial merge only" msgstr "déan cumaisc thréimhseach amháin" -#: builtin/merge-tree.c msgid "also show informational/conflict messages" msgstr "taispeáin teachtaireachtaà faisnéis/coinbhleachta freisin" -#: builtin/merge-tree.c msgid "suppress all output; only exit status wanted" msgstr "cosc a chur ar an aschur go léir; nÃl uaim ach stádas scoir" -#: builtin/merge-tree.c msgid "list filenames without modes/oids/stages" msgstr "ainmneacha comhaid a liostáil gan modhair/oids/céimeanna" -#: builtin/merge-tree.c builtin/merge.c builtin/pull.c msgid "allow merging unrelated histories" msgstr "ligean stair neamhghaolmhara a chumasc" -#: builtin/merge-tree.c msgid "perform multiple merges, one per line of input" msgstr "cumaisc iolracha a dhéanamh, ceann in aghaidh an lÃne ionchuir" -#: builtin/merge-tree.c msgid "specify a merge-base for the merge" msgstr "sonraigh bonn cumaisc don chumasc" -#: builtin/merge-tree.c builtin/merge.c builtin/pull.c msgid "option=value" msgstr "rogha = luach" -#: builtin/merge-tree.c builtin/merge.c builtin/pull.c msgid "option for selected merge strategy" msgstr "rogha do straitéis cumaisc roghnaithe" -#: builtin/merge-tree.c msgid "--trivial-merge is incompatible with all other options" msgstr "Tá --trivial-merge neamhoiriúnach le gach rogha eile" -#: builtin/merge-tree.c builtin/merge.c #, c-format msgid "unknown strategy option: -X%s" msgstr "rogha straitéise anaithnid: -X%s" -#: builtin/merge-tree.c builtin/notes.c #, c-format msgid "malformed input line: '%s'." msgstr "lÃne ionchuir mÃfhoirmithe: '%s'." -#: builtin/merge.c msgid "git merge [<options>] [<commit>...]" -msgstr "git cumaisc [<options>] [<commit>...]" +msgstr "git merge [<options>] [<commit>...]" -#: builtin/merge.c msgid "switch `m' requires a value" msgstr "teastaÃonn luach ag lasc `m'" -#: builtin/merge.c #, c-format msgid "option `%s' requires a value" msgstr "teastaÃonn luach ag rogha `%s'" -#: builtin/merge.c #, c-format msgid "Could not find merge strategy '%s'.\n" msgstr "NÃorbh fhéidir straitéis cumaisc '%s' a fháil.\n" -#: builtin/merge.c #, c-format msgid "Available strategies are:" msgstr "Is iad straitéisà atá ar fáil:" -#: builtin/merge.c #, c-format msgid "Available custom strategies are:" msgstr "Is iad seo a leanas na straitéisà saincheaptha atá ar fáil:" -#: builtin/merge.c builtin/pull.c msgid "do not show a diffstat at the end of the merge" msgstr "ná taispeáin diffstat ag deireadh an chumaisc" -#: builtin/merge.c builtin/pull.c msgid "show a diffstat at the end of the merge" msgstr "taispeáin diffstat ag deireadh an chumaisc" -#: builtin/merge.c builtin/pull.c msgid "(synonym to --stat)" msgstr "(Comhchiallach le --stat)" -#: builtin/merge.c builtin/pull.c +msgid "show a compact-summary at the end of the merge" +msgstr "taispeáin achoimre dhlúth ag deireadh an chumaisc" + msgid "add (at most <n>) entries from shortlog to merge commit message" msgstr "" "cuir iontrálacha (ar a mh <n>éad) ó gearrlog chun teachtaireacht tiomanta a " "chumasc" -#: builtin/merge.c builtin/pull.c msgid "create a single commit instead of doing a merge" msgstr "tiomantas amháin a chruthú in ionad cumaisc a dhéanamh" -#: builtin/merge.c builtin/pull.c msgid "perform a commit if the merge succeeds (default)" msgstr "tiomantas a dhéanamh má éireoidh leis an gcumasc (réamhshocraithe)" -#: builtin/merge.c builtin/pull.c msgid "edit message before committing" msgstr "teachtaireacht in eagar sula ndéanann" -#: builtin/merge.c msgid "allow fast-forward (default)" msgstr "ligean go tapa ar aghaidh (réamhshocraithe)" -#: builtin/merge.c builtin/pull.c msgid "abort if fast-forward is not possible" msgstr "déan deireadh a chur ar aghaidh mura féidir go tapa ar aghaidh" -#: builtin/merge.c builtin/pull.c msgid "verify that the named commit has a valid GPG signature" msgstr "fÃorú go bhfuil sÃniú bailà GPG ag an tiomantas ainmnithe" -#: builtin/merge.c builtin/notes.c builtin/pull.c builtin/rebase.c -#: builtin/revert.c msgid "strategy" msgstr "straitéis" -#: builtin/merge.c builtin/pull.c msgid "merge strategy to use" msgstr "straitéis a chumasc le húsáid" -#: builtin/merge.c msgid "merge commit message (for a non-fast-forward merge)" msgstr "" "teachtaireacht tiomanta a chumasc (le haghaidh cumaisc neamh-tapa ar aghaidh)" -#: builtin/merge.c msgid "use <name> instead of the real target" msgstr "úsáid in <name>ionad an sprioc fÃor" -#: builtin/merge.c msgid "abort the current in-progress merge" msgstr "deireadh a chur leis an gcumasc reatha atá ar siúl" -#: builtin/merge.c msgid "--abort but leave index and working tree alone" msgstr "--abort ach fág an t-innéacs agus an crann oibre ina n-aonar" -#: builtin/merge.c msgid "continue the current in-progress merge" msgstr "leanúint leis an gcumasc atá ar siúl reatha" -#: builtin/merge.c msgid "bypass pre-merge-commit and commit-msg hooks" msgstr "seachbhóthar crúcaà réamh-chumaisc-tiomantas agus comh-msg" -#: builtin/merge.c msgid "could not run stash." msgstr "nà fhéadfadh stash a reáchtáil." -#: builtin/merge.c msgid "stash failed" msgstr "theip ar stash" -#: builtin/merge.c -#, c-format -msgid "not a valid object: %s" -msgstr "nà réad bailÃ: %s" - -#: builtin/merge.c msgid "read-tree failed" msgstr "theip ar chrann léitheoireachta" -#: builtin/merge.c msgid "Already up to date. (nothing to squash)" msgstr "Cothrom le dáta cheana féin. (rud ar bith le squash)" -#: builtin/merge.c merge-ort-wrappers.c msgid "Already up to date." msgstr "Cothrom le dáta cheana féin." -#: builtin/merge.c #, c-format msgid "Squash commit -- not updating HEAD\n" msgstr "Tiomantas Squash - gan HEAD a nuashonrú\n" -#: builtin/merge.c #, c-format msgid "No merge message -- not updating HEAD\n" msgstr "Gan aon teachtaireacht cumaisc - gan HEAD a nuashonrú\n" -#: builtin/merge.c #, c-format msgid "'%s' does not point to a commit" msgstr "Nà thugann '%s' in iúl do thiomantas" -#: builtin/merge.c #, c-format msgid "Bad branch.%s.mergeoptions string: %s" msgstr "Drochbhrainse. %s.mergeoptions teaghrán: %s" -#: builtin/merge.c merge-ort-wrappers.c msgid "Unable to write index." msgstr "Nà féidir innéacs a scrÃobh." -#: builtin/merge.c msgid "Not handling anything other than two heads merge." msgstr "Gan aon rud a láimhseáil seachas dhá cheann cumasc." -#: builtin/merge.c builtin/sparse-checkout.c #, c-format msgid "unable to write %s" -msgstr "nach féidir %s a scrÃobh" +msgstr "nà féidir %s a scrÃobh" -#: builtin/merge.c #, c-format msgid "Could not read from '%s'" msgstr "Nà féidir léamh ó '%s'" -#: builtin/merge.c #, c-format msgid "Not committing merge; use 'git commit' to complete the merge.\n" msgstr "" "Gan cumasc a dhéanamh; bain úsáid as 'git commit' chun an cumaisc a chur i " "gcrÃch.\n" -#: builtin/merge.c 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" @@ -10895,11 +9320,9 @@ msgstr "" "go háirithe má chomhcheanglaÃonn sé nuashonraithe suas sruth i mbrainse " "ábhair.\n" -#: builtin/merge.c msgid "An empty message aborts the commit.\n" msgstr "Cuireann teachtaireacht fholamh deireadh leis an tiomantas.\n" -#: builtin/merge.c #, c-format msgid "" "Lines starting with '%s' will be ignored, and an empty message aborts\n" @@ -10908,74 +9331,58 @@ msgstr "" "Déanfar neamhaird ar lÃnte a thosaÃonn le '%s', \n" "agus cuirfidh teachtaireacht fholamh deireadh leis an tiomantas.\n" -#: builtin/merge.c msgid "Empty commit message." msgstr "Teachtaireacht tiomanta folamh." -#: builtin/merge.c #, c-format msgid "Wonderful.\n" msgstr "Iontach.\n" -#: builtin/merge.c #, c-format msgid "Automatic merge failed; fix conflicts and then commit the result.\n" msgstr "" "Theip ar chumasc uathoibrÃoch; coimhlintà a shocrú agus ansin an toradh\n" -#: builtin/merge.c msgid "No current branch." msgstr "NÃl aon bhrainse reatha." -#: builtin/merge.c msgid "No remote for the current branch." msgstr "NÃl aon iargúlta don bhrainse reatha." -#: builtin/merge.c msgid "No default upstream defined for the current branch." msgstr "NÃl aon réamhshocraithe suas sruth sainithe don bhrainse reatha." -#: builtin/merge.c #, c-format msgid "No remote-tracking branch for %s from %s" msgstr "Gan aon bhrainse cianrianaithe do %s ó %s" -#: builtin/merge.c #, c-format msgid "Bad value '%s' in environment '%s'" msgstr "Drochluach '%s' sa timpeallacht '%s'" -#: builtin/merge.c editor.c read-cache.c wrapper.c #, c-format msgid "could not close '%s'" msgstr "nà fhéadfaà '%s' a dhúnadh" -#: builtin/merge.c #, c-format msgid "not something we can merge in %s: %s" msgstr "nà rud is féidir linn a chumasc i %s: %s" -#: builtin/merge.c msgid "--abort expects no arguments" msgstr "--abort ag súil nach bhfuil aon argóintÃ" -#: builtin/merge.c msgid "There is no merge to abort (MERGE_HEAD missing)." msgstr "NÃl aon chumasc ann chun deireadh a chur (MERGE_HEAD ar iarraidh)." -#: builtin/merge.c msgid "--quit expects no arguments" msgstr "Tá --quit ag súil nach bhfuil aon argóintÃ" -#: builtin/merge.c msgid "--continue expects no arguments" msgstr "--continue gan aon argóintà ag súil leo" -#: builtin/merge.c msgid "There is no merge in progress (MERGE_HEAD missing)." msgstr "NÃl aon chumasc ar siúl (MERGE_HEAD ar iarraidh)." -#: builtin/merge.c msgid "" "You have not concluded your merge (MERGE_HEAD exists).\n" "Please, commit your changes before you merge." @@ -10983,7 +9390,6 @@ msgstr "" "NÃor thug tú do chumasc i gcrÃch (MERGE_HEAD ann).\n" "Déan do chuid athruithe a dhéanamh sula ndéanann tú cumasc." -#: builtin/merge.c msgid "" "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n" "Please, commit your changes before you merge." @@ -10991,38 +9397,30 @@ msgstr "" "NÃor thug tú do phiocadh silÃnà i gcrÃch (CHERRY_PICK_HEAD ann).\n" "Déan do chuid athruithe a dhéanamh sula ndéanann tú cumasc." -#: builtin/merge.c msgid "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists)." msgstr "NÃor thug tú do phiocadh silÃnà i gcrÃch (CHERRY_PICK_HEAD ann)." -#: builtin/merge.c msgid "No commit specified and merge.defaultToUpstream not set." msgstr "" "NÃl aon tiomantas sonraithe agus nÃl merge.defaultToUpstream socraithe." -#: builtin/merge.c msgid "Squash commit into empty head not supported yet" msgstr "Tiomann squash isteach i gceann folamh nach dtacaÃtear go fóill" -#: builtin/merge.c msgid "Non-fast-forward commit does not make sense into an empty head" msgstr "NÃl ciall ar thiomantas neamh-thapa ar aghaidh i gceann folamh" -#: builtin/merge.c #, c-format msgid "%s - not something we can merge" msgstr "%s - nà rud is féidir linn a chumasc" -#: builtin/merge.c msgid "Can merge only exactly one commit into empty head" msgstr "Nà féidir ach tiomantas amháin a chumasc i gceann folamh" -#: builtin/merge.c #, c-format msgid "Updating %s..%s\n" msgstr "Ag nuashonrú %s..%s\n" -#: builtin/merge.c merge-ort-wrappers.c #, c-format msgid "" "Your local changes to the following files would be overwritten by merge:\n" @@ -11032,103 +9430,78 @@ msgstr "" "chumasc:\n" " %s" -#: builtin/merge.c #, c-format msgid "Trying really trivial in-index merge...\n" msgstr "Ag triail a dhéanamh cumasc in-innéacs fÃor-thrá\n" -#: builtin/merge.c #, c-format msgid "Nope.\n" msgstr "Nà hea..\n" -#: builtin/merge.c #, c-format msgid "Rewinding the tree to pristine...\n" msgstr "Ag athchasadh an chrainn go dtà go mbeidh sé foirfe...\n" -#: builtin/merge.c #, c-format msgid "Trying merge strategy %s...\n" msgstr "Ag iarraidh straitéis cumaisc %s...\n" -#: builtin/merge.c #, c-format msgid "No merge strategy handled the merge.\n" msgstr "NÃor láimhseáil aon straitéis chumaisc an cumasc.\n" -#: builtin/merge.c #, c-format msgid "Merge with strategy %s failed.\n" msgstr "Theip ar chumasc le straitéis %s.\n" -#: builtin/merge.c #, c-format msgid "Using the %s strategy to prepare resolving by hand.\n" msgstr "Ag baint úsáide as straitéis %s chun réiteach a ullmhú de láimh.\n" -#: builtin/merge.c #, c-format msgid "Automatic merge went well; stopped before committing as requested\n" msgstr "Chuaigh cumaisc uathoibrÃoch go maith; stad sula ndearna sé tiomanta\n" -#: builtin/merge.c #, c-format msgid "When finished, apply stashed changes with `git stash pop`\n" msgstr "" "Nuair a bheidh crÃochnaithe, cuir athruithe stashed i bhfeidhm le `git stash " "pop`\n" -#: builtin/mktag.c #, c-format msgid "warning: tag input does not pass fsck: %s" msgstr "rabhadh: nà théann ionchur clib ar fsck: %s" -#: builtin/mktag.c #, c-format msgid "error: tag input does not pass fsck: %s" msgstr "earráid: nà théann ionchur clib ar fsck: %s" -#: builtin/mktag.c -#, c-format -msgid "%d (FSCK_IGNORE?) should never trigger this callback" -msgstr "%d (FSCK_IGNORE?) nÃor cheart go spreagfadh an t-aisghlaoch seo" - -#: builtin/mktag.c #, c-format msgid "could not read tagged object '%s'" msgstr "nà fhéadfaà réad clibeáilte '%s' a léamh" -#: builtin/mktag.c #, c-format msgid "object '%s' tagged as '%s', but is a '%s' type" msgstr "réad '%s' clibeáilte mar '%s', ach is cineál '%s' é" -#: builtin/mktag.c msgid "tag on stdin did not pass our strict fsck check" msgstr "nÃor rith tag ar stdin ár seiceáil dhian fsck" -#: builtin/mktag.c msgid "tag on stdin did not refer to a valid object" msgstr "nÃor thagraigh an chlib ar stdin do réad bailÃ" -#: builtin/mktag.c builtin/tag.c msgid "unable to write tag file" -msgstr "in ann comhad clib a scrÃobh" +msgstr "nà féidir comhad clibe a scrÃobh" -#: builtin/mktree.c msgid "input is NUL terminated" msgstr "cuirtear deireadh le hionchur NUL" -#: builtin/mktree.c builtin/write-tree.c msgid "allow missing objects" msgstr "cead a cheadú rudaÃ" -#: builtin/mktree.c msgid "allow creation of more than one tree" msgstr "cead nÃos mó ná crann amháin a chruthú" -#: builtin/multi-pack-index.c msgid "" "git multi-pack-index [<options>] write [--preferred-pack=<pack>][--refs-" "snapshot=<path>]" @@ -11136,52 +9509,40 @@ msgstr "" "git multi-pack-index [<options>] write [--preferred-pack=<pack>][--refs-" "snapshot=<path>]" -#: builtin/multi-pack-index.c msgid "git multi-pack-index [<options>] verify" msgstr "git multi-pack-index [<options>] verify" -#: builtin/multi-pack-index.c msgid "git multi-pack-index [<options>] expire" msgstr "git multi-pack-index [<options>] expire" -#: builtin/multi-pack-index.c msgid "git multi-pack-index [<options>] repack [--batch-size=<size>]" msgstr "git multi-pack-index [<options>] repack [--batch-size=<size>]" -#: builtin/multi-pack-index.c msgid "directory" msgstr "eolaire" -#: builtin/multi-pack-index.c msgid "object directory containing set of packfile and pack-index pairs" msgstr "" "eolaire réada ina bhfuil tacar de phéirà pacáiste agus innéacs pacáiste" -#: builtin/multi-pack-index.c msgid "preferred-pack" msgstr "pacáiste is fearr leat" -#: builtin/multi-pack-index.c msgid "pack for reuse when computing a multi-pack bitmap" msgstr "pacáiste le húsáid agus bitmap il-phacáiste á rÃomh" -#: builtin/multi-pack-index.c msgid "write multi-pack bitmap" msgstr "scrÃobh bitmap il-phacáiste" -#: builtin/multi-pack-index.c msgid "write a new incremental MIDX" msgstr "scrÃobh MIDX incrementach nua" -#: builtin/multi-pack-index.c msgid "write multi-pack index containing only given indexes" msgstr "scrÃobh innéacs il-phacáiste nach bhfuil ach innéacsanna ar leith" -#: builtin/multi-pack-index.c msgid "refs snapshot for selecting bitmap commits" msgstr "léargas refs chun gealltanais bitmap a roghnú" -#: builtin/multi-pack-index.c msgid "" "during repack, collect pack-files of smaller size into a batch that is " "larger than this size" @@ -11189,170 +9550,131 @@ msgstr "" "le linn athphacáil, bailigh comhaid pacáiste de mhéid nÃos lú i mbaisc atá " "nÃos mó ná an méid seo" -#: builtin/mv.c msgid "git mv [-v] [-f] [-n] [-k] <source> <destination>" -msgstr "git mv [-v] [-f] [-n] [-k] <source><destination>" +msgstr "git mv [-v] [-f] [-n] [-k] <source> <destination>" -#: builtin/mv.c msgid "git mv [-v] [-f] [-n] [-k] <source>... <destination-directory>" -msgstr "<source>git mv [-v] [-f] [-n] [-k]... <destination-directory>" +msgstr "git mv [-v] [-f] [-n] [-k] <source>... <destination-directory>" -#: builtin/mv.c #, c-format msgid "Directory %s is in index and no submodule?" msgstr "Tá eolaire %s in innéacs agus nÃl aon fho-mhodúl ann?" -#: builtin/mv.c msgid "Please stage your changes to .gitmodules or stash them to proceed" msgstr "" "Cuir do chuid athruithe ar .gitmodules nó iad a stóráil chun dul ar aghaidh" -#: builtin/mv.c #, c-format msgid "%.*s is in index" msgstr "%.*s atá san innéacs" -#: builtin/mv.c msgid "force move/rename even if target exists" msgstr "aistriúin/athainmniú a fhorbairt fiú má tá sprioc ann" -#: builtin/mv.c msgid "skip move/rename errors" msgstr "scipeáil earráidà a bhogadh/athainmniú" -#: builtin/mv.c #, c-format msgid "destination '%s' is not a directory" msgstr "nà eolaire é ceann scrÃbe '%s'" -#: builtin/mv.c #, c-format msgid "Checking rename of '%s' to '%s'\n" msgstr "Seiceáil athainmniú '%s' go '%s'\n" -#: builtin/mv.c msgid "bad source" msgstr "droch-fhoinse" -#: builtin/mv.c msgid "destination exists" msgstr "ceann scrÃbe ann" -#: builtin/mv.c msgid "can not move directory into itself" msgstr "nà féidir eolaire a bhogadh isteach ina féin" -#: builtin/mv.c msgid "destination already exists" msgstr "ceann scrÃbe ann cheana féin" -#: builtin/mv.c msgid "source directory is empty" msgstr "tá eolaire foinse folamh" -#: builtin/mv.c msgid "not under version control" msgstr "nach bhfuil faoi rialú leagan" -#: builtin/mv.c msgid "conflicted" msgstr "coimhlinneach" -#: builtin/mv.c #, c-format msgid "overwriting '%s'" msgstr "athscrÃobh '%s'" -#: builtin/mv.c msgid "Cannot overwrite" msgstr "Nà féidir athscrÃobh" -#: builtin/mv.c msgid "multiple sources for the same target" msgstr "foinsà iolracha don sprioc chéanna" -#: builtin/mv.c msgid "destination directory does not exist" msgstr "nÃl eolaire ceann scrÃbe ann" -#: builtin/mv.c msgid "destination exists in the index" msgstr "ceann scrÃbe ann san innéacs" -#: builtin/mv.c #, c-format msgid "%s, source=%s, destination=%s" msgstr "%s, foinse = %s, ceann scrÃbe = %s" -#: builtin/mv.c #, c-format msgid "cannot move both '%s' and its parent directory '%s'" msgstr "nà féidir '%s' agus a eolaire tuismitheora '%s' a bhogadh" -#: builtin/mv.c #, c-format msgid "Renaming %s to %s\n" msgstr "Athainmniú %s go %s\n" -#: builtin/mv.c builtin/remote.c #, c-format msgid "renaming '%s' failed" msgstr "theip ar athainmniú '%s'" -#: builtin/name-rev.c msgid "git name-rev [<options>] <commit>..." msgstr "git name-rev [<options>] <commit>..." -#: builtin/name-rev.c msgid "git name-rev [<options>] --all" msgstr "git name-rev [<options>] --all" -#: builtin/name-rev.c msgid "git name-rev [<options>] --annotate-stdin" msgstr "git name-rev [<options>] --annotate-stdin" -#: builtin/name-rev.c msgid "print only ref-based names (no object names)" msgstr "ainmneacha ref-bhunaithe amháin a phriontáil (gan ainmneacha réada)" -#: builtin/name-rev.c msgid "only use tags to name the commits" msgstr "nà húsáid ach clibeanna chun na gealltanais a ainmniú" -#: builtin/name-rev.c msgid "only use refs matching <pattern>" msgstr "nà úsáideann ach meaitseáil refs <pattern>" -#: builtin/name-rev.c msgid "ignore refs matching <pattern>" msgstr "neamhaird a dhéanamh ar mheaitseáil <pattern>" -#: builtin/name-rev.c msgid "list all commits reachable from all refs" msgstr "liostáil na gealltanais go léir atá inrochtana ó gach ceann" -#: builtin/name-rev.c msgid "deprecated: use --annotate-stdin instead" msgstr "dÃscrÃofa: bain úsáid as --annotate-stdin ina ionad" -#: builtin/name-rev.c msgid "annotate text from stdin" msgstr "téacs a anótáil ó stdin" -#: builtin/name-rev.c msgid "allow to print `undefined` names (default)" msgstr "" "cead a thabhairt d'ainmneacha “neamhshainithe†a phriontáil (réamhshocrú" -#: builtin/name-rev.c msgid "dereference tags in the input (internal use)" msgstr "clibeanna dereference san ionchur (úsáid inmheánach)" -#: builtin/notes.c msgid "git notes [--ref <notes-ref>] [list [<object>]]" msgstr "git notes [--ref <notes-ref>] [list [<object>]]" -#: builtin/notes.c msgid "" "git notes [--ref <notes-ref>] add [-f] [--allow-empty] [--[no-]separator|--" "separator=<paragraph-break>] [--[no-]stripspace] [-m <msg> | -F <file> | (-c " @@ -11362,11 +9684,9 @@ msgstr "" "separator=<paragraph-break>] [--[no-]stripspace] [-m <msg> | -F <file> | (-c " "| -C) <object>] [<object>] [-e]" -#: builtin/notes.c msgid "git notes [--ref <notes-ref>] copy [-f] <from-object> <to-object>" msgstr "git notes [--ref<notes-ref>] cóipeáil [-f] <from-object><to-object>" -#: builtin/notes.c msgid "" "git notes [--ref <notes-ref>] append [--allow-empty] [--[no-]separator|--" "separator=<paragraph-break>] [--[no-]stripspace] [-m <msg> | -F <file> | (-c " @@ -11376,127 +9696,98 @@ msgstr "" "separator=<paragraph-break>] [--[no-]stripspace] [-m <msg> | -F <file> | (-c " "| -C) <object>] [<object>] [-e]" -#: builtin/notes.c msgid "git notes [--ref <notes-ref>] edit [--allow-empty] [<object>]" msgstr "git notes [--ref <notes-ref>] edit [--allow-empty] [<object>]" -#: builtin/notes.c msgid "git notes [--ref <notes-ref>] show [<object>]" msgstr "git notes [--ref <notes-ref>] show [<object>]" -#: builtin/notes.c msgid "" "git notes [--ref <notes-ref>] merge [-v | -q] [-s <strategy>] <notes-ref>" msgstr "" "git notes [--ref <notes-ref>] merge [-v | -q] [-s <strategy>] <notes-ref>" -#: builtin/notes.c msgid "git notes [--ref <notes-ref>] remove [<object>...]" msgstr "git notes [--ref <notes-ref>] remove [<object>...]" -#: builtin/notes.c msgid "git notes [--ref <notes-ref>] prune [-n] [-v]" msgstr "git notes [--ref <notes-ref>] prune [-n] [-v]" -#: builtin/notes.c msgid "git notes [--ref <notes-ref>] get-ref" msgstr "git notes [--ref <notes-ref>] get-ref" -#: builtin/notes.c msgid "git notes [list [<object>]]" msgstr "git notes [list [<object>]]" -#: builtin/notes.c msgid "git notes add [<options>] [<object>]" msgstr "git notes add [<options>] [<object>]" -#: builtin/notes.c msgid "git notes copy [<options>] <from-object> <to-object>" msgstr "git notes copy [<options>] <from-object> <to-object>" -#: builtin/notes.c msgid "git notes copy --stdin [<from-object> <to-object>]..." msgstr "git notes copy --stdin [<from-object> <to-object>]..." -#: builtin/notes.c msgid "git notes append [<options>] [<object>]" msgstr "git notes append [<options>] [<object>]" -#: builtin/notes.c msgid "git notes edit [<object>]" -msgstr "nótaà git a chur in eagar [<object>]" +msgstr "git notes edit [<object>]" -#: builtin/notes.c msgid "git notes show [<object>]" -msgstr "taispeánann nótaà git [<object>]" +msgstr "git notes show [<object>]" -#: builtin/notes.c msgid "git notes merge [<options>] <notes-ref>" -msgstr "cumaisc nótaà git [<options>] <notes-ref>" +msgstr "git notes merge [<options>] <notes-ref>" -#: builtin/notes.c msgid "git notes merge --commit [<options>]" msgstr "git notes merge --commit [<options>]" -#: builtin/notes.c msgid "git notes merge --abort [<options>]" msgstr "git notes merge --abort [<options>]" -#: builtin/notes.c msgid "git notes remove [<object>]" msgstr "git notes remove [<object>]" -#: builtin/notes.c msgid "git notes prune [<options>]" msgstr "git notes prune [<options>]" -#: builtin/notes.c msgid "Write/edit the notes for the following object:" msgstr "ScrÃobh/cuir in eagar na nótaà don réad seo a leanas:" -#: builtin/notes.c msgid "could not read 'show' output" msgstr "nà raibh in ann aschur 'taispeáin' a léamh" -#: builtin/notes.c #, c-format msgid "failed to finish 'show' for object '%s'" msgstr "theip ar 'show' a chrÃochnú le haghaidh réad '%s'" -#: builtin/notes.c msgid "please supply the note contents using either -m or -F option" msgstr "soláthar ábhar an nóta le do thoil ag baint úsáide as rogha -m nó -F" -#: builtin/notes.c msgid "unable to write note object" -msgstr "in ann réad nótaà a scrÃobh" +msgstr "nà féidir réad nóta a scrÃobh" -#: builtin/notes.c #, c-format msgid "the note contents have been left in %s" msgstr "tá ábhar an nóta fágtha i %s" -#: builtin/notes.c builtin/tag.c #, c-format msgid "could not open or read '%s'" msgstr "nà fhéadfaà '%s' a oscailt nó a léamh" -#: builtin/notes.c #, c-format msgid "failed to resolve '%s' as a valid ref." msgstr "theip ar '%s' a réiteach mar thagartha bailÃ." -#: builtin/notes.c #, c-format msgid "failed to read object '%s'." msgstr "theip ar réad '%s' a léamh." -#: builtin/notes.c #, c-format msgid "cannot read note data from non-blob object '%s'." msgstr "nà féidir sonraà nótaà a léamh ó réad neamh-blob '%s'." -#: builtin/notes.c #, c-format msgid "failed to copy notes from '%s' to '%s'" msgstr "theip ar nótaà a chóipeáil ó '%s' go '%s'" @@ -11504,57 +9795,44 @@ msgstr "theip ar nótaà a chóipeáil ó '%s' go '%s'" #. TRANSLATORS: the first %s will be replaced by a git #. notes command: 'add', 'merge', 'remove', etc. #. -#: builtin/notes.c #, c-format msgid "refusing to %s notes in %s (outside of refs/notes/)" msgstr "diúltú do %s nótaà i %s (lasmuigh de refs/notes/)" -#: builtin/notes.c #, c-format msgid "no note found for object %s." msgstr "nà bhfuarthas aon nóta do réad %s." -#: builtin/notes.c msgid "note contents as a string" msgstr "tabhair faoi deara ábhar mar shreang" -#: builtin/notes.c msgid "note contents in a file" msgstr "tabhair faoi deara ábhar i gcomhad" -#: builtin/notes.c msgid "reuse and edit specified note object" msgstr "réad nóta sonraithe a úsáid agus a chur in eagar" -#: builtin/notes.c msgid "edit note message in editor" msgstr "teachtaireacht nóta in eagar san eagarthóir" -#: builtin/notes.c msgid "reuse specified note object" msgstr "réad nóta sonraithe a athúsáid" -#: builtin/notes.c msgid "allow storing empty note" msgstr "ligean nóta folamh a stóráil" -#: builtin/notes.c msgid "replace existing notes" msgstr "nótaà atá ann cheana in ionad" -#: builtin/notes.c msgid "<paragraph-break>" msgstr "<paragraph-break>" -#: builtin/notes.c msgid "insert <paragraph-break> between paragraphs" msgstr "cuir isteach <paragraph-break>idir mÃreanna" -#: builtin/notes.c msgid "remove unnecessary whitespace" msgstr "bain spás bán neamhriachtanach" -#: builtin/notes.c #, c-format msgid "" "Cannot add notes. Found existing notes for object %s. Use '-f' to overwrite " @@ -11563,31 +9841,25 @@ msgstr "" "Nà féidir nótaà a chur leis. Fuarthas nótaà atá ann cheana don réad %s. " "Úsáid '-f' chun nótaà atá ann cheana a fhorscrÃobh" -#: builtin/notes.c #, c-format msgid "Overwriting existing notes for object %s\n" msgstr "AthscrÃobh nótaà atá ann cheana don réad %s\n" -#: builtin/notes.c #, c-format msgid "Removing note for object %s\n" msgstr "Nóta a bhaint le haghaidh réad %s\n" -#: builtin/notes.c msgid "read objects from stdin" msgstr "léigh rudaà ó stdin" -#: builtin/notes.c msgid "load rewriting config for <command> (implies --stdin)" msgstr "" "cumraÃocht athscrÃbhneoireachta ualaigh le haghaidh <command>(tugann le " "tuiscint --stdin)" -#: builtin/notes.c msgid "too few arguments" msgstr "ró-bheag argóintÃ" -#: builtin/notes.c #, c-format msgid "" "Cannot copy notes. Found existing notes for object %s. Use '-f' to overwrite " @@ -11596,12 +9868,10 @@ msgstr "" "Nà féidir nótaà a chóipeáil. Fuarthas nótaà atá ann cheana don réad %s. " "Úsáid '-f' chun nótaà atá ann cheana a fhorscrÃobh" -#: builtin/notes.c #, c-format msgid "missing notes on source object %s. Cannot copy." msgstr "nótaà in easnamh ar réad foinse %s. Nà féidir cóipeáil." -#: builtin/notes.c #, c-format msgid "" "The -m/-F/-c/-C options have been deprecated for the 'edit' subcommand.\n" @@ -11610,52 +9880,40 @@ msgstr "" "Tá na roghanna -M/-f/-c/-c curtha as an bhfo-ordú 'eagarthóireach'.\n" "Úsáid le do thoil 'git notes add -f -m/-f/-c/-C' ina ionad.\n" -#: builtin/notes.c msgid "failed to delete ref NOTES_MERGE_PARTIAL" msgstr "theip ar an tagairt NOTES_MERGE_PARTIAL a scriosadh" -#: builtin/notes.c msgid "failed to delete ref NOTES_MERGE_REF" msgstr "theip ar an ref a scriosadh NOTES_MERGE_REF" -#: builtin/notes.c msgid "failed to remove 'git notes merge' worktree" msgstr "theip ar chrann oibre 'git notes merge' a bhaint" -#: builtin/notes.c msgid "failed to read ref NOTES_MERGE_PARTIAL" msgstr "theip ar an tagairt NOTES_MERGE_PARTIAL a léamh" -#: builtin/notes.c msgid "could not find commit from NOTES_MERGE_PARTIAL." msgstr "nà raibh sé in ann tiomantas a fháil ó NOTES_MERGE_PARTIAL." -#: builtin/notes.c msgid "could not parse commit from NOTES_MERGE_PARTIAL." msgstr "nà raibh sé in ann tiomantas a pharsáil ó NOTES_MERGE_PARTIAL." -#: builtin/notes.c msgid "failed to resolve NOTES_MERGE_REF" msgstr "theip orthu NOTES_MERGE_REF a réiteach" -#: builtin/notes.c msgid "failed to finalize notes merge" msgstr "theip orthu nótaà a chumasc a chur i gcrÃch" -#: builtin/notes.c #, c-format msgid "unknown notes merge strategy %s" msgstr "straitéis cumaisc nótaà anaithnid %s" -#: builtin/notes.c msgid "General options" msgstr "Roghanna ginearálta" -#: builtin/notes.c msgid "Merge options" msgstr "Roghanna cumaisc" -#: builtin/notes.c msgid "" "resolve notes conflicts using the given strategy (manual/ours/theirs/union/" "cat_sort_uniq)" @@ -11663,46 +9921,36 @@ msgstr "" "coimhlintà nótaà a réiteach ag baint úsáide as an straitéis a thugtar " "(lámhleabhair/innir/a nd/union/cat_sort_uniq)" -#: builtin/notes.c msgid "Committing unmerged notes" msgstr "Nótaà neamh-mheánaithe a dhéanamh" -#: builtin/notes.c msgid "finalize notes merge by committing unmerged notes" msgstr "cumasc nótaà a chrÃochnú trà nótaà neamh-chumasaithe a dhéanamh" -#: builtin/notes.c msgid "Aborting notes merge resolution" msgstr "Rún cumasc le nótaà a ghearradh" -#: builtin/notes.c msgid "abort notes merge" msgstr "cumaisc nótaà abort" -#: builtin/notes.c msgid "cannot mix --commit, --abort or -s/--strategy" msgstr "nà féidir --commit, --abort nó -s/--strategy a mheascadh" -#: builtin/notes.c msgid "must specify a notes ref to merge" msgstr "nà mór tagairt nótaà a shonrú chun cumasc" -#: builtin/notes.c #, c-format msgid "unknown -s/--strategy: %s" msgstr "anaithnid -s/--strategy: %s" -#: builtin/notes.c #, c-format msgid "a notes merge into %s is already in-progress at %s" msgstr "tá nótaà a chumasc i %s ar siúl cheana féin ag %s" -#: builtin/notes.c #, c-format msgid "failed to store link to current notes ref (%s)" msgstr "theip ar nasc a stóráil le nótaà reatha tagairt (%s)" -#: builtin/notes.c #, c-format msgid "" "Automatic notes merge failed. Fix conflicts in %s and commit the result with " @@ -11713,65 +9961,64 @@ msgstr "" "an toradh a dhéanamh le 'git notes merge --commit', nó cuir deireadh leis an " "cumasc le 'git notes merge --abort'.\n" -#: builtin/notes.c builtin/tag.c #, c-format msgid "Failed to resolve '%s' as a valid ref." msgstr "Theip ar '%s' a réiteach mar thagartha bailÃ." -#: builtin/notes.c #, c-format msgid "Object %s has no note\n" msgstr "NÃl aon nóta ag réad %s\n" -#: builtin/notes.c msgid "attempt to remove non-existent note is not an error" msgstr "nà earráid é iarracht nóta nach bhfuil ann a bhaint" -#: builtin/notes.c msgid "read object names from the standard input" msgstr "léigh ainmneacha réada ón ionchur caighdeánach" -#: builtin/notes.c builtin/prune.c builtin/worktree.c msgid "do not remove, show only" msgstr "ná bain, taispeáin amháin" -#: builtin/notes.c msgid "report pruned notes" msgstr "nótaà gearrtha a thuairisciú" -#: builtin/notes.c msgid "notes-ref" msgstr "nótairea-tagairt" -#: builtin/notes.c msgid "use notes from <notes-ref>" msgstr "úsáid nótaà ó <notes-ref>" -#: builtin/notes.c builtin/remote.c parse-options.c #, c-format msgid "unknown subcommand: `%s'" msgstr "fo-ordú anaithnid: `%s'" -#: builtin/pack-objects.c -msgid "git pack-objects --stdout [<options>] [< <ref-list> | < <object-list>]" -msgstr "git pack-objects --stdout [<options>] [< <ref-list> | < <object-list>]" - -#: builtin/pack-objects.c msgid "" -"git pack-objects [<options>] <base-name> [< <ref-list> | < <object-list>]" +"git pack-objects [-q | --progress | --all-progress] [--all-progress-" +"implied]\n" +" [--no-reuse-delta] [--delta-base-offset] [--non-empty]\n" +" [--local] [--incremental] [--window=<n>] [--depth=<n>]\n" +" [--revs [--unpacked | --all]] [--keep-pack=<pack-name>]\n" +" [--cruft] [--cruft-expiration=<time>]\n" +" [--stdout [--filter=<filter-spec>] | <base-name>]\n" +" [--shallow] [--keep-true-parents] [--[no-]sparse]\n" +" [--name-hash-version=<n>] [--path-walk] < <object-list>" msgstr "" -"git pack-objects [<options>] <base-name> [< <ref-list> | < <object-list>]" +"git pack-objects [-q | --progress | --all-progress] [--all-progress-" +"implied]\n" +" [--no-reuse-delta] [--delta-base-offset] [--non-empty]\n" +" [--local] [--incremental] [--window=<n>] [--depth=<n>]\n" +" [--revs [--unpacked | --all]] [--keep-pack=<pack-name>]\n" +" [--cruft] [--cruft-expiration=<time>]\n" +" [--stdout [--filter=<filter-spec>] | <base-name>]\n" +" [--shallow] [--keep-true-parents] [--[no-]sparse]\n" +" [--name-hash-version=<n>] [--path-walk] < <object-list>" -#: builtin/pack-objects.c #, c-format msgid "invalid --name-hash-version option: %d" msgstr "rogha neamhbhailà --name-hash-version: %d" -#: builtin/pack-objects.c msgid "currently, --write-bitmap-index requires --name-hash-version=1" msgstr "faoi láthair, teastaÃonn --write-bitmap-index --name-hash-version=1" -#: builtin/pack-objects.c #, c-format msgid "" "write_reuse_object: could not locate %s, expected at offset %<PRIuMAX> in " @@ -11780,132 +10027,118 @@ msgstr "" "write_reuse_object: nÃorbh fhéidir %s a aimsiú, bhÃothas ag súil leis ag an " "bhfritháireamh %<PRIuMAX> sa phacáiste %s" -#: builtin/pack-objects.c #, c-format msgid "bad packed object CRC for %s" msgstr "réad pacáilte dona CRC le haghaidh %s" -#: builtin/pack-objects.c #, c-format msgid "corrupt packed object for %s" msgstr "réad pacáilte truaillithe do %s" -#: builtin/pack-objects.c #, c-format msgid "recursive delta detected for object %s" msgstr "braithÃodh delta athfhillteach do réad %s" -#: builtin/pack-objects.c #, c-format msgid "ordered %u objects, expected %<PRIu32>" -msgstr "rudaà %u ordaithe, súil leis% <PRIu32>" +msgstr "%u réad ordaithe, %<PRIu32> ag súil leis" -#: builtin/pack-objects.c #, c-format msgid "expected object at offset %<PRIuMAX> in pack %s" msgstr "" "réad a bhÃothas ag súil leis ag an bhfritháireamh %<PRIuMAX> sa phacáiste %s" -#: builtin/pack-objects.c msgid "disabling bitmap writing, packs are split due to pack.packSizeLimit" msgstr "" "scrÃobh bitmap a dhÃchumasú, roinntear pacáistà mar gheall ar " "pack.packSizeLimit" -#: builtin/pack-objects.c msgid "Writing objects" msgstr "Rudaà a scrÃobh" -#: builtin/pack-objects.c builtin/update-index.c #, c-format msgid "failed to stat %s" msgstr "theip ar stát %s" -#: builtin/pack-objects.c object-file.c #, c-format msgid "failed utime() on %s" msgstr "theip ar utime () ar %s" -#: builtin/pack-objects.c msgid "failed to write bitmap index" msgstr "theip ar innéacs bitmap a scrÃobh" -#: builtin/pack-objects.c #, c-format msgid "wrote %<PRIu32> objects while expecting %<PRIu32>" msgstr "scrÃobh %<PRIu32> rudaà agus iad ag súil leis %<PRIu32>" -#: builtin/pack-objects.c builtin/repack.c msgid "disabling bitmap writing, as some objects are not being packed" msgstr "scrÃobh bitmap a dhÃchumasú, toisc nach bhfuil roinnt rudaà á phacáil" -#: builtin/pack-objects.c #, c-format msgid "delta base offset overflow in pack for %s" msgstr "forsreabhadh fhritháireamh bonn delta i bpacáiste do %s" -#: builtin/pack-objects.c #, c-format msgid "delta base offset out of bound for %s" msgstr "bonn delta a fhritháireamh as ceangailte do %s" -#: builtin/pack-objects.c msgid "Counting objects" msgstr "Rud a chomhaireamh" -#: builtin/pack-objects.c pack-bitmap.c #, c-format msgid "unable to get size of %s" -msgstr "nach féidir méid %s a fháil" +msgstr "nà féidir méid %s a fháil" -#: builtin/pack-objects.c #, c-format msgid "unable to parse object header of %s" -msgstr "nach féidir ceanntásc réad %s a pháirseáil" +msgstr "nà féidir ceanntásc réada %s a pharsáil" -#: builtin/pack-objects.c #, c-format msgid "object %s cannot be read" msgstr "nà féidir réad %s a léamh" -#: builtin/pack-objects.c #, c-format msgid "object %s inconsistent object length (%<PRIuMAX> vs %<PRIuMAX>)" msgstr "fad réada neamhréireach réad %s (%<PRIuMAX> vs %<PRIuMAX>)" -#: builtin/pack-objects.c msgid "suboptimal pack - out of memory" msgstr "pacáiste suboptimal - as cuimhne" -#: builtin/pack-objects.c #, c-format msgid "Delta compression using up to %d threads" msgstr "Comhbhrú Delta ag úsáid suas le snáitheanna %d" -#: builtin/pack-objects.c #, c-format msgid "unable to pack objects reachable from tag %s" -msgstr "nach féidir rudaà a phacáil inrochtana ó chlib %s" +msgstr "nà féidir rudaà a phacáil ar féidir rochtain a fháil orthu ón gclib %s" -#: builtin/pack-objects.c commit-graph.c #, c-format msgid "unable to get type of object %s" -msgstr "nach féidir cineál réada %s a fháil" +msgstr "nà féidir cineál réada %s a fháil" + +msgid "Compressing objects by path" +msgstr "Ag comhbhrú rudaà de réir cosáin" + +#, c-format +msgid "Path-based delta compression using up to %d thread" +msgid_plural "Path-based delta compression using up to %d threads" +msgstr[0] "" +"Comhbhrú delta bunaithe ar chonair ag baint úsáide as suas le %d snáithe" +msgstr[1] "" +"Comhbhrú delta bunaithe ar chonair ag baint úsáide as suas le %d snáithe" +msgstr[2] "" +"Comhbhrú delta bunaithe ar chonair ag baint úsáide as suas le %d snáithe" -#: builtin/pack-objects.c msgid "Compressing objects" msgstr "Rudaà comhbhrúite" -#: builtin/pack-objects.c msgid "inconsistency with delta count" msgstr "neamhréireacht le comhaireamh delta" -#: builtin/pack-objects.c #, c-format msgid "invalid pack.allowPackReuse value: '%s'" msgstr "luach pack.allowPackReuse neamhbhailÃ: '%s'" -#: builtin/pack-objects.c #, c-format msgid "" "value of uploadpack.blobpackfileuri must be of the form '<object-hash> <pack-" @@ -11914,41 +10147,33 @@ msgstr "" "<object-hash><pack-hash><uri>caithfidh luach uploadpack.blobpackfileuri a " "bheith den fhoirm '' (fuair '%s')" -#: builtin/pack-objects.c #, c-format msgid "" "object already configured in another uploadpack.blobpackfileuri (got '%s')" msgstr "" "réad cumraithe cheana féin i uploadpack.blobpackfileuri eile (fuair '%s')" -#: builtin/pack-objects.c #, c-format msgid "could not get type of object %s in pack %s" msgstr "nà fhéadfaà cineál réada %s a fháil i bpacáiste %s" -#: builtin/pack-objects.c #, c-format msgid "could not find pack '%s'" msgstr "nà raibh an pacáiste '%s' in ann a aimsiú" -#: builtin/pack-objects.c #, c-format msgid "packfile %s cannot be accessed" msgstr "nà féidir teacht ar chomhad pacáiste %s" -#: builtin/pack-objects.c msgid "Enumerating cruft objects" msgstr "Ag áireamh rudaà cruft" -#: builtin/pack-objects.c msgid "unable to add cruft objects" -msgstr "in ann rudaà cruft a chur leis" +msgstr "nà féidir rudaà cruft a chur leis" -#: builtin/pack-objects.c msgid "Traversing cruft objects" msgstr "Ag trasnú ar rudaà cruth" -#: builtin/pack-objects.c #, c-format msgid "" "expected edge object ID, got garbage:\n" @@ -11957,7 +10182,6 @@ msgstr "" "ag súil le haitheantas réada imeall, fuarthas bruscar:\n" "%s" -#: builtin/pack-objects.c #, c-format msgid "" "expected object ID, got garbage:\n" @@ -11966,278 +10190,219 @@ msgstr "" "aitheantas réada a bhfuil súil leis, fuair truflais:\n" " %s" -#: builtin/pack-objects.c reachable.c msgid "could not load cruft pack .mtimes" msgstr "nà fhéadfaà pacáiste cruft a luchtú .mtimes" -#: builtin/pack-objects.c msgid "cannot open pack index" msgstr "nà féidir innéacs pacáiste a osc" -#: builtin/pack-objects.c #, c-format msgid "loose object at %s could not be examined" msgstr "nà fhéadfaà réad scaoilte ag %s a scrúdú" -#: builtin/pack-objects.c msgid "unable to force loose object" -msgstr "in ann rud scaoilte a chur i bhfeidhm" +msgstr "nà féidir fórsa réad scaoilte" + +msgid "failed to pack objects via path-walk" +msgstr "theip ar rudaà a phacáil trÃd an gcosán-siúlóid" -#: builtin/pack-objects.c #, c-format msgid "not a rev '%s'" msgstr "nà rev '%s'" -#: builtin/pack-objects.c builtin/rev-parse.c #, c-format msgid "bad revision '%s'" msgstr "droch-athbhreithniú '%s'" -#: builtin/pack-objects.c msgid "unable to add recent objects" -msgstr "in ann rudaà le déanaà a chur leis" +msgstr "nà féidir rudaà le déanaà a chur leis" -#: builtin/pack-objects.c #, c-format msgid "unsupported index version %s" msgstr "leagan innéacs neamhthacaithe %s" -#: builtin/pack-objects.c #, c-format msgid "bad index version '%s'" msgstr "droch-leagan innéacs '%s'" -#: builtin/pack-objects.c msgid "show progress meter during object writing phase" msgstr "méadar dul chun cinn a thaispeáint le linn céim sc" -#: builtin/pack-objects.c msgid "similar to --all-progress when progress meter is shown" msgstr "cosúil le --all-progress nuair a thaispeántar méadar dul chun cinn" -#: builtin/pack-objects.c msgid "<version>[,<offset>]" msgstr "<version>[,<offset>]" -#: builtin/pack-objects.c msgid "write the pack index file in the specified idx format version" msgstr "scrÃobh an comhad innéacs pacáiste sa leagan formáid idx sonraithe" -#: builtin/pack-objects.c msgid "maximum size of each output pack file" msgstr "uasmhéid gach comhad pacáiste aschuir" -#: builtin/pack-objects.c msgid "ignore borrowed objects from alternate object store" msgstr "neamhaird a dhéanamh ar rudaà atá ar iasacht ó stór" -#: builtin/pack-objects.c msgid "ignore packed objects" msgstr "neamhaird a dhéanamh ar earraÃ" -#: builtin/pack-objects.c msgid "limit pack window by objects" msgstr "teorainn fuinneog pacáiste de réir rudaÃ" -#: builtin/pack-objects.c msgid "limit pack window by memory in addition to object limit" msgstr "teorainn le fuinneog pacáiste de réir chuimhne i dteannta le teorainn" -#: builtin/pack-objects.c msgid "maximum length of delta chain allowed in the resulting pack" -msgstr "fad uasta an slabhra delta a cheadaÃtear sa phacáiste mar thoradh air" +msgstr "" +"uasfhad an tslabhra delta a cheadaÃtear sa phacáiste mar thoradh air sin" -#: builtin/pack-objects.c msgid "reuse existing deltas" msgstr "déltaà atá ann cheana a athúsáid" -#: builtin/pack-objects.c msgid "reuse existing objects" msgstr "athúsáid rudaà atá ann cheana" -#: builtin/pack-objects.c msgid "use OFS_DELTA objects" msgstr "bain úsáid as rudaà OFS_DELTA" -#: builtin/pack-objects.c msgid "use threads when searching for best delta matches" msgstr "úsáid snáitheanna agus tú ag cuardach na cluichà delta is fearr" -#: builtin/pack-objects.c msgid "do not create an empty pack output" msgstr "ná cruthaigh aschur pacáiste folamh" -#: builtin/pack-objects.c msgid "read revision arguments from standard input" msgstr "léigh argóintà athbhreithnithe ó ionchur" -#: builtin/pack-objects.c msgid "limit the objects to those that are not yet packed" msgstr "teorainn leis na rudaà dóibh siúd nach bhfuil pacáilte fós" -#: builtin/pack-objects.c msgid "include objects reachable from any reference" msgstr "áireamh rudaà atá inrochtana ó aon tagairt" -#: builtin/pack-objects.c msgid "include objects referred by reflog entries" msgstr "áireamh rudaà a dtagraÃtear ag iontrálacha reflog" -#: builtin/pack-objects.c msgid "include objects referred to by the index" msgstr "áireamh rudaà dá dtagraÃonn an t-innéacs" -#: builtin/pack-objects.c msgid "read packs from stdin" msgstr "léigh pacáistà ó stdin" -#: builtin/pack-objects.c msgid "output pack to stdout" msgstr "pacáiste aschuir go stdout" -#: builtin/pack-objects.c msgid "include tag objects that refer to objects to be packed" msgstr "áireamh rudaà clibeanna a thagraÃonn do rudaà atá le pacáil" -#: builtin/pack-objects.c msgid "keep unreachable objects" msgstr "rudaà nach féidir a choinneáil" -#: builtin/pack-objects.c msgid "pack loose unreachable objects" msgstr "rudaà scaoilte nach féidir a phacáil" -#: builtin/pack-objects.c msgid "unpack unreachable objects newer than <time>" msgstr "rudaà nach féidir a dhÃphacáil nÃos nuaà ná <time>" -#: builtin/pack-objects.c msgid "create a cruft pack" msgstr "cruthaigh pacáiste cruft" -#: builtin/pack-objects.c msgid "expire cruft objects older than <time>" msgstr "dul in éag rudaà cruft nÃos sine ná <time>" -#: builtin/pack-objects.c msgid "use the sparse reachability algorithm" msgstr "úsáid an algartam inrochtaineachta neamhchoitianta" -#: builtin/pack-objects.c msgid "create thin packs" msgstr "cruthaigh pacáistà tanaÃ" -#: builtin/pack-objects.c +msgid "use the path-walk API to walk objects when possible" +msgstr "" +"bain úsáid as an API siúlóide cosáin chun siúlóid a dhéanamh ar rudaà nuair " +"is féidir" + msgid "create packs suitable for shallow fetches" msgstr "pacáistà a chruthú atá oiriúnach le haghaidh tógá" -#: builtin/pack-objects.c msgid "ignore packs that have companion .keep file" msgstr "neamhaird a dhéanamh ar phacáistà a bhfuil comhad compánach" -#: builtin/pack-objects.c msgid "ignore this pack" msgstr "neamhaird a dhéanamh ar an b" -#: builtin/pack-objects.c msgid "pack compression level" msgstr "leibhéal comhbhrú pacáiste" -#: builtin/pack-objects.c msgid "do not hide commits by grafts" msgstr "ná déan gealltanais ag grafts i bhfolach" -#: builtin/pack-objects.c msgid "use a bitmap index if available to speed up counting objects" msgstr "" "úsáid innéacs bitmap má tá sé ar fáil chun rudaà a chomhaireamh a bhrostú" -#: builtin/pack-objects.c msgid "write a bitmap index together with the pack index" msgstr "scrÃobh innéacs bitmap in éineacht leis an innéacs pacáiste" -#: builtin/pack-objects.c msgid "write a bitmap index if possible" msgstr "scrÃobh innéacs bitmap más féidir" -#: builtin/pack-objects.c msgid "handling for missing objects" msgstr "láimhseáil le haghaidh rudaà atá" -#: builtin/pack-objects.c msgid "do not pack objects in promisor packfiles" msgstr "ná pacáil rudaà i gcomhaid pacáiste gealltanais" -#: builtin/pack-objects.c msgid "implies --missing=allow-any" msgstr "tugann le tuiscint --missing=allow-any" -#: builtin/pack-objects.c msgid "respect islands during delta compression" msgstr "meas ar oileáin le linn comhbhrúite delta" -#: builtin/pack-objects.c msgid "protocol" msgstr "prótacal" -#: builtin/pack-objects.c msgid "exclude any configured uploadpack.blobpackfileuri with this protocol" msgstr "eisiamh aon uploadpack.blobpackfileuri cumraithe leis an bprótacal seo" -#: builtin/pack-objects.c msgid "use the specified name-hash function to group similar objects" msgstr "" "bain úsáid as an bhfeidhm sonraithe ainm-hash chun rudaà den chineál céanna a" -#: builtin/pack-objects.c #, c-format msgid "delta chain depth %d is too deep, forcing %d" msgstr "" "tá doimhneacht slabhra delta %d ró-dhomhain, rud a chuireann iallach ar %d" -#: builtin/pack-objects.c #, c-format msgid "pack.deltaCacheLimit is too high, forcing %d" msgstr "pack.deltaCacheLimit ró-ard, ag cur %d i bhfeidhm" -#: builtin/pack-objects.c config.c +#, c-format +msgid "cannot use %s with %s" +msgstr "nà féidir %s a úsáid le %s" + #, c-format msgid "bad pack compression level %d" msgstr "leibhéal comhbhrúite droch-phacáiste %d" -#: builtin/pack-objects.c msgid "--max-pack-size cannot be used to build a pack for transfer" msgstr "Nà féidir --max-pack-size a úsáid chun pacáiste a thógáil le haistriú" -#: builtin/pack-objects.c msgid "minimum pack size limit is 1 MiB" msgstr "is é teorainn Ãosta méid an phacáiste ná 1 MiB" -#: builtin/pack-objects.c msgid "--thin cannot be used to build an indexable pack" msgstr "Nà féidir --thin a úsáid chun pacáiste innéacsaithe a thógáil" -#: builtin/pack-objects.c -msgid "cannot use --filter with --stdin-packs" -msgstr "nà féidir --filter a úsáid le --stdin-packs" - -#: builtin/pack-objects.c msgid "cannot use internal rev list with --stdin-packs" msgstr "nà féidir liosta rev inmheánach a úsáid le --stdin-packs" -#: builtin/pack-objects.c msgid "cannot use internal rev list with --cruft" msgstr "nà féidir liosta rev inmheánach a úsáid le --cruft" -#: builtin/pack-objects.c -msgid "cannot use --stdin-packs with --cruft" -msgstr "nà féidir --stdin-packs a úsáid le --cruft" - -#: builtin/pack-objects.c msgid "Enumerating objects" msgstr "Rudaà a chur san áireamh" -#: builtin/pack-objects.c #, c-format msgid "" "Total %<PRIu32> (delta %<PRIu32>), reused %<PRIu32> (delta %<PRIu32>), pack-" @@ -12246,137 +10411,72 @@ msgstr "" "%<PRIu32> iomlán (delta %<PRIu32>), %<PRIu32> athúsáidte (delta %<PRIu32>), " "%<PRIu32> athúsáidte sa phacáiste (ó %<PRIuMAX>)" -#: builtin/pack-redundant.c -msgid "" -"'git pack-redundant' is nominated for removal.\n" -"If you still use this command, please add an extra\n" -"option, '--i-still-use-this', on the command line\n" -"and let us know you still use it by sending an e-mail\n" -"to <git@vger.kernel.org>. Thanks.\n" -msgstr "" -"Tá 'git pack-redundant' ainmnithe le baint.\n" -"Má úsáideann tú an t-ordú seo fós, cuir rogha b\n" -"hreise, '--i-still-use-this', leis an lÃne ordaithe \n" -"agus cuir in iúl dúinn go n-úsáideann tú fós é trà rÃomhphost \n" -"a sheoladh chuig <git@vger.kernel.org>. Go raibh maith agat.\n" - -#: builtin/pack-redundant.c -msgid "refusing to run without --i-still-use-this" -msgstr "ag diúltú rith gan --i-still-use-this fós" - -#: builtin/pack-refs.c -msgid "" -"git pack-refs [--all] [--no-prune] [--auto] [--include <pattern>] [--exclude " -"<pattern>]" -msgstr "" -"<pattern><pattern>git pack-refs [--all] [--no-prunes] [--auto] [--include] " -"[--eisiamh]" - -#: builtin/pack-refs.c -msgid "pack everything" -msgstr "pacáil gach rud" - -#: builtin/pack-refs.c -msgid "prune loose refs (default)" -msgstr "briseadh scaoilte (réamhshocraithe)" - -#: builtin/pack-refs.c -msgid "auto-pack refs as needed" -msgstr "tuairiscintà uathoibrÃoch pacáiste" - -#: builtin/pack-refs.c -msgid "references to include" -msgstr "tagairtà lena n-áirÃtear" - -#: builtin/pack-refs.c -msgid "references to exclude" -msgstr "tagairtà chun eisiamh" +msgid "git pack-refs " +msgstr "git pack-refs " -#: builtin/patch-id.c msgid "git patch-id [--stable | --unstable | --verbatim]" msgstr "git patch-id [--seasmhach | --éagobhsaà | --verbatim]" -#: builtin/patch-id.c msgid "use the unstable patch-id algorithm" msgstr "bain úsáid as an algartam paith-id éagobhsaÃ" -#: builtin/patch-id.c msgid "use the stable patch-id algorithm" msgstr "bain úsáid as an algartam paith-id cobhsaÃ" -#: builtin/patch-id.c msgid "don't strip whitespace from the patch" msgstr "ná tarraingt spás bán ón bpaiste" -#: builtin/prune.c msgid "git prune [-n] [-v] [--progress] [--expire <time>] [--] [<head>...]" -msgstr "<head>git plum [-n] [-v] [--progress] [--dul in éag] [<time>--] [...]" +msgstr "git prune [-n] [-v] [--progress] [--expire <time>] [--] [<head>...]" -#: builtin/prune.c msgid "report pruned objects" msgstr "tuairisciú rudaà gearrtha" -#: builtin/prune.c msgid "expire objects older than <time>" msgstr "dul in éag rudaà nÃos sine ná <time>" -#: builtin/prune.c msgid "limit traversal to objects outside promisor packfiles" msgstr "teorainn a chur ar thrasú le rudaà lasmuigh de phacáiste gealltan" -#: builtin/prune.c msgid "cannot prune in a precious-objects repo" msgstr "nà féidir le bearradh i repo rudaà luachmhara" -#: builtin/pull.c msgid "git pull [<options>] [<repository> [<refspec>...]]" -msgstr "git pull [<options>] [<repository>[<refspec>...]]" +msgstr "git pull [<options>] [<repository> [<refspec>...]]" -#: builtin/pull.c msgid "control for recursive fetching of submodules" msgstr "rialú maidir le fo-mhodúil a fháil athshlánach" -#: builtin/pull.c msgid "Options related to merging" msgstr "Roghanna a bhaineann le cumasc" -#: builtin/pull.c msgid "incorporate changes by rebasing rather than merging" msgstr "athruithe a ionchorprú trà athbhunú seachas cumasc" -#: builtin/pull.c builtin/revert.c msgid "allow fast-forward" msgstr "ligean go tapa ar aghaidh" -#: builtin/pull.c msgid "control use of pre-merge-commit and commit-msg hooks" msgstr "úsáid crúcaà réamh-chumaisc agus comh-msg a rialú" -#: builtin/pull.c parse-options.h msgid "automatically stash/stash pop before and after" msgstr "pop a stash/stash go huathoibrÃoch roimh agus tar éis" -#: builtin/pull.c msgid "Options related to fetching" msgstr "Roghanna a bhaineann le tarraingt" -#: builtin/pull.c msgid "force overwrite of local branch" msgstr "forscrÃobh fórsa ar bhrainse áitiúil" -#: builtin/pull.c msgid "number of submodules pulled in parallel" msgstr "lÃon na bhfo-mhodúil tarraingthe go comhthreom" -#: builtin/pull.c parse-options.h msgid "use IPv4 addresses only" msgstr "bain úsáid as seoltaà IPv4 amháin" -#: builtin/pull.c parse-options.h msgid "use IPv6 addresses only" msgstr "bain úsáid as seoltaà IPv6 amháin" -#: builtin/pull.c msgid "" "There is no candidate for rebasing against among the refs that you just " "fetched." @@ -12384,13 +10484,11 @@ msgstr "" "NÃl aon iarrthóir ann chun athbhreithniú i measc na n-airÃonna a fuair tú " "dÃreach." -#: builtin/pull.c msgid "" "There are no candidates for merging among the refs that you just fetched." msgstr "" "NÃl aon iarrthóirà ann chun cumasc i measc na gcomharthaà a fuair tú dÃreach." -#: builtin/pull.c msgid "" "Generally this means that you provided a wildcard refspec which had no\n" "matches on the remote end." @@ -12399,7 +10497,6 @@ msgstr "" "nach raibh aon\n" "cluichà ar an gceann iargúlta." -#: builtin/pull.c #, c-format msgid "" "You asked to pull from the remote '%s', but did not specify\n" @@ -12410,42 +10507,33 @@ msgstr "" "brainse. Toisc nach é seo an cianda cumraithe réamhshocraithe\n" "do bhrainse reatha, nà mór duit brainse a shonrú ar an lÃne ordaithe." -#: builtin/pull.c builtin/rebase.c msgid "You are not currently on a branch." msgstr "NÃl tú ar bhrainse faoi láthair." -#: builtin/pull.c msgid "Please specify which branch you want to rebase against." msgstr "Sonraigh le do thoil cén brainse is mian leat a athbhunú ina choinne." -#: builtin/pull.c msgid "Please specify which branch you want to merge with." msgstr "Sonraigh le do thoil cén brainse is mian leat a chumasc leis." -#: builtin/pull.c msgid "See git-pull(1) for details." msgstr "Féach git-pull (1) le haghaidh sonraÃ." -#: builtin/pull.c builtin/rebase.c msgid "<remote>" msgstr "<remote>" -#: builtin/pull.c scalar.c msgid "<branch>" msgstr "<branch>" -#: builtin/pull.c builtin/rebase.c msgid "There is no tracking information for the current branch." msgstr "NÃl aon fhaisnéis rianaithe don bhrainse reatha." -#: builtin/pull.c msgid "" "If you wish to set tracking information for this branch you can do so with:" msgstr "" "Más mian leat faisnéis rianaithe a shocrú don bhrainse seo is féidir leat é " "sin a dhéanamh le:" -#: builtin/pull.c #, c-format msgid "" "Your configuration specifies to merge with the ref '%s'\n" @@ -12454,21 +10542,17 @@ msgstr "" "SonraÃonn do chumraÃocht a chumasc leis an tagairt '%s'\n" "ón iargúlta, ach nÃor faightear aon tagairt den sórt sin." -#: builtin/pull.c #, c-format msgid "unable to access commit %s" -msgstr "nach féidir teacht ar thiomantas %s" +msgstr "nà féidir rochtain a fháil ar thiomnadh %s" -#: builtin/pull.c refspec.c #, c-format msgid "invalid refspec '%s'" msgstr "refspec neamhbhailà '%s'" -#: builtin/pull.c msgid "ignoring --verify-signatures for rebase" msgstr "ag neamhaird --verify-signatures le haghaidh athbhunú" -#: builtin/pull.c msgid "" "You have divergent branches and need to specify how to reconcile them.\n" "You can do so by running one of the following commands sometime before\n" @@ -12501,19 +10585,15 @@ msgstr "" "shárú\n" "ionghairm.\n" -#: builtin/pull.c msgid "Updating an unborn branch with changes added to the index." msgstr "Brainse breithe a nuashonrú le hathruithe curtha leis an innéacs." -#: builtin/pull.c msgid "pull with rebase" msgstr "tarraing le rebase" -#: builtin/pull.c builtin/rebase.c msgid "Please commit or stash them." msgstr "Déan iad a thiomantas nó a stóráil le do thoil." -#: builtin/pull.c #, c-format msgid "" "fetch updated the current branch head.\n" @@ -12524,7 +10604,6 @@ msgstr "" "do chrann oibre a chur ar aghaidh go tapa ó\n" "tiomantas %s." -#: builtin/pull.c #, c-format msgid "" "Cannot fast-forward your working tree.\n" @@ -12541,39 +10620,30 @@ msgstr "" "$ git reset --hard\n" "chun aisghabháil." -#: builtin/pull.c msgid "Cannot merge multiple branches into empty head." msgstr "Nà féidir brainsà iomadúla a chumasc i gceann folamh." -#: builtin/pull.c msgid "Cannot rebase onto multiple branches." msgstr "Nà féidir athbhunú ar iliomad brainsÃ." -#: builtin/pull.c msgid "Cannot fast-forward to multiple branches." msgstr "Nà féidir dul ar aghaidh go tapa go brainsà iolracha." -#: builtin/pull.c msgid "Need to specify how to reconcile divergent branches." msgstr "Nà mór a shonrú conas brainsà éagsúla a réiteach." -#: builtin/pull.c msgid "cannot rebase with locally recorded submodule modifications" msgstr "nà féidir athbhunú le modhnuithe fo-mhodúil atá taifeadta" -#: builtin/push.c msgid "git push [<options>] [<repository> [<refspec>...]]" -msgstr "git push [<roghanna>] [<stóras> [<refspec>...]]" +msgstr "git push [<options>] [<repository> [<refspec>...]]" -#: builtin/push.c msgid "tag shorthand without <tag>" msgstr "gearrthand clib gan <tag>" -#: builtin/push.c msgid "--delete only accepts plain target ref names" msgstr "--delete nà ghlacann sé ach le hainmneacha tagartha sprice simplÃ" -#: builtin/push.c msgid "" "\n" "To choose either option permanently, see push.default in 'git help config'.\n" @@ -12582,7 +10652,6 @@ msgstr "" "Chun ceachtar rogha a roghnú go buan, féach push.default i 'git help " "config'.\n" -#: builtin/push.c msgid "" "\n" "To avoid automatically configuring an upstream branch when its name\n" @@ -12595,7 +10664,6 @@ msgstr "" "branch.autoSetupMerge\n" "i 'git help config'.\n" -#: builtin/push.c #, c-format msgid "" "The upstream branch of your current branch does not match\n" @@ -12620,7 +10688,6 @@ msgstr "" " git push %s HEAD\n" "%s%s" -#: builtin/push.c #, c-format msgid "" "You are not currently on a branch.\n" @@ -12635,7 +10702,6 @@ msgstr "" "\n" " git push %s HEAD:<ainm-na-brainse-cianda>\n" -#: builtin/push.c msgid "" "\n" "To have this happen automatically for branches without a tracking\n" @@ -12645,7 +10711,6 @@ msgstr "" "Chun é seo a tharlóidh go huathoibrÃoch do bhrainsà gan rianú\n" "suas sruth, féach 'push.autoSetupRemote' i 'git help config'.\n" -#: builtin/push.c #, c-format msgid "" "The current branch %s has no upstream branch.\n" @@ -12661,19 +10726,16 @@ msgstr "" " git push --set-upstream %s %s\n" "%s" -#: builtin/push.c #, c-format msgid "The current branch %s has multiple upstream branches, refusing to push." msgstr "" "Tá brainsà iolracha suas srutha ag an mbrainse reatha %s, ag diúltú brú." -#: builtin/push.c msgid "" "You didn't specify any refspecs to push, and push.default is \"nothing\"." msgstr "" "NÃor shonraigh tú aon refspec le brú, agus is é push.default “rud ar bithâ€." -#: builtin/push.c #, c-format msgid "" "You are pushing to remote '%s', which is not the upstream of\n" @@ -12684,7 +10746,6 @@ msgstr "" "do bhrainse reatha '%s', gan insint liom cad ba cheart a bhrú\n" "chun an brainse iargúlta a nuashonrú." -#: builtin/push.c msgid "" "Updates were rejected because the tip of your current branch is behind\n" "its remote counterpart. If you want to integrate the remote changes,\n" @@ -12698,7 +10759,6 @@ msgstr "" "bain úsáid as 'git pull' sula mbrú arÃs.\n" "Féach an 'Nóta faoi fast-forward 'i 'git push --help' le haghaidh sonraÃ." -#: builtin/push.c msgid "" "Updates were rejected because a pushed branch tip is behind its remote\n" "counterpart. If you want to integrate the remote changes, use 'git pull'\n" @@ -12711,7 +10771,6 @@ msgstr "" "sula ndéantar é a bhrú arÃs.\n" "Féach an 'Nóta faoi fast-forward 'i 'git push --help' le haghaidh sonraÃ." -#: builtin/push.c msgid "" "Updates were rejected because the remote contains work that you do not\n" "have locally. This is usually caused by another repository pushing to\n" @@ -12727,12 +10786,10 @@ msgstr "" "'git tarraing' sula ndéantar é a bhrú arÃs.\n" "Féach an 'Nóta faoi fast-forward 'i 'git push --help' le haghaidh sonraÃ." -#: builtin/push.c msgid "Updates were rejected because the tag already exists in the remote." msgstr "" "DiúltaÃodh nuashonruithe toisc go bhfuil an clib ann cheana féin sa iargúlta." -#: builtin/push.c 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" @@ -12744,7 +10801,6 @@ msgstr "" "thiomanta,\n" "gan an rogha '--force' a úsáid.\n" -#: builtin/push.c msgid "" "Updates were rejected because the tip of the remote-tracking branch has\n" "been updated since the last checkout. If you want to integrate the\n" @@ -12756,17 +10812,14 @@ msgstr "" "athruithe iargúlta, bain úsáid as 'git pull' sula mbrú arÃs.\n" "Féach an 'Nóta faoi fast-forward 'i 'git push --help' le haghaidh sonraÃ." -#: builtin/push.c #, c-format msgid "Pushing to %s\n" msgstr "Ag brú chuig %s\n" -#: builtin/push.c #, c-format msgid "failed to push some refs to '%s'" msgstr "theip ar roinnt réimsà a bhrú chuig '%s'" -#: builtin/push.c msgid "" "recursing into submodule with push.recurseSubmodules=only; using on-demand " "instead" @@ -12774,94 +10827,72 @@ msgstr "" "athfhillteach isteach i bhfo-mhodúl le push.recurseSubmodules=only; ag baint " "úsáide as ar-éileamh ina ionad" -#: builtin/push.c builtin/send-pack.c submodule-config.c #, c-format msgid "invalid value for '%s'" msgstr "luach neamhbhailà do '%s'" -#: builtin/push.c builtin/submodule--helper.c msgid "repository" msgstr "stóras" -#: builtin/push.c msgid "push all branches" msgstr "brúigh gach brainse" -#: builtin/push.c builtin/send-pack.c msgid "mirror all refs" msgstr "scáthán gach ceann" -#: builtin/push.c msgid "delete refs" msgstr "scrios réimsÃ" -#: builtin/push.c msgid "push tags (can't be used with --all or --branches or --mirror)" msgstr "" "clibeanna brú (nà féidir iad a úsáid le --all nó --branches nó --mirror)" -#: builtin/push.c builtin/send-pack.c msgid "force updates" msgstr "nuashonruithe fórsa" -#: builtin/push.c builtin/send-pack.c msgid "<refname>:<expect>" msgstr "<refname>:<expect>" -#: builtin/push.c builtin/send-pack.c msgid "require old value of ref to be at this value" msgstr "a cheangal go mbeadh seanluach an tagartha ag an luach seo" -#: builtin/push.c builtin/send-pack.c msgid "require remote updates to be integrated locally" msgstr "éilÃonn go ndéanfaà nuashonruithe iargúlta" -#: builtin/push.c msgid "control recursive pushing of submodules" msgstr "brú athfhillteach ar fho-mhodúil a rialú" -#: builtin/push.c builtin/send-pack.c msgid "use thin pack" msgstr "bain úsáid as pacáiste tanaÃ" -#: builtin/push.c builtin/send-pack.c msgid "receive pack program" msgstr "clár pacáiste a fháil" -#: builtin/push.c msgid "set upstream for git pull/status" msgstr "socraigh suas sruth le haghaidh tarraing/stádas git" -#: builtin/push.c msgid "prune locally removed refs" msgstr "gearradh a bhaintear go háitiúil" -#: builtin/push.c msgid "bypass pre-push hook" msgstr "seachbhóthar crúca réamh" -#: builtin/push.c msgid "push missing but relevant tags" msgstr "clibeanna atá ar iarraidh ach ábhartha a" -#: builtin/push.c builtin/send-pack.c msgid "GPG sign the push" msgstr "SÃnÃonn GPG an brú" -#: builtin/push.c builtin/send-pack.c msgid "request atomic transaction on remote side" msgstr "iarraidh idirbheart adamach ar an taobh iargúl" -#: builtin/push.c msgid "--delete doesn't make sense without any refs" msgstr "--delete nÃl ciall leis gan aon réiteoirÃ" -#: builtin/push.c t/helper/test-bundle-uri.c #, c-format msgid "bad repository '%s'" msgstr "droch-stóras '%s'" -#: builtin/push.c msgid "" "No configured push destination.\n" "Either specify the URL from the command-line or configure a remote " @@ -12883,70 +10914,64 @@ msgstr "" "\n" " git push <ainm>\n" -#: builtin/push.c msgid "--all can't be combined with refspecs" msgstr "--all nà féidir é a chomhcheangal le refspecs" -#: builtin/push.c msgid "--mirror can't be combined with refspecs" msgstr "--mirror nà féidir é a chomhcheangal le refspecs" -#: builtin/push.c msgid "push options must not have new line characters" msgstr "nà chóir go mbeadh carachtair lÃne nua ag roghanna brú" -#: builtin/range-diff.c msgid "git range-diff [<options>] <old-base>..<old-tip> <new-base>..<new-tip>" msgstr "git range-diff [<options>] <old-base>..<old-tip> <new-base>..<new-tip>" -#: builtin/range-diff.c msgid "git range-diff [<options>] <old-tip>...<new-tip>" -msgstr "git range-diff [<options>] <old-base>..<old-tip> <new-base>..<new-tip>" +msgstr "git range-diff [<options>] <old-tip>...<new-tip>" -#: builtin/range-diff.c msgid "git range-diff [<options>] <base> <old-tip> <new-tip>" msgstr "git range-diff [<options>] <base> <old-tip> <new-tip>" -#: builtin/range-diff.c +#, c-format +msgid "invalid max-memory value: %s" +msgstr "uasluach cuimhne neamhbhailÃ: %s" + msgid "use simple diff colors" msgstr "bain úsáid as dathanna diff simplÃ" -#: builtin/range-diff.c msgid "notes" msgstr "nótaÃ" -#: builtin/range-diff.c msgid "passed to 'git log'" msgstr "cuireadh chuig 'git log'" -#: builtin/range-diff.c +msgid "size" +msgstr "méid" + +msgid "maximum memory for cost matrix (default 4G)" +msgstr "uasmhéid cuimhne don mhaitrÃs costais (4G réamhshocraithe)" + msgid "only emit output related to the first range" msgstr "nà scaoileann ach aschur a bhaineann leis an gcéad raon" -#: builtin/range-diff.c msgid "only emit output related to the second range" msgstr "nà scaoileann ach aschur a bhaineann leis an dara raon" -#: builtin/range-diff.c #, c-format msgid "not a revision: '%s'" msgstr "nà athbhreithniú: '%s'" -#: builtin/range-diff.c #, c-format msgid "not a commit range: '%s'" msgstr "nà raon tiomanta: '%s'" -#: builtin/range-diff.c #, c-format msgid "not a symmetric range: '%s'" msgstr "nà raon siméadrach: '%s'" -#: builtin/range-diff.c msgid "need two commit ranges" msgstr "dhá raon tiomanta ag teastáil" -#: builtin/read-tree.c msgid "" "git read-tree [(-m [--trivial] [--aggressive] | --reset | --" "prefix=<prefix>)\n" @@ -12958,140 +10983,109 @@ msgstr "" " [-u | -i]] [--index-output=<file>] [--no-sparse-checkout]\n" " (--empty | <tree-ish1> [<tree-ish2> [<tree-ish3>]])" -#: builtin/read-tree.c msgid "write resulting index to <file>" msgstr "scrÃobh innéacs mar thoradh air go <file>" -#: builtin/read-tree.c msgid "only empty the index" msgstr "ach an t-innéacs a fholmhú" -#: builtin/read-tree.c msgid "Merging" msgstr "Cumaisc" -#: builtin/read-tree.c msgid "perform a merge in addition to a read" msgstr "cumaisc a dhéanamh i dteannta le léamh" -#: builtin/read-tree.c msgid "3-way merge if no file level merging required" msgstr "Cumaisc trà bhealach mura gá cumasc leibhéal comhaid" -#: builtin/read-tree.c msgid "3-way merge in presence of adds and removes" msgstr "Cumaisc 3 bhealach i láthair breiseanna agus bainteanna" -#: builtin/read-tree.c msgid "same as -m, but discard unmerged entries" msgstr "mar an gcéanna le -m, ach caith iontrálacha neamh-chumhdaithe" -#: builtin/read-tree.c msgid "<subdirectory>/" msgstr "<subdirectory>/" -#: builtin/read-tree.c msgid "read the tree into the index under <subdirectory>/" msgstr "léigh an crann isteach san innéacs faoi<subdirectory>/" -#: builtin/read-tree.c msgid "update working tree with merge result" msgstr "crann oibre a nuashonrú le toradh cumaisc" -#: builtin/read-tree.c msgid "gitignore" -msgstr "gignor" +msgstr "gitignore" -#: builtin/read-tree.c msgid "allow explicitly ignored files to be overwritten" msgstr "ligean do chomhaid a dhéantar neamhaird air go sainrá" -#: builtin/read-tree.c msgid "don't check the working tree after merging" msgstr "ná seiceáil an crann oibre tar éis a chumasc" -#: builtin/read-tree.c msgid "don't update the index or the work tree" msgstr "ná nuashonraigh an t-innéacs nó an crann oibre" -#: builtin/read-tree.c msgid "skip applying sparse checkout filter" msgstr "scipeáil scagaire seiceála neamhchoitianta a" -#: builtin/read-tree.c msgid "debug unpack-trees" msgstr "crainn dÃphacáilte a dhÃfhabhtú" -#: builtin/read-tree.c msgid "suppress feedback messages" msgstr "teachtaireachtaà aiseolais" -#: builtin/read-tree.c msgid "You need to resolve your current index first" msgstr "Nà mór duit d'innéacs reatha a réiteach ar dtús" -#: builtin/rebase.c msgid "" "git rebase [-i] [options] [--exec <cmd>] [--onto <newbase> | --keep-base] " "[<upstream> [<branch>]]" msgstr "" -"<upstream><branch>git rebase [-i] [roghanna] [--exec<cmd>] [--onto " -"<newbase>| --keep-base] [[]]" +"git rebase [-i] [options] [--exec <cmd>] [--onto <newbase> | --keep-base] " +"[<upstream> [<branch>]]" -#: builtin/rebase.c msgid "" "git rebase [-i] [options] [--exec <cmd>] [--onto <newbase>] --root [<branch>]" msgstr "" -"<newbase><branch>git rebase [-i] [roghanna] [--exec] [-- <cmd>onto] --root []" +"git rebase [-i] [options] [--exec <cmd>] [--onto <newbase>] --root [<branch>]" -#: builtin/rebase.c sequencer.c #, c-format msgid "could not read '%s'." msgstr "nà raibh '%s' in ann a léamh." -#: builtin/rebase.c #, c-format msgid "could not create temporary %s" msgstr "nà fhéadfaà %s sealadach a chruthú" -#: builtin/rebase.c msgid "could not mark as interactive" msgstr "nà fhéadfaà marcáil mar idirghnÃomh" -#: builtin/rebase.c msgid "could not generate todo list" msgstr "nà raibh in ann liosta todo a ghiniúint" -#: builtin/rebase.c msgid "a base commit must be provided with --upstream or --onto" msgstr "caithfear gealltanas bonn a sholáthar le --upstream nó --onto" -#: builtin/rebase.c #, c-format msgid "%s requires the merge backend" msgstr "TeastaÃonn %s an cúltaca cumaisc" -#: builtin/rebase.c #, c-format msgid "invalid onto: '%s'" msgstr "neamhbhailà ar: '%s'" -#: builtin/rebase.c #, c-format msgid "invalid orig-head: '%s'" msgstr "orig-head neamhbhailÃ: '%s'" -#: builtin/rebase.c #, c-format msgid "ignoring invalid allow_rerere_autoupdate: '%s'" msgstr "neamhaird a dhéanamh de allow_rerere_autoupdate neamhbhailÃ: '%s'" -#: builtin/rebase.c builtin/rm.c sequencer.c #, c-format msgid "could not remove '%s'" msgstr "nà fhéadfaà '%s' a bhaint" -#: builtin/rebase.c #, c-format msgid "" "\n" @@ -13110,25 +11104,20 @@ msgstr "" "\n" "Mar thoradh air sin, nà féidir le git iad a athbhunú." -#: builtin/rebase.c #, c-format msgid "Unknown rebase-merges mode: %s" msgstr "Modh rebase-chumaisc anaithnid: %s" -#: builtin/rebase.c #, c-format msgid "could not switch to %s" msgstr "nà fhéadfaà aistriú go %s" -#: builtin/rebase.c msgid "apply options and merge options cannot be used together" msgstr "roghanna i bhfeidhm agus nà féidir roghanna cumaisc a úsáid le chéile" -#: builtin/rebase.c msgid "--empty=ask is deprecated; use '--empty=stop' instead." msgstr "Tá --empty=ask dÃscrÃofa; bain úsáid as '--empty=stop' ina ionad." -#: builtin/rebase.c #, c-format msgid "" "unrecognized empty type '%s'; valid values are \"drop\", \"keep\", and " @@ -13137,7 +11126,6 @@ msgstr "" "cineál folamh gan aithint '%s'; is iad na luachanna bailà ná “dropâ€, “keepâ€, " "agus “stopâ€." -#: builtin/rebase.c msgid "" "--rebase-merges with an empty string argument is deprecated and will stop " "working in a future version of Git. Use --rebase-merges without an argument " @@ -13147,7 +11135,6 @@ msgstr "" "obair i leagan amach anseo de Git. Úsáid --rebase-merges gan argóint ina " "ionad sin, a dhéanann an rud céanna." -#: builtin/rebase.c #, c-format msgid "" "%s\n" @@ -13164,7 +11151,6 @@ msgstr "" "git rebase '<brainse>'\n" "\n" -#: builtin/rebase.c #, c-format msgid "" "If you wish to set tracking information for this branch you can do so with:\n" @@ -13178,171 +11164,130 @@ msgstr "" " git branch --set-upstream-to=%s/<branch> %s\n" "\n" -#: builtin/rebase.c msgid "exec commands cannot contain newlines" msgstr "nà féidir lÃnte nua a bheith ag orduithe exec" -#: builtin/rebase.c msgid "empty exec command" msgstr "ordú exec folamh" -#: builtin/rebase.c msgid "rebase onto given branch instead of upstream" msgstr "athbhunú ar an mbrainse ar leith in ionad suas an sruth" -#: builtin/rebase.c msgid "use the merge-base of upstream and branch as the current base" msgstr "bain úsáid as bonn cumaisc suas sruth agus brainse mar an bonn reatha" -#: builtin/rebase.c msgid "allow pre-rebase hook to run" msgstr "ligean do chrúca réamh-athbhunaithe rith" -#: builtin/rebase.c msgid "be quiet. implies --no-stat" msgstr "a bheith ciúin. tugann le tuiscint --no-stat" -#: builtin/rebase.c msgid "display a diffstat of what changed upstream" msgstr "taispeáint diffstat den rud a d'athraigh suas an sruth" -#: builtin/rebase.c msgid "do not show diffstat of what changed upstream" msgstr "ná taispeáin diffstat den mhéid a d'athraigh suas an sruth" -#: builtin/rebase.c msgid "add a Signed-off-by trailer to each commit" msgstr "cuir leantóir sÃnithe le gach tiomantas" -#: builtin/rebase.c msgid "make committer date match author date" msgstr "dáta an údair comhoiriúnaithe dáta a dhéanamh" -#: builtin/rebase.c msgid "ignore author date and use current date" msgstr "neamhaird a dhéanamh ar dháta údair agus bain úsáid as" -#: builtin/rebase.c msgid "synonym of --reset-author-date" msgstr "comhchiallach de --reset-author-date" -#: builtin/rebase.c msgid "passed to 'git apply'" msgstr "cuireadh chuig 'git apply'" -#: builtin/rebase.c msgid "ignore changes in whitespace" msgstr "neamhaird a dhéanamh ar athruithe i spás bán" -#: builtin/rebase.c msgid "cherry-pick all commits, even if unchanged" msgstr "roghnaigh silÃnà gach gealltanas, fiú mura bhfuil gan athrú" -#: builtin/rebase.c msgid "continue" msgstr "leanúint" -#: builtin/rebase.c msgid "skip current patch and continue" msgstr "scipeáil an paiste reatha agus lean ar aghaidh" -#: builtin/rebase.c msgid "abort and check out the original branch" msgstr "déan deireadh a chur agus seiceáil ar an mbrainse bunaidh" -#: builtin/rebase.c msgid "abort but keep HEAD where it is" msgstr "déan deireadh ach coinnigh CEAD san áit a bhfuil sé" -#: builtin/rebase.c msgid "edit the todo list during an interactive rebase" msgstr "cuir an liosta todo in eagar le linn athbhunú idirghnÃomhach" -#: builtin/rebase.c msgid "show the patch file being applied or merged" msgstr "taispeáin an comhad paiste atá á chur i bhfeidhm nó á chumas" -#: builtin/rebase.c msgid "use apply strategies to rebase" msgstr "úsáid straitéisà i bhfeidhm chun athbhunú" -#: builtin/rebase.c msgid "use merging strategies to rebase" msgstr "straitéisà cumaisc a úsáid chun athbhunú" -#: builtin/rebase.c msgid "let the user edit the list of commits to rebase" msgstr "lig don úsáideoir liosta na dtiomantas a athbhunú a chur in eagar" -#: builtin/rebase.c msgid "(REMOVED) was: try to recreate merges instead of ignoring them" msgstr "" "(Bainte) a bhÃ: déan iarracht cumaisc a athchruthú in ionad neamhaird a " "dhéanamh orthu" -#: builtin/rebase.c builtin/revert.c msgid "how to handle commits that become empty" msgstr "conas gealltanais a éirÃonn folamh a láimhseáil" -#: builtin/rebase.c msgid "keep commits which start empty" msgstr "coinnigh gealltanais a thosaÃonn folamh" -#: builtin/rebase.c msgid "move commits that begin with squash!/fixup! under -i" msgstr "gealltanna gluaiseachta a thosaÃonn le squash! /socrú! faoi -i" -#: builtin/rebase.c msgid "update branches that point to commits that are being rebased" msgstr "brainsà a nuashonrú a thugann in iúl do ghealltanais atá á athbhunú" -#: builtin/rebase.c msgid "add exec lines after each commit of the editable list" msgstr "" "lÃnte exec a chur leis tar éis gach tiomantas den liosta in-eagarthóireachta" -#: builtin/rebase.c msgid "allow rebasing commits with empty messages" msgstr "ligean do thiomantas a athbhunú le teachtaireachtaà folamh" -#: builtin/rebase.c msgid "try to rebase merges instead of skipping them" msgstr "déan iarracht cumaisc a athbhunú in ionad iad a scipeáil" -#: builtin/rebase.c msgid "use 'merge-base --fork-point' to refine upstream" msgstr "bain úsáid as 'merge-base --fork-point' chun suas an sruth a bheachtú" -#: builtin/rebase.c msgid "use the given merge strategy" msgstr "bain úsáid as an straitéis cumaisc tugtha" -#: builtin/rebase.c builtin/revert.c msgid "option" msgstr "rogha" -#: builtin/rebase.c msgid "pass the argument through to the merge strategy" msgstr "an argóint a chur ar aghaidh chuig an straitéis cumaisc" -#: builtin/rebase.c msgid "rebase all reachable commits up to the root(s)" msgstr "" "athbhunú gach gealltanas inrochtana suas go dtà an fhréamh/na fréamhacha" -#: builtin/rebase.c msgid "automatically re-schedule any `exec` that fails" msgstr "athsceidealú go huathoibrÃoch aon `executaithe' a the" -#: builtin/rebase.c msgid "apply all changes, even those already present upstream" msgstr "gach athrú a chur i bhfeidhm, fiú iad siúd atá i láthair suas an" -#: builtin/rebase.c msgid "It looks like 'git am' is in progress. Cannot rebase." msgstr "Is cosúil go bhfuil 'git am' ar siúl. Nà féidir athbhunú." -#: builtin/rebase.c msgid "" "`rebase --preserve-merges` (-p) is no longer supported.\n" "Use `git rebase --abort` to terminate current rebase.\n" @@ -13352,7 +11297,6 @@ msgstr "" "Úsáid `git rebase --abort` chun rebase reatha a fhoirceannadh.\n" "Nó Ãosghrádú go v2.33, nó nÃos luaithe, chun an athbhunú a chur i gcrÃch." -#: builtin/rebase.c msgid "" "--preserve-merges was replaced by --rebase-merges\n" "Note: Your `pull.rebase` configuration may also be set to 'preserve',\n" @@ -13362,20 +11306,16 @@ msgstr "" "Nóta: Féadfar do chumraÃocht `pull.rebase` a shocrú chun 'caomhnú' freisin,\n" "nach dtacaÃtear leis a thuilleadh; bain úsáid as 'cumaisc' ina ionad" -#: builtin/rebase.c msgid "no rebase in progress" msgstr "nÃl aon athbhunú ar siúl" -#: builtin/rebase.c msgid "The --edit-todo action can only be used during interactive rebase." msgstr "" "Nà féidir an gnÃomh --edit-todo a úsáid ach le linn athbhunú idirghnÃomhach." -#: builtin/rebase.c msgid "Cannot read HEAD" msgstr "Nà féidir HEAD a léamh" -#: builtin/rebase.c msgid "" "You must edit all merge conflicts and then\n" "mark them as resolved using git add" @@ -13383,16 +11323,13 @@ msgstr "" "Nà mór duit gach coinbhleacht cumaisc a chur in eagar agus ansin\n" "iad a mharcáil mar réitigh ag úsáid git add" -#: builtin/rebase.c msgid "could not discard worktree changes" msgstr "nà fhéadfadh athruithe crann oibre a dhiúscairt" -#: builtin/rebase.c #, c-format msgid "could not move back to %s" msgstr "nà fhéadfaà bogadh ar ais chuig %s" -#: builtin/rebase.c #, c-format msgid "" "It seems that there is already a %s directory, and\n" @@ -13413,11 +11350,9 @@ msgstr "" "agus rith mé arÃs. Táim ag stopadh i gcás go bhfuil rud éigin agat fós\n" "luachmhar ansin.\n" -#: builtin/rebase.c msgid "switch `C' expects a numerical value" msgstr "tá an lasc `C' ag súil le luach uimhriúil" -#: builtin/rebase.c msgid "" "apply options are incompatible with rebase.rebaseMerges. Consider adding --" "no-rebase-merges" @@ -13425,7 +11360,6 @@ msgstr "" "tá roghanna cur i bhfeidhm neamhoiriúnach le rebase.rebaseMerges. Smaoinigh " "ar --no-rebase-merges a chur leis" -#: builtin/rebase.c msgid "" "apply options are incompatible with rebase.updateRefs. Consider adding --no-" "update-refs" @@ -13433,105 +11367,83 @@ msgstr "" "tá roghanna cur i bhfeidhm neamhoiriúnach le rebase.updateRefs. Smaoinigh ar " "--no-update-refs a chur leis" -#: builtin/rebase.c #, c-format msgid "Unknown rebase backend: %s" msgstr "Cúltaca athbhunaithe anaithnid: %s" -#: builtin/rebase.c msgid "--reschedule-failed-exec requires --exec or --interactive" msgstr "ÉilÃonn --reschedule-failed-exec --exec nó --interactive" -#: builtin/rebase.c #, c-format msgid "invalid upstream '%s'" msgstr "neamhbhailà suas sruth '%s'" -#: builtin/rebase.c msgid "Could not create new root commit" msgstr "Nà fhéadfaà tiomantas fréimhe nua a chruthú" -#: builtin/rebase.c #, c-format msgid "no such branch/commit '%s'" msgstr "gan aon bhrainse/tiomantas '%s' den sórt sin" -#: builtin/rebase.c builtin/submodule--helper.c #, c-format msgid "No such ref: %s" msgstr "NÃl aon tagairt den sórt sin: %s" -#: builtin/rebase.c msgid "Could not resolve HEAD to a commit" msgstr "Nà fhéadfaà HEAD a réiteach le tiomantas" -#: builtin/rebase.c #, c-format msgid "'%s': need exactly one merge base with branch" msgstr "'%s': teastaÃonn bonn cumaisc amháin dÃreach le brainse" -#: builtin/rebase.c #, c-format msgid "'%s': need exactly one merge base" msgstr "'%s': teastaÃonn bonn cumaisc amháin dÃreach" -#: builtin/rebase.c #, c-format msgid "Does not point to a valid commit '%s'" msgstr "Nà thugann sé in iúl do thiomantas bailà '%s'" -#: builtin/rebase.c msgid "HEAD is up to date." msgstr "Tá HEAD cothrom le dáta." -#: builtin/rebase.c #, c-format msgid "Current branch %s is up to date.\n" msgstr "Tá an brainse reatha %s cothrom le dáta.\n" -#: builtin/rebase.c msgid "HEAD is up to date, rebase forced." msgstr "Tá HEAD cothrom le dáta, athbhunú éigeantach." -#: builtin/rebase.c #, c-format msgid "Current branch %s is up to date, rebase forced.\n" msgstr "Tá an brainse reatha %s cothrom le dáta, athbhunú éigeantach.\n" -#: builtin/rebase.c msgid "The pre-rebase hook refused to rebase." msgstr "Dhiúltaigh an crúca réamh-athbhunú a athbhunú." -#: builtin/rebase.c #, c-format msgid "Changes to %s:\n" msgstr "Athruithe ar %s:\n" -#: builtin/rebase.c #, c-format msgid "Changes from %s to %s:\n" msgstr "Athruithe ó %s go %s:\n" -#: builtin/rebase.c #, c-format msgid "First, rewinding head to replay your work on top of it...\n" msgstr "" "Ar dtús, téann athfhillte chun do chuid oibre a athsheinm ar a bharr...\n" -#: builtin/rebase.c msgid "Could not detach HEAD" msgstr "Nà fhéadfaà CEAD a dhÃcheangal" -#: builtin/rebase.c #, c-format msgid "Fast-forwarded %s to %s.\n" msgstr "Cuireadh %s ar aghaidh go tapa chuig %s.\n" -#: builtin/receive-pack.c msgid "git receive-pack <git-dir>" msgstr "git receive-pack <git-dir>" -#: builtin/receive-pack.c 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" @@ -13565,7 +11477,6 @@ msgstr "" "choinneáil fós, socraigh\n" "Athróg cumraÃochta 'receive.denyCurrentBranch' go 'refuse'." -#: builtin/receive-pack.c 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" @@ -13587,86 +11498,73 @@ msgstr "" "\n" "Chun an teachtaireacht seo a ghearradh, is féidir leat é a shocrú go 'diúlt'." -#: builtin/receive-pack.c msgid "quiet" msgstr "ciúin" -#: builtin/receive-pack.c msgid "you must specify a directory" msgstr "nà mór duit eolaire a shonrú" -#: builtin/reflog.c msgid "git reflog [show] [<log-options>] [<ref>]" -msgstr "<ref>git reflog [taispeáin] [] [<log-options>]" +msgstr "git reflog [show] [<log-options>] [<ref>]" -#: builtin/reflog.c msgid "git reflog list" -msgstr "git reflog liosta" +msgstr "git reflog list" -#: builtin/reflog.c -msgid "" -"git reflog expire [--expire=<time>] [--expire-unreachable=<time>]\n" -" [--rewrite] [--updateref] [--stale-fix]\n" -" [--dry-run | -n] [--verbose] [--all [--single-worktree] | " -"<refs>...]" -msgstr "" -"<time><time>git reflog in éag [--expire=] [--expire-unreachable=]\n" -" [--athscrÃobh] [--updateref] [--stale-fix]\n" -" <refs>[--dry-run | -n] [--verbose] [--all [--one-worktree] |...]" +msgid "git reflog exists <ref>" +msgstr "git reflog exists <ref>" + +msgid "git reflog write <ref> <old-oid> <new-oid> <message>" +msgstr "git reflog write <ref> <old-oid> <new-oid> <message>" -#: builtin/reflog.c msgid "" "git reflog delete [--rewrite] [--updateref]\n" " [--dry-run | -n] [--verbose] <ref>@{<specifier>}..." msgstr "" -"git reflog scrios [--athscrÃobh] [--updateref]\n" -" <ref><specifier>[--driy-run | -n] [--verbose] @ {}..." - -#: builtin/reflog.c -msgid "git reflog exists <ref>" -msgstr "git reflog ann <ref>" +"git reflog delete [--rewrite] [--updateref]\n" +" [--dry-run | -n] [--verbose] <ref>@{<specifier>}..." -#: builtin/reflog.c msgid "git reflog drop [--all [--single-worktree] | <refs>...]" -msgstr "<refs>git reflog titim [--all [--one-worktree] |...]" +msgstr "git reflog drop [--all [--single-worktree] | <refs>...]" + +msgid "" +"git reflog expire [--expire=<time>] [--expire-unreachable=<time>]\n" +" [--rewrite] [--updateref] [--stale-fix]\n" +" [--dry-run | -n] [--verbose] [--all [--single-worktree] | " +"<refs>...]" +msgstr "" +"git reflog expire [--expire=<time>] [--expire-unreachable=<time>]\n" +" [--rewrite] [--updateref] [--stale-fix]\n" +" [--dry-run | -n] [--verbose] [--all [--single-worktree] | " +"<refs>...]" -#: builtin/reflog.c #, c-format msgid "invalid timestamp '%s' given to '--%s'" msgstr "stampa ama neamhbhailà '%s' a thugtar do '--%s'" -#: builtin/reflog.c sequencer.c #, c-format msgid "%s does not accept arguments: '%s'" msgstr "Nà ghlacann %s le hargóintÃ: '%s'" -#: builtin/reflog.c msgid "do not actually prune any entries" msgstr "ná déan aon iontrálacha a ghearradh" -#: builtin/reflog.c msgid "" "rewrite the old SHA1 with the new SHA1 of the entry that now precedes it" msgstr "" "athscrÃobh an sean-SHA1 leis an SHA1 nua den iontráil atá roimh ré anois" -#: builtin/reflog.c msgid "update the reference to the value of the top reflog entry" msgstr "an tagairt do luach an iontráil reflog barr a nuashonrú" -#: builtin/reflog.c msgid "print extra information on screen" msgstr "faisnéis bhreise a phriontáil ar an sc" -#: builtin/reflog.c msgid "timestamp" msgstr "stampa ama" -#: builtin/reflog.c msgid "prune entries older than the specified time" msgstr "iontrálacha brónta nÃos sine ná an t-am sonraithe" -#: builtin/reflog.c msgid "" "prune entries older than <time> that are not reachable from the current tip " "of the branch" @@ -13674,89 +11572,119 @@ msgstr "" "nà féidir iontrálacha br <time>ónta nÃos sine ná sin a bhaint amach ó bharr " "reatha na brainse" -#: builtin/reflog.c msgid "prune any reflog entries that point to broken commits" msgstr "" "aon iontrálacha reflog a ghearradh a chuireann in iúl do thiomantas briste" -#: builtin/reflog.c msgid "process the reflogs of all references" msgstr "athfhillteacha na dtagairtà go léir a phróiseáil" -#: builtin/reflog.c msgid "limits processing to reflogs from the current worktree only" msgstr "" "teorann sé leis an bpróiseáil do athfhillteacha ón gcrann oibre reatha amháin" -#: builtin/reflog.c #, c-format msgid "Marking reachable objects..." msgstr "Rudaà inrochtana a mharcáil..." -#: builtin/reflog.c #, c-format msgid "reflog could not be found: '%s'" msgstr "nà fhéadfaà reflog a fháil: '%s'" -#: builtin/reflog.c msgid "no reflog specified to delete" msgstr "nÃl aon reflog sonraithe le scriosadh" -#: builtin/reflog.c #, c-format msgid "invalid ref format: %s" msgstr "formáid tagartha neamhbhailÃ: %s" -#: builtin/reflog.c msgid "drop the reflogs of all references" msgstr "scaoil athbhreithniú na dtagairtà go léir" -#: builtin/reflog.c msgid "drop reflogs from the current worktree only" msgstr "scaoil reflogs ón gcrann oibre reatha amháin" -#: builtin/reflog.c msgid "references specified along with --all" msgstr "tagairtà sonraithe in éineacht le --all" -#: builtin/refs.c +#, c-format +msgid "invalid reference name: %s" +msgstr "ainm tagartha neamhbhailÃ: %s" + +#, c-format +msgid "invalid old object ID: '%s'" +msgstr "iD seanréada neamhbhailÃ: '%s'" + +#, c-format +msgid "old object '%s' does not exist" +msgstr "nÃl an seanréad '%s' ann" + +#, c-format +msgid "invalid new object ID: '%s'" +msgstr "iD réada nua neamhbhailÃ: '%s'" + +#, c-format +msgid "new object '%s' does not exist" +msgstr "nÃl an réad nua '%s' ann" + +#, c-format +msgid "cannot start transaction: %s" +msgstr "nà féidir an t-idirbheart a thosú: %s" + +#, c-format +msgid "cannot queue reflog update: %s" +msgstr "nà féidir nuashonrú athbhlagála a chur sa scuaine: %s" + +#, c-format +msgid "cannot commit reflog update: %s" +msgstr "nà féidir nuashonrú athbhlagála a dhéanamh: %s" + msgid "git refs migrate --ref-format=<format> [--no-reflog] [--dry-run]" msgstr "git refs migrate --ref-format=<format> [--no-reflog] [--dry-run]" -#: builtin/refs.c msgid "git refs verify [--strict] [--verbose]" -msgstr "fÃoraÃonn git refs [--strong] [--verbose]" +msgstr "git refs verify [--strict] [--verbose]" + +msgid "git refs exists <ref>" +msgstr "git refs exists <ref>" + +msgid "git refs optimize " +msgstr "git refs optimize " -#: builtin/refs.c msgid "specify the reference format to convert to" msgstr "sonraigh an fhormáid tagartha le tiontú" -#: builtin/refs.c msgid "perform a non-destructive dry-run" msgstr "rith tirim neamh-millteach a dhéanamh" -#: builtin/refs.c msgid "drop reflogs entirely during the migration" msgstr "titim athfhóga go hiomlán le linn na himirce" -#: builtin/refs.c msgid "missing --ref-format=<format>" msgstr "ar iarraidh --ref-format=<format>" -#: builtin/refs.c #, c-format msgid "repository already uses '%s' format" msgstr "úsáideann stór formáid '%s' cheana féin" -#: builtin/refs.c msgid "enable strict checking" msgstr "cumasú seiceáil docht" -#: builtin/refs.c msgid "'git refs verify' takes no arguments" msgstr "Nà ghlacann 'git refs verify' aon argóintÃ" -#: builtin/remote.c +msgid "git refs list " +msgstr "git refs list " + +msgid "'git refs exists' requires a reference" +msgstr "Tá tagairt ag teastáil do 'git refs exists'" + +msgid "reference does not exist" +msgstr "nÃl tagairt ann" + +msgid "failed to look up reference" +msgstr "theip ort tagairt a lorg suas" + msgid "" "git remote add [-t <branch>] [-m <master>] [-f] [--tags | --no-tags] [--" "mirror=<fetch|push>] <name> <url>" @@ -13764,87 +11692,67 @@ msgstr "" "git remote add [-t <branch>] [-m <master>] [-f] [--tags | --no-tags] [--" "mirror=<fetch|push>] <name> <url>" -#: builtin/remote.c msgid "git remote rename [--[no-]progress] <old> <new>" msgstr "git remote rename [--[no-]progress] <old> <new>" -#: builtin/remote.c msgid "git remote remove <name>" msgstr "git remote remove <name>" -#: builtin/remote.c msgid "git remote set-head <name> (-a | --auto | -d | --delete | <branch>)" msgstr "git remote set-head <name> (-a | --auto | -d | --delete | <branch>)" -#: builtin/remote.c msgid "git remote [-v | --verbose] show [-n] <name>" msgstr "git remote [-v | --verbose] show [-n] <name>" -#: builtin/remote.c msgid "git remote prune [-n | --dry-run] <name>" msgstr "git remote prune [-n | --dry-run] <name>" -#: builtin/remote.c msgid "" "git remote [-v | --verbose] update [-p | --prune] [(<group> | <remote>)...]" msgstr "" "git remote [-v | --verbose] update [-p | --prune] [(<group> | <remote>)...]" -#: builtin/remote.c msgid "git remote set-branches [--add] <name> <branch>..." msgstr "git remote set-branches [--add] <name> <branch>..." -#: builtin/remote.c msgid "git remote get-url [--push] [--all] <name>" msgstr "git remote get-url [--push] [--all] <name>" -#: builtin/remote.c msgid "git remote set-url [--push] <name> <newurl> [<oldurl>]" msgstr "git remote set-url [--push] <name> <newurl> [<oldurl>]" -#: builtin/remote.c msgid "git remote set-url --add <name> <newurl>" -msgstr "git iargúlta set-url --add <name><newurl>" +msgstr "git remote set-url --add <name> <newurl>" -#: builtin/remote.c msgid "git remote set-url --delete <name> <url>" -msgstr "git iargúlta set-url --delete <name><url>" +msgstr "git remote set-url --delete <name> <url>" -#: builtin/remote.c msgid "git remote add [<options>] <name> <url>" msgstr "git remote add [<options>] <name> <url>" -#: builtin/remote.c msgid "git remote set-branches <name> <branch>..." msgstr "git remote set-branches <name> <branch>..." -#: builtin/remote.c msgid "git remote set-branches --add <name> <branch>..." msgstr "git remote set-branches --add <name> <branch>..." -#: builtin/remote.c msgid "git remote show [<options>] <name>" msgstr "git remote show [<options>] <name>" -#: builtin/remote.c msgid "git remote prune [<options>] <name>" msgstr "git remote prune [<options>] <name>" -#: builtin/remote.c msgid "git remote update [<options>] [<group> | <remote>]..." msgstr "git remote update [<options>] [<group> | <remote>]..." -#: builtin/remote.c #, c-format msgid "Updating %s" msgstr "Nuashonrú %s" -#: builtin/remote.c #, c-format msgid "Could not fetch %s" msgstr "NÃorbh fhéidir %s a fháil" -#: builtin/remote.c msgid "" "--mirror is dangerous and deprecated; please\n" "\t use --mirror=fetch or --mirror=push instead" @@ -13852,16 +11760,21 @@ msgstr "" "--mirror tá scáthán contúirteach agus mÃchuir; le do thoil\n" " bain úsáid as --mirror=fetch nó --mirror=push ina ionad" -#: builtin/remote.c #, c-format msgid "unknown --mirror argument: %s" msgstr "argóint --mirror anaithnid: %s" -#: builtin/remote.c +#, c-format +msgid "remote name '%s' is a subset of existing remote '%s'" +msgstr "is fo-thacar den chianda '%s' atá ann cheana ainm '%s'" + +#, c-format +msgid "remote name '%s' is a superset of existing remote '%s'" +msgstr "is sár-thacar den chianda '%s' atá ann cheana é ainm an chianda '%s'" + msgid "fetch the remote branches" msgstr "faigh na brainsà iargúlta" -#: builtin/remote.c msgid "" "import all tags and associated objects when fetching\n" "or do not fetch any tag at all (--no-tags)" @@ -13869,70 +11782,56 @@ msgstr "" "iompórtáil gach clib agus rudaà gaolmhara agus tú ag tabhairt\n" "nó ná faigh aon chlib ar chor ar bith (--no-tags)" -#: builtin/remote.c msgid "branch(es) to track" msgstr "brainse (Ã) chun rianú" -#: builtin/remote.c msgid "master branch" msgstr "máistirbhrainse" -#: builtin/remote.c msgid "set up remote as a mirror to push to or fetch from" -msgstr "cuir iargúlta ar bun mar scáthán chun brú chuig nó a fháil uaidh" +msgstr "" +"socraigh an cianrialtán mar scáthán le brú chuig nó le hathshlánú uaidh" -#: builtin/remote.c msgid "specifying a master branch makes no sense with --mirror" msgstr "nÃl aon chiall ar mháistirbhrainse a shonrú le --mirror" -#: builtin/remote.c msgid "specifying branches to track makes sense only with fetch mirrors" msgstr "nÃÃl ciall le brainsà a shonrú le rianú ach le scátháin faighte" -#: builtin/remote.c #, c-format msgid "remote %s already exists." msgstr "iargúlta %s ann cheana féin." -#: builtin/remote.c #, c-format msgid "Could not setup master '%s'" msgstr "Nà raibh an máistir '%s' a shocrú" -#: builtin/remote.c trailer.c #, c-format msgid "more than one %s" msgstr "nÃos mó ná %s amháin" -#: builtin/remote.c #, c-format msgid "unhandled branch.%s.rebase=%s; assuming 'true'" msgstr "brainse gan láimhseáil. %s.rebase=%s; ag glacadh leis 'fÃor'" -#: builtin/remote.c #, c-format msgid "Could not get fetch map for refspec %s" msgstr "NÃorbh fhéidir léarscáil a fháil do refspec %s" -#: builtin/remote.c msgid "(matching)" msgstr "(meaitseáil)" -#: builtin/remote.c msgid "(delete)" msgstr "(scrios)" -#: builtin/remote.c #, c-format msgid "could not set '%s'" msgstr "nà fhéadfaà '%s' a shocrú" -#: builtin/remote.c config.c #, c-format msgid "could not unset '%s'" msgstr "nà fhéadfaà '%s' a dhÃshocrú" -#: builtin/remote.c #, c-format msgid "" "The %s configuration remote.pushDefault in:\n" @@ -13943,17 +11842,39 @@ msgstr "" " %s: %d\n" "ainmnÃonn anois an iargúlta nach bhfuil ann '%s'" -#: builtin/remote.c +msgid "" +"The remote you are trying to rename has conflicting references in the\n" +"new target refspec. This is most likely caused by you trying to nest\n" +"a remote into itself, e.g. by renaming 'parent' into 'parent/child'\n" +"or by unnesting a remote, e.g. the other way round.\n" +"\n" +"If that is the case, you can address this by first renaming the\n" +"remote to a different name.\n" +msgstr "" +"Tá tagairtà contrártha sa\n" +"tagarmharc sprice nua ag an gcianrialtán atá tú ag iarraidh a athainmniú. Is " +"dóichà gur mar gheall ar iarracht a dhéanamh cianrialtán a neadú ann féin, " +"e.g. trà 'tuismitheoir' a athainmniú go 'tuismitheoir/leanbh'\n" +"nó trà chianrialtán a dhÃ-neadú, e.g. an bealach eile.\n" +"\n" +"Más amhlaidh atá, is féidir leat é seo a réiteach trÃd an\n" +"chianrialtán a athainmniú go hainm difriúil ar dtús.\n" + #, c-format msgid "No such remote: '%s'" msgstr "NÃl aon iargúlta den sórt sin: '%s'" -#: builtin/remote.c #, c-format msgid "Could not rename config section '%s' to '%s'" msgstr "Nà fhéadfaà an chuid cumraithe '%s' a athainmniú go '%s'" -#: builtin/remote.c +msgid "Renaming remote references" +msgstr "Tagairtà cianda a athainmniú" + +#, c-format +msgid "queueing remote ref renames failed: %s" +msgstr "theip ar athainmnithe tagartha iargúlta a chur i scuaine: %s" + #, c-format msgid "" "Not updating non-default fetch refspec\n" @@ -13964,21 +11885,10 @@ msgstr "" " %s\n" " Nuashonraigh an chumraÃocht de láimh más gá." -#: builtin/remote.c -msgid "Renaming remote references" -msgstr "Tagairtà cianda a athainmniú" - -#: builtin/remote.c -#, c-format -msgid "deleting '%s' failed" -msgstr "theip ar '%s' a scriosadh" - -#: builtin/remote.c #, c-format -msgid "creating '%s' failed" -msgstr "theip ar chruthú '%s'" +msgid "renaming remote refs failed: %s" +msgstr "theip ar athainmniú na dtagairtà iargúlta: %s" -#: builtin/remote.c msgid "" "Note: A branch outside the refs/remotes/ hierarchy was not removed;\n" "to delete it, use:" @@ -13995,117 +11905,92 @@ msgstr[2] "" "Nóta: NÃor baineadh roinnt brainsà lasmuigh den ordlathas refs/remotes/;\n" "chun iad a scriosadh, bain úsáid as:" -#: builtin/remote.c #, c-format msgid "Could not remove config section '%s'" msgstr "Nà raibh an chuid cumraithe '%s' in ann a bhaint" -#: builtin/remote.c #, c-format msgid " new (next fetch will store in remotes/%s)" msgstr " nua (stóráilfidh an chéad fhaighteacht eile i iargúlta/%s)" -#: builtin/remote.c msgid " tracked" msgstr " rianaithe" -#: builtin/remote.c msgid " skipped" msgstr " scipeáilte" -#: builtin/remote.c msgid " stale (use 'git remote prune' to remove)" msgstr " seasta (bain úsáid as 'git remote prune' chun a bhaint)" -#: builtin/remote.c msgid " ???" msgstr " ???" -#: builtin/remote.c #, c-format msgid "invalid branch.%s.merge; cannot rebase onto > 1 branch" -msgstr "brainse neamhbhailÃ. %s.merge; nà féidir athbhunú ar> 1 bhrainse" +msgstr "brainse neamhbhailÃ. %s.merge; nà féidir athbhunú ar > 1 bhrainse" -#: builtin/remote.c #, c-format msgid "rebases interactively onto remote %s" msgstr "athbhunú go hidirghnÃomhach ar iargúlta %s" -#: builtin/remote.c #, c-format msgid "rebases interactively (with merges) onto remote %s" msgstr "athbhunú idirghnÃomhach (le cumaisc) ar iargúlta %s" -#: builtin/remote.c #, c-format msgid "rebases onto remote %s" msgstr "athbhunú ar iargúlta %s" -#: builtin/remote.c #, c-format msgid " merges with remote %s" msgstr " merges with remote %s" -#: builtin/remote.c #, c-format msgid "merges with remote %s" msgstr "cumasc le iargúlta %s" -#: builtin/remote.c #, c-format msgid "%-*s and with remote %s\n" msgstr "%-*s agus le iargúlta %s\n" -#: builtin/remote.c msgid "create" msgstr "cruthú" -#: builtin/remote.c msgid "delete" msgstr "scriosadh" -#: builtin/remote.c msgid "up to date" msgstr "cothrom le dáta" -#: builtin/remote.c msgid "fast-forwardable" msgstr "tapa a sheoladh" -#: builtin/remote.c msgid "local out of date" msgstr "áitiúil as dáta" -#: builtin/remote.c #, c-format msgid " %-*s forces to %-*s (%s)" msgstr " fórsaà %-*s go %-*s (%s)" -#: builtin/remote.c #, c-format msgid " %-*s pushes to %-*s (%s)" msgstr " %-*s ag brú go %-*s (%s)" -#: builtin/remote.c #, c-format msgid " %-*s forces to %s" msgstr " feidhmÃonn %-*s chuig %s" -#: builtin/remote.c #, c-format msgid " %-*s pushes to %s" msgstr " %-*s ag brú chuig %s" -#: builtin/remote.c msgid "do not query remotes" msgstr "ná fiosraigh iargúlta" -#: builtin/remote.c #, c-format msgid "* remote %s" msgstr "* iargúlta %s" -#: builtin/remote.c #, c-format msgid " Fetch URL: %s" msgstr " Faigh URL: %s" @@ -14114,29 +11999,23 @@ msgstr " Faigh URL: %s" #. with the one in " Fetch URL: %s" #. translation. #. -#: builtin/remote.c #, c-format msgid " Push URL: %s" msgstr " Brúigh URL: %s" -#: builtin/remote.c msgid "(no URL)" msgstr "(gan URL)" -#: builtin/remote.c #, c-format msgid " HEAD branch: %s" msgstr " Brainse CEANN: %s" -#: builtin/remote.c msgid "(not queried)" msgstr "(gan iarraidh)" -#: builtin/remote.c msgid "(unknown)" msgstr "(anaithnid)" -#: builtin/remote.c #, c-format msgid "" " HEAD branch (remote HEAD is ambiguous, may be one of the following):\n" @@ -14144,7 +12023,6 @@ msgstr "" " Brainse HEAD (tá CEAD iargúlta débhrÃoch, d'fhéadfadh a bheith ar cheann " "de na nithe seo a leanas)\n" -#: builtin/remote.c #, c-format msgid " Remote branch:%s" msgid_plural " Remote branches:%s" @@ -14152,22 +12030,18 @@ msgstr[0] " Brainse iargúlta: %s" msgstr[1] " Brainsà iargúlta:%s" msgstr[2] " Brainsà iargúlta:%s" -#: builtin/remote.c msgid " (status not queried)" msgstr " (nÃor fiosraÃodh an stádas)" -#: builtin/remote.c msgid " Local branch configured for 'git pull':" msgid_plural " Local branches configured for 'git pull':" msgstr[0] " Brainse áitiúil cumraithe le haghaidh 'git pull':" msgstr[1] " Craobhacha áitiúla cumraithe le haghaidh 'git pull':" msgstr[2] " Craobhacha áitiúla cumraithe le haghaidh 'git pull':" -#: builtin/remote.c msgid " Local refs will be mirrored by 'git push'" msgstr " Déanfar tagairtà áitiúla a léiriú le 'git push'" -#: builtin/remote.c #, c-format msgid " Local ref configured for 'git push'%s:" msgid_plural " Local refs configured for 'git push'%s:" @@ -14175,27 +12049,22 @@ msgstr[0] " Tagairt áitiúil cumraithe le haghaidh 'git push'%s:" msgstr[1] " Tagairtà áitiúla cumraithe le haghaidh 'git push'%s:" msgstr[2] " Tagairtà áitiúla cumraithe le haghaidh 'git push'%s:" -#: builtin/remote.c #, c-format msgid "'%s/HEAD' is unchanged and points to '%s'\n" msgstr "NÃl '%s/head' gan athrú agus dÃrÃonn sé chuig '%s'\n" -#: builtin/remote.c #, c-format msgid "'%s/HEAD' has changed from '%s' and now points to '%s'\n" msgstr "Tá '%s/head' athraithe ó '%s' agus léirÃonn sé anois chuig '%s'\n" -#: builtin/remote.c #, c-format msgid "'%s/HEAD' is now created and points to '%s'\n" msgstr "CruthaÃtear '%s/head' anois agus léirÃonn sé chuig '%s'\n" -#: builtin/remote.c #, c-format msgid "'%s/HEAD' was detached at '%s' and now points to '%s'\n" msgstr "Bhà '%s/head' scoite ag '%s' agus dÃrÃonn sé anois chuig '%s'\n" -#: builtin/remote.c #, c-format msgid "" "'%s/HEAD' used to point to '%s' (which is not a remote branch), but now " @@ -14204,139 +12073,101 @@ msgstr "" "Úsáidtear '%s/head' chun dÃriú chuig '%s' (nach brainse iargúlta é), ach " "léirÃonn sé anois chuig '%s'\n" -#: builtin/remote.c msgid "set refs/remotes/<name>/HEAD according to remote" msgstr "socraigh refs/remotes/<name>/HEAD de réir an chianrialtáin" -#: builtin/remote.c msgid "delete refs/remotes/<name>/HEAD" msgstr "scrios refs/remotes/<name>/HEAD" -#: builtin/remote.c msgid "Cannot determine remote HEAD" msgstr "Nà féidir CEAD cianda a chinneadh" -#: builtin/remote.c msgid "Multiple remote HEAD branches. Please choose one explicitly with:" msgstr "" "Brainsà iomadúla HEAD iargúlta. Roghnaigh ceann go sainráite le do thoil:" -#: builtin/remote.c #, c-format msgid "Could not delete %s" msgstr "Nà fhéadfaà %s a scriosadh" -#: builtin/remote.c #, c-format msgid "Not a valid ref: %s" msgstr "Nà tagairt bailÃ: %s" -#: builtin/remote.c #, c-format msgid "Could not set up %s" msgstr "NÃor féidir %s a chur ar bun" -#: builtin/remote.c -#, c-format -msgid " %s will become dangling!" -msgstr " Beidh %s ag crochadh!" - -#: builtin/remote.c -#, c-format -msgid " %s has become dangling!" -msgstr " tá %s ag crochadh!" - -#: builtin/remote.c #, c-format msgid "Pruning %s" msgstr "Bearradh %s" -#: builtin/remote.c #, c-format msgid "URL: %s" msgstr "URL: %s" -#: builtin/remote.c #, c-format msgid " * [would prune] %s" msgstr " * [bhearna] %s" -#: builtin/remote.c #, c-format msgid " * [pruned] %s" msgstr " * [gearrtha] %s" -#: builtin/remote.c msgid "prune remotes after fetching" msgstr "iomadáin brónta tar éis a fháil" -#: builtin/remote.c #, c-format msgid "No such remote '%s'" msgstr "NÃl aon iargúlta '%s' den sórt sin" -#: builtin/remote.c msgid "add branch" msgstr "cuir brainse" -#: builtin/remote.c msgid "no remote specified" msgstr "gan aon iargúlta sonraithe" -#: builtin/remote.c msgid "query push URLs rather than fetch URLs" msgstr "cuir fiosrúcháin ar URLanna brú seachas URLanna aisghabhála" -#: builtin/remote.c msgid "return all URLs" msgstr "gach URL a thabhairt ar ais" -#: builtin/remote.c msgid "manipulate push URLs" msgstr "ionramháil URLanna bhrú" -#: builtin/remote.c msgid "add URL" msgstr "cuir URL leis" -#: builtin/remote.c msgid "delete URLs" msgstr "scrios URLanna" -#: builtin/remote.c msgid "--add --delete doesn't make sense" msgstr "NÃl ciall ag --add --delete" -#: builtin/remote.c #, c-format msgid "Invalid old URL pattern: %s" msgstr "Sean-phatrún URL neamhbhailÃ: %s" -#: builtin/remote.c #, c-format msgid "No such URL found: %s" msgstr "NÃor aimsÃodh aon URL den sórt sin: %s" -#: builtin/remote.c msgid "Will not delete all non-push URLs" msgstr "Nà scriosfaidh sé gach URL neamh-bhrú" -#: builtin/remote.c msgid "be verbose; must be placed before a subcommand" msgstr "a bheith inearálta; caithfear é a chur os comhair fo-ordú" -#: builtin/repack.c msgid "" "git repack [-a] [-A] [-d] [-f] [-F] [-l] [-n] [-q] [-b] [-m]\n" "[--window=<n>] [--depth=<n>] [--threads=<n>] [--keep-pack=<pack-name>]\n" -"[--write-midx] [--name-hash-version=<n>]" +"[--write-midx] [--name-hash-version=<n>] [--path-walk]" msgstr "" -"git athphacáil [-a] [-A] [-d] [-f] [-F] [-l] [-n] [-q] [-b] [-m]\n" -"<n><pack-name>[--fuinneog =] [-- <n>depth=] [--threads=] [--keep- <n>pack " -"=]\n" -"<n>[--write-midx] [--ainm-hash-leagan =]" +"git repack [-a] [-A] [-d] [-f] [-F] [-l] [-n] [-q] [-b] [-m]\n" +"[--window=<n>] [--depth=<n>] [--threads=<n>] [--keep-pack=<pack-name>]\n" +"[--write-midx] [--name-hash-version=<n>] [--path-walk]" -#: builtin/repack.c msgid "" "Incremental repacks are incompatible with bitmap indexes. Use\n" "--no-write-bitmap-index or disable the pack.writeBitmaps configuration." @@ -14344,222 +12175,121 @@ msgstr "" "NÃl ath-phacáistà incréideacha comhoiriúnach le hinnéacsanna bitmap. Úsáid\n" "--no-write-bitmap-index nó dÃchumraÃocht an pack.writeBitmaps a dhÃchumasú." -#: builtin/repack.c -msgid "could not start pack-objects to repack promisor objects" -msgstr "nà fhéadfaà rudaà pacáiste a thosú chun rudaà gealltanna a athphacáil" - -#: builtin/repack.c -msgid "failed to feed promisor objects to pack-objects" -msgstr "theip ar rudaà gealltanna a bheathú ar rudaà pacáiste" - -#: builtin/repack.c -msgid "repack: Expecting full hex object ID lines only from pack-objects." -msgstr "" -"athphacáil: Ag súil le lÃnte aitheantais réad heicseach iomlána ach ó " -"phacáistÃ." - -#: builtin/repack.c -msgid "could not finish pack-objects to repack promisor objects" -msgstr "" -"nà fhéadfadh sé rudaà pacáiste a chrÃochnú chun rudaà geallta a athphacáil" - -#: builtin/repack.c -#, c-format -msgid "cannot open index for %s" -msgstr "nà féidir innéacs a oscailt do %s" - -#: builtin/repack.c -#, c-format -msgid "pack %s too large to consider in geometric progression" -msgstr "pacáiste %s ró-mhór le breithniú i ddul chun cinn geo" - -#: builtin/repack.c -#, c-format -msgid "pack %s too large to roll up" -msgstr "pacáiste %s ró-mhór le rolladh suas" - -#: builtin/repack.c -#, c-format -msgid "could not open tempfile %s for writing" -msgstr "nà fhéadfaà teachtaireacht %s a oscailt le haghaidh scrÃobh" - -#: builtin/repack.c -msgid "could not close refs snapshot tempfile" -msgstr "nà raibh in ann tempfile snapshot refs a dhúnadh" - -#: builtin/repack.c -#, c-format -msgid "could not remove stale bitmap: %s" -msgstr "nà fhéadfaà bitmap seasta a bhaint: %s" - -#: builtin/repack.c -#, c-format -msgid "pack prefix %s does not begin with objdir %s" -msgstr "nà thosaÃonn réimÃr pacáiste %s le objdir %s" - -#: builtin/repack.c msgid "pack everything in a single pack" msgstr "pacáil gach rud i bpacáiste amháin" -#: builtin/repack.c msgid "same as -a, and turn unreachable objects loose" msgstr "" "mar an gcéanna le -a, agus casadh rudaà nach féidir inrochtana scaoilte" -#: builtin/repack.c msgid "same as -a, pack unreachable cruft objects separately" msgstr "mar an gcéanna le -a, pacáil rudaà cruft neamh-inrochtana ar leithligh" -#: builtin/repack.c msgid "approxidate" msgstr "approxidate" -#: builtin/repack.c msgid "with --cruft, expire objects older than this" msgstr "le --cruft, rachadh in éag rudaà nÃos sine ná seo" -#: builtin/repack.c msgid "with --cruft, only repack cruft packs smaller than this" msgstr "le --cruft, nà athphacáil ach pacáistà cruft nÃos lú ná seo" -#: builtin/repack.c msgid "remove redundant packs, and run git-prune-packed" msgstr "bain pacáistà iomarcacha, agus rith git-prune-packed" -#: builtin/repack.c msgid "pass --no-reuse-delta to git-pack-objects" msgstr "pas --no-reuse-delta chuig git-pack-objects" -#: builtin/repack.c msgid "pass --no-reuse-object to git-pack-objects" msgstr "pas --no-reuse-object chuig git-pack-objects" -#: builtin/repack.c msgid "" "specify the name hash version to use for grouping similar objects by path" msgstr "" "sonraigh an leagan hash ainm atá le húsáid chun rudaà den chineál céanna a " "ghrúpáil" -#: builtin/repack.c +msgid "pass --path-walk to git-pack-objects" +msgstr "pas --path-walk chuig git-pack-objects" + msgid "do not run git-update-server-info" msgstr "ná reáchtáil git-update-server-info" -#: builtin/repack.c msgid "pass --local to git-pack-objects" msgstr "pas --local go git-pack-objects" -#: builtin/repack.c msgid "write bitmap index" msgstr "scrÃobh innéacs bitmap" -#: builtin/repack.c msgid "pass --delta-islands to git-pack-objects" msgstr "pas --delta-islands chuig git-pack-objects" -#: builtin/repack.c msgid "with -A, do not loosen objects older than this" msgstr "le -A, ná scaoil rudaà nÃos sine ná seo" -#: builtin/repack.c msgid "with -a, repack unreachable objects" msgstr "le -a, athphacáil rudaà neamh-inrochtana" -#: builtin/repack.c msgid "size of the window used for delta compression" msgstr "méid na fuinneoga a úsáidtear le haghaidh comhbhrú delta" -#: builtin/repack.c msgid "bytes" -msgstr "beart" +msgstr "bearta" -#: builtin/repack.c msgid "same as the above, but limit memory size instead of entries count" msgstr "" "mar an gcéanna leis an méid thuas, ach teorainn le méid cuimhne in ionad " "iontrálacha" -#: builtin/repack.c msgid "limits the maximum delta depth" msgstr "teorann sé leis an doimhneacht delta uasta" -#: builtin/repack.c msgid "limits the maximum number of threads" msgstr "teorainn leis an lÃon uasta na snáitheanna" -#: builtin/repack.c msgid "maximum size of each packfile" msgstr "uasmhéid gach pacáiste" -#: builtin/repack.c msgid "repack objects in packs marked with .keep" msgstr "athphacáil rudaà i bpacáistà atá marcáilte le .keep" -#: builtin/repack.c msgid "do not repack this pack" msgstr "ná déan an pacáiste seo a athphacáil" -#: builtin/repack.c msgid "find a geometric progression with factor <N>" msgstr "faigh dul chun cinn geoiméadrach le fachtóir <N>" -#: builtin/repack.c msgid "write a multi-pack index of the resulting packs" msgstr "scrÃobh innéacs il-phacáiste de na pacáistà mar thoradh air" -#: builtin/repack.c msgid "pack prefix to store a pack containing filtered out objects" msgstr "réimÃr pacáiste chun pacáiste ina bhfuil rudaà scagtha amach a stóráil" -#: builtin/repack.c msgid "cannot delete packs in a precious-objects repo" msgstr "nà féidir pacáistà a scriosadh i repo rudaà luachmhara" -#: builtin/repack.c #, c-format msgid "option '%s' can only be used along with '%s'" msgstr "nà féidir rogha '%s' a úsáid ach amháin in éineacht le '%s'" -#: builtin/repack.c msgid "Nothing new to pack." msgstr "NÃl aon rud nua le pacáil." -#: builtin/repack.c -#, c-format -msgid "renaming pack to '%s' failed" -msgstr "theip ar phacáiste a athainmniú go '%s'" - -#: builtin/repack.c -#, c-format -msgid "pack-objects did not write a '%s' file for pack %s-%s" -msgstr "nÃor scrÃobh pack-objects comhad '%s' do phacáiste %s-%s" - -#: builtin/repack.c sequencer.c -#, c-format -msgid "could not unlink: %s" -msgstr "nà fhéadfaà dÃcheangal: %s" - -#: builtin/replace.c msgid "git replace [-f] <object> <replacement>" -msgstr "git athsholáthair [-f] <object><replacement>" +msgstr "git replace [-f] <object> <replacement>" -#: builtin/replace.c msgid "git replace [-f] --edit <object>" -msgstr "git athsholáthair [-f] --edit <object>" +msgstr "git replace [-f] --edit <object>" -#: builtin/replace.c msgid "git replace [-f] --graft <commit> [<parent>...]" -msgstr "<commit><parent>git athsholáthair [-f] --graft [...]" +msgstr "git replace [-f] --graft <commit> [<parent>...]" -#: builtin/replace.c msgid "git replace -d <object>..." -msgstr "<object>git athsholáthair -d..." +msgstr "git replace -d <object>..." -#: builtin/replace.c msgid "git replace [--format=<format>] [-l [<pattern>]]" -msgstr "<pattern>git in ionad [--format =<format>] [-l []]" +msgstr "git replace [--format=<format>] [-l [<pattern>]]" -#: builtin/replace.c #, c-format msgid "" "invalid replace format '%s'\n" @@ -14568,27 +12298,22 @@ msgstr "" "formáid athsholáthair neamhbhailà '%s'\n" "is iad formáidà bailà ná 'gearr', 'meánach' agus 'fada'" -#: builtin/replace.c #, c-format msgid "replace ref '%s' not found" msgstr "athsholáthair nach bhfuarthas tagairt '%s'" -#: builtin/replace.c #, c-format msgid "Deleted replace ref '%s'" msgstr "Scriosta in ionad tagairt '%s'" -#: builtin/replace.c #, c-format msgid "'%s' is not a valid ref name" msgstr "Nà ainm tagartha bailà é '%s'" -#: builtin/replace.c #, c-format msgid "replace ref '%s' already exists" msgstr "athsholáthar tagairt '%s' atá ann cheana féin" -#: builtin/replace.c #, c-format msgid "" "Objects must be of the same type.\n" @@ -14599,108 +12324,86 @@ msgstr "" "Tugann '%s' in iúl do réad athsholáthair de chineál '%s'\n" "agus dÃrÃonn '%s' ar réad athsholáthair de chineál '%s'." -#: builtin/replace.c #, c-format msgid "unable to open %s for writing" -msgstr "nach féidir %s a oscailt le haghaidh scrÃobh" +msgstr "nà féidir %s a oscailt le haghaidh scrÃbhneoireachta" -#: builtin/replace.c msgid "cat-file reported failure" msgstr "teip tuairiscithe ar chomhad cat" -#: builtin/replace.c #, c-format msgid "unable to open %s for reading" -msgstr "nach féidir %s a oscailt le haghaidh léamh" +msgstr "nà féidir %s a oscailt le haghaidh léitheoireachta" -#: builtin/replace.c msgid "unable to spawn mktree" -msgstr "in ann mktree a shannadh" +msgstr "nà féidir mktree a sceitheadh" -#: builtin/replace.c msgid "unable to read from mktree" -msgstr "in ann léamh ó mktree" +msgstr "nà féidir léamh ó mktree" -#: builtin/replace.c msgid "mktree reported failure" msgstr "thuairiscigh mktree teip" -#: builtin/replace.c msgid "mktree did not return an object name" msgstr "nÃor thug mktree ainm réad ar ais" -#: builtin/replace.c #, c-format msgid "unable to fstat %s" msgstr "nà féidir le fstat %s" -#: builtin/replace.c msgid "unable to write object to database" -msgstr "in ann réad a scrÃobh chuig bunachar sonraÃ" +msgstr "nà féidir réad a scrÃobh chuig bunachar sonraÃ" -#: builtin/replace.c #, c-format msgid "unable to get object type for %s" -msgstr "nach féidir cineál réad a fháil do %s" +msgstr "nà féidir cineál réada a fháil do %s" -#: builtin/replace.c msgid "editing object file failed" msgstr "theip ar eagarthóireacht ar chomhad" -#: builtin/replace.c #, c-format msgid "new object is the same as the old one: '%s'" msgstr "tá réad nua mar an gcéanna leis an sean-réad: '%s'" -#: builtin/replace.c #, c-format msgid "could not parse %s as a commit" msgstr "nà fhéadfaà %s a pharsáil mar thiomantas" -#: builtin/replace.c #, c-format msgid "bad mergetag in commit '%s'" msgstr "cliciú neamhchuspóir i gcomhad '%s'" -#: builtin/replace.c #, c-format msgid "malformed mergetag in commit '%s'" msgstr "comharthaà mÃfhoirmithe i dtiomantas '%s'" -#: builtin/replace.c #, c-format msgid "" "original commit '%s' contains mergetag '%s' that is discarded; use --edit " "instead of --graft" msgstr "" -"tá mergetag '%s' a dhÃscaoiltear as '%s' bunaidh; bain úsáid as --edit in " -"ionad --graft" +"tá an chlib chumasc '%s' sa tiomnú bunaidh '%s' atá caite amach; bain úsáid " +"as --edit in ionad --graft" -#: builtin/replace.c #, c-format msgid "the original commit '%s' has a gpg signature" msgstr "tá sÃniú gpg ag an tiomantas bunaidh '%s'" -#: builtin/replace.c msgid "the signature will be removed in the replacement commit!" msgstr "bainfear an sÃniú sa tiomantas athsholáthair!" -#: builtin/replace.c #, c-format msgid "could not write replacement commit for: '%s'" msgstr "nà fhéadfaà gealltanas athsholáthair a scrÃobh do: '%s'" -#: builtin/replace.c #, c-format msgid "graft for '%s' unnecessary" msgstr "graft le haghaidh '%s' gan ghá" -#: builtin/replace.c #, c-format msgid "new commit is the same as the old one: '%s'" msgstr "tá tiomantas nua mar an gcéanna leis an seancheann: '%s'" -#: builtin/replace.c #, c-format msgid "" "could not convert the following graft(s):\n" @@ -14709,87 +12412,66 @@ msgstr "" "nà raibh sé in ann an graft (Ã) seo a leanas a thiontú:\n" "%s" -#: builtin/replace.c msgid "list replace refs" msgstr "liosta athsholáthair refs" -#: builtin/replace.c msgid "delete replace refs" msgstr "scrios athsholáthair refs" -#: builtin/replace.c msgid "edit existing object" msgstr "réad atá ann cheana in eagar" -#: builtin/replace.c msgid "change a commit's parents" msgstr "tuismitheoirà tiomanta a athrú" -#: builtin/replace.c msgid "convert existing graft file" msgstr "tiontaigh an comhad graft atá ann cheana" -#: builtin/replace.c msgid "replace the ref if it exists" msgstr "athsholáthar an tagartha má tá sé ann" -#: builtin/replace.c msgid "do not pretty-print contents for --edit" msgstr "ná déan ábhar álainn a phriontáil le haghaidh --edit" -#: builtin/replace.c msgid "use this format" msgstr "bain úsáid as an bhformáid seo" -#: builtin/replace.c msgid "--format cannot be used when not listing" msgstr "Nà féidir --format a úsáid nuair nach bhfuil sé liostaithe" -#: builtin/replace.c msgid "-f only makes sense when writing a replacement" msgstr "Nà dhéanann -f ciall ach nuair a bhÃonn athsholáthar á scrÃobh" -#: builtin/replace.c msgid "--raw only makes sense with --edit" msgstr "Nà dhéanann --raw ciall ach le --edit" -#: builtin/replace.c msgid "-d needs at least one argument" msgstr "-d teastaÃonn argóint amháin ar a laghad" -#: builtin/replace.c msgid "bad number of arguments" msgstr "droch-lÃon na n-argóintÃ" -#: builtin/replace.c msgid "-e needs exactly one argument" msgstr "TeastaÃonn argóint amháin dÃreach ó -e" -#: builtin/replace.c msgid "-g needs at least one argument" msgstr "TeastaÃonn argóint amháin ar a laghad ó -g" -#: builtin/replace.c msgid "--convert-graft-file takes no argument" msgstr "Nà ghlacann --convert-graft-file aon argóint" -#: builtin/replace.c msgid "only one pattern can be given with -l" msgstr "nà féidir ach patrún amháin a thabhairt le -l" -#: builtin/replay.c msgid "need some commits to replay" msgstr "teastaÃonn roinnt gealltanais chun athsheinm" -#: builtin/replay.c msgid "all positive revisions given must be references" msgstr "caithfidh gach athbhreithniú dearfach a thugtar a bheith ina" -#: builtin/replay.c msgid "argument to --advance must be a reference" msgstr "caithfidh argóint chuig --advance a bheith ina thagairt" -#: builtin/replay.c msgid "" "cannot advance target with multiple sources because ordering would be ill-" "defined" @@ -14797,13 +12479,11 @@ msgstr "" "nà féidir leis an sprioc a chur chun cinn le foinsà iolracha toisc go mbeadh " "ordú" -#: builtin/replay.c msgid "" "cannot implicitly determine whether this is an --advance or --onto operation" msgstr "" "nà féidir a chinneadh go hinneach an oibrÃocht --advance nó --onto é seo" -#: builtin/replay.c msgid "" "cannot advance target with multiple source branches because ordering would " "be ill-defined" @@ -14811,11 +12491,9 @@ msgstr "" "nà féidir leis an sprioc a chur chun cinn le brainsà foinse iolracha mar go " "mbeadh ordú" -#: builtin/replay.c msgid "cannot implicitly determine correct base for --onto" msgstr "nà féidir leis an mbonn ceart do --onto a chinneadh go hinneach" -#: builtin/replay.c msgid "" "(EXPERIMENTAL!) git replay ([--contained] --onto <newbase> | --advance " "<branch>) <revision-range>..." @@ -14823,23 +12501,18 @@ msgstr "" "(TURGNAMHACH!) git replay ([--contained] --onto <newbase> | --advance " "<branch>) <revision-range>..." -#: builtin/replay.c msgid "make replay advance given branch" msgstr "athsheoladh a dhéanamh roimh ré brainse ar leith" -#: builtin/replay.c msgid "replay onto given commit" msgstr "athsheoladh ar thiomantas a thugtar" -#: builtin/replay.c msgid "advance all branches contained in revision-range" msgstr "gach brainse atá sa raon athbhreithnithe a chur chun cinn" -#: builtin/replay.c msgid "option --onto or --advance is mandatory" msgstr "tá rogha --onto nó --advance éigeantach" -#: builtin/replay.c #, c-format msgid "" "some rev walking options will be overridden as '%s' bit in 'struct rev_info' " @@ -14848,160 +12521,181 @@ msgstr "" "cuirfear roinnt roghanna siúil rev a athshealbhú mar go gcuirfear giotán " "'%s' i 'struct rev_info' iallach" -#: builtin/replay.c msgid "error preparing revisions" msgstr "earráid ag ullmhú athbhreith" -#: builtin/replay.c msgid "replaying down to root commit is not supported yet!" msgstr "nà thacaÃtear le athsheinm sÃos go dtà tiomantas fréimhe fós!" -#: builtin/replay.c msgid "replaying merge commits is not supported yet!" msgstr "nà thacaÃtear le gealltanna cumaisc athsheinm fós!" -#: builtin/rerere.c +#, c-format +msgid "key '%s' not found" +msgstr "nÃor aimsÃodh an eochair '%s'" + +#, c-format +msgid "invalid format '%s'" +msgstr "formáid neamhbhailà '%s'" + +msgid "output format" +msgstr "formáid aschuir" + +msgid "synonym for --format=nul" +msgstr "comhchiallach le --format=nul" + +msgid "unsupported output format" +msgstr "formáid aschuir neamhthacaithe" + +msgid "References" +msgstr "TagairtÃ" + +msgid "Count" +msgstr "Comhair" + +msgid "Branches" +msgstr "BrainsÃ" + +msgid "Tags" +msgstr "Clibeanna" + +msgid "Remotes" +msgstr "Cianrialtáin" + +msgid "Others" +msgstr "Daoine eile" + +msgid "Reachable objects" +msgstr "Réada inrochtana" + +msgid "Commits" +msgstr "Tiomantas" + +msgid "Trees" +msgstr "Crainn" + +msgid "Blobs" +msgstr "BlobaÃ" + +msgid "Repository structure" +msgstr "Struchtúr an stórais" + +msgid "Value" +msgstr "Luach" + +msgid "Counting references" +msgstr "Tagairtà a chomhaireamh" + msgid "" "git rerere [clear | forget <pathspec>... | diff | status | remaining | gc]" msgstr "" -"git rerere [glan | déan dearmad<pathspec>... | diff | stádas | fágtha | gc]" +"git rerere [clear | forget <pathspec>... | diff | status | remaining | gc]" -#: builtin/rerere.c msgid "register clean resolutions in index" msgstr "rúin glan a chlárú san innéacs" -#: builtin/rerere.c msgid "'git rerere forget' without paths is deprecated" msgstr "Tá 'git rerere dearmad' gan cosáin scothaithe" -#: builtin/rerere.c #, c-format msgid "unable to generate diff for '%s'" -msgstr "nach féidir éagsúlacht a ghiniúint do '%s'" +msgstr "nà féidir difrÃocht a ghiniúint do '%s'" -#: builtin/reset.c msgid "" "git reset [--mixed | --soft | --hard | --merge | --keep] [-q] [<commit>]" msgstr "" "git reset [--mixed | --soft | --hard | --merge | --keep] [-q] [<commit>]" -#: builtin/reset.c msgid "git reset [-q] [<tree-ish>] [--] <pathspec>..." msgstr "git reset [-q] [<tree-ish>] [--] <pathspec>..." -#: builtin/reset.c msgid "" "git reset [-q] [--pathspec-from-file [--pathspec-file-nul]] [<tree-ish>]" msgstr "" "git reset [-q] [--pathspec-from-file [--pathspec-file-nul]] [<tree-ish>]" -#: builtin/reset.c msgid "git reset --patch [<tree-ish>] [--] [<pathspec>...]" msgstr "git reset --patch [<tree-ish>] [--] [<pathspec>...]" -#: builtin/reset.c msgid "mixed" msgstr "measctha" -#: builtin/reset.c msgid "soft" msgstr "bog" -#: builtin/reset.c msgid "hard" msgstr "crua" -#: builtin/reset.c msgid "merge" msgstr "cumaisc" -#: builtin/reset.c msgid "keep" msgstr "coinnigh" -#: builtin/reset.c msgid "You do not have a valid HEAD." msgstr "NÃl CEANN bailà agat." -#: builtin/reset.c msgid "Failed to find tree of HEAD." msgstr "Theip ar chrann HEAD a aimsiú." -#: builtin/reset.c #, c-format msgid "Failed to find tree of %s." msgstr "Theip ar chrann %s a aimsiú." -#: builtin/reset.c #, c-format msgid "HEAD is now at %s" msgstr "Tá HEAD anois ag %s" -#: builtin/reset.c #, c-format msgid "Cannot do a %s reset in the middle of a merge." msgstr "Nà féidir athshocrú %s a dhéanamh i lár cumaisc." -#: builtin/reset.c builtin/stash.c msgid "be quiet, only report errors" msgstr "bà ciúin, nà thuairiscigh ach earráidÃ" -#: builtin/reset.c msgid "skip refreshing the index after reset" msgstr "scipeáil an t-innéacs a athnuachan tar éis" -#: builtin/reset.c msgid "reset HEAD and index" msgstr "athshocraigh HEAD agus innéacs" -#: builtin/reset.c msgid "reset only HEAD" msgstr "athshocraigh CEAD amháin" -#: builtin/reset.c msgid "reset HEAD, index and working tree" msgstr "athshocraigh HEAD, innéacs agus crann oibre" -#: builtin/reset.c msgid "reset HEAD but keep local changes" msgstr "athshocraigh HEAD ach coinnigh athruithe áiti" -#: builtin/reset.c msgid "record only the fact that removed paths will be added later" msgstr "" "nà thaifeadadh ach an fÃric go gcuirfear cosáin bainte leis nÃos déanaÃ" -#: builtin/reset.c #, c-format msgid "Failed to resolve '%s' as a valid revision." msgstr "Theip ar '%s' a réiteach mar athbhreithniú bailÃ." -#: builtin/reset.c #, c-format msgid "Failed to resolve '%s' as a valid tree." msgstr "Theip ar '%s' a réiteach mar chrann bailÃ." -#: builtin/reset.c msgid "--mixed with paths is deprecated; use 'git reset -- <paths>' instead." msgstr "" "--mixed le cosáin imithe i léig; bain úsáid as 'git reset -- <cosáin>' ina " "ionad." -#: builtin/reset.c #, c-format msgid "Cannot do %s reset with paths." msgstr "Nà féidir %s a athshocrú le cosáin." -#: builtin/reset.c #, c-format msgid "%s reset is not allowed in a bare repository" msgstr "Nà cheadaÃtear athshocrú %s i stóras lom" -#: builtin/reset.c msgid "Unstaged changes after reset:" msgstr "Athruithe gan stáitse tar éis athshocrú:" -#: builtin/reset.c #, c-format msgid "" "It took %.2f seconds to refresh the index after reset. You can use\n" @@ -15011,71 +12705,55 @@ msgstr "" "leat úsáid a bhaint as\n" "'--no-refresh' chun é seo a sheachaint." -#: builtin/reset.c #, c-format msgid "Could not reset index file to revision '%s'." msgstr "Nà fhéadfaà comhad innéacs a athshocrú chun athbhreithniú '%s'." -#: builtin/reset.c msgid "Could not write new index file." msgstr "Nà fhéadfaà comhad innéacs nua a scrÃobh." -#: builtin/rev-list.c #, c-format msgid "unable to get disk usage of %s" -msgstr "nach féidir úsáid diosca de %s a fháil" +msgstr "nà féidir úsáid diosca %s a fháil" -#: builtin/rev-list.c #, c-format msgid "invalid value for '%s': '%s', the only allowed format is '%s'" msgstr "luach neamhbhailà do '%s': '%s', is é '%s' an t-aon fhormáid ceadaithe" -#: builtin/rev-list.c msgid "-z option used with unsupported option" msgstr "-z rogha a úsáidtear le rogha gan tacaÃocht" -#: builtin/rev-list.c msgid "rev-list does not support display of notes" msgstr "nà thacaÃonn rev-list le taispeáint nótaÃ" -#: builtin/rev-list.c #, c-format msgid "marked counting and '%s' cannot be used together" msgstr "comhaireamh marcáilte agus nà féidir '%s' a úsáid le chéile" -#: builtin/rev-parse.c msgid "git rev-parse --parseopt [<options>] -- [<args>...]" msgstr "git rev-parse --parseopt [<options>] -- [<args>...]" -#: builtin/rev-parse.c msgid "keep the `--` passed as an arg" msgstr "coinnigh an `--` a rith mar arg" -#: builtin/rev-parse.c msgid "stop parsing after the first non-option argument" msgstr "stop a pháirseáil tar éis an chéad argóint neamh-rogha" -#: builtin/rev-parse.c msgid "output in stuck long form" msgstr "aschur i bhfoirm fhada greamaithe" -#: builtin/rev-parse.c msgid "premature end of input" msgstr "deireadh roimh ré an ionchuir" -#: builtin/rev-parse.c msgid "no usage string given before the `--' separator" msgstr "gan aon teaghrán úsáide a thugtar roimh an deighilteoir `--'" -#: builtin/rev-parse.c msgid "missing opt-spec before option flags" msgstr "sonraÃocht rogha in easnamh roimh bhratacha roghanna" -#: builtin/rev-parse.c msgid "Needed a single revision" msgstr "TeastaÃonn athbhreithniú amháin" -#: builtin/rev-parse.c msgid "" "git rev-parse --parseopt [<options>] -- [<args>...]\n" " or: git rev-parse --sq-quote [<arg>...]\n" @@ -15087,71 +12765,56 @@ msgstr "" " or: git rev-parse --sq-quote [<arg>...]\n" " or: git rev-parse [<options>] [<arg>...]\n" "\n" -"Rith “git rev-parse --parseopt -h†le haghaidh tuilleadh faisnéise ar an " +"Rith \"git rev-parse --parseopt -h\" le haghaidh tuilleadh eolais faoin " "gcéad úsáid." -#: builtin/rev-parse.c msgid "--resolve-git-dir requires an argument" msgstr "TeastaÃonn argóint ag teastáil ó --resolve-git-dir" -#: builtin/rev-parse.c #, c-format msgid "not a gitdir '%s'" -msgstr "nà ghearr '%s'" +msgstr "nà gitdir '%s'" -#: builtin/rev-parse.c msgid "--git-path requires an argument" msgstr "TeastaÃonn argóint ag teastáil ó --git-path" -#: builtin/rev-parse.c msgid "-n requires an argument" msgstr "ÉilÃonn -n argóint" -#: builtin/rev-parse.c msgid "--path-format requires an argument" msgstr "ÉilÃonn --path-format argóint" -#: builtin/rev-parse.c #, c-format msgid "unknown argument to --path-format: %s" msgstr "argóint anaithnid chuig --path-format: %s" -#: builtin/rev-parse.c msgid "--default requires an argument" msgstr "TeastaÃonn argóint ar --default" -#: builtin/rev-parse.c msgid "--prefix requires an argument" msgstr "TeastaÃonn argóint ar --prefix" -#: builtin/rev-parse.c msgid "no object format specified" msgstr "aon fhormáid réada a shonra" -#: builtin/rev-parse.c #, c-format msgid "unsupported object format: %s" msgstr "formáid réad gan tacaÃocht: %s" -#: builtin/rev-parse.c #, c-format msgid "unknown mode for --abbrev-ref: %s" msgstr "modh anaithnid do --abbrev-ref: %s" -#: builtin/rev-parse.c setup.c msgid "this operation must be run in a work tree" msgstr "caithfear an oibrÃocht seo a reáchtáil i gcrann oibre" -#: builtin/rev-parse.c msgid "Could not read the index" msgstr "Nà fhéadfaà an t-innéacs a léamh" -#: builtin/rev-parse.c #, c-format msgid "unknown mode for --show-object-format: %s" msgstr "modh anaithnid do --show-object-format: %s" -#: builtin/revert.c msgid "" "git revert [--[no-]edit] [-n] [-m <parent-number>] [-s] [-S[<keyid>]] " "<commit>..." @@ -15159,11 +12822,9 @@ msgstr "" "git revert [--[no-]edit] [-n] [-m <parent-number>] [-s] [-S[<keyid>]] " "<commit>..." -#: builtin/revert.c msgid "git revert (--continue | --skip | --abort | --quit)" msgstr "git revert (--continue | --skip | --abort | --quit)" -#: builtin/revert.c msgid "" "git cherry-pick [--edit] [-n] [-m <parent-number>] [-s] [-x] [--ff]\n" " [-S[<keyid>]] <commit>..." @@ -15171,90 +12832,69 @@ msgstr "" "git cherry-pick [--edit] [-n] [-m <parent-number>] [-s] [-x] [--ff]\n" " [-S[<keyid>]] <commit>..." -#: builtin/revert.c msgid "git cherry-pick (--continue | --skip | --abort | --quit)" msgstr "git cherry-pick (--continue | --skip | --abort | --quit)" -#: builtin/revert.c #, c-format msgid "option `%s' expects a number greater than zero" msgstr "tá rogha `%s' ag súil go mbeidh uimhir nÃos mó ná nialas" -#: builtin/revert.c #, c-format msgid "%s: %s cannot be used with %s" msgstr "%s: Nà féidir %s a úsáid le %s" -#: builtin/revert.c msgid "end revert or cherry-pick sequence" msgstr "aisiompú deiridh nó seicheamh piocadh silÃnÃ" -#: builtin/revert.c msgid "resume revert or cherry-pick sequence" msgstr "athosú ar ais nó seicheamh a phiocadh silÃnÃ" -#: builtin/revert.c msgid "cancel revert or cherry-pick sequence" msgstr "seicheamh aisiompthe nó silÃnà a roghnú a chealú" -#: builtin/revert.c msgid "skip current commit and continue" msgstr "scipeáil tiomantas reatha agus lean ar aghaidh" -#: builtin/revert.c msgid "don't automatically commit" msgstr "ná tiomantas go huathoibrÃoch" -#: builtin/revert.c msgid "edit the commit message" msgstr "athraigh an teachtaireacht tiomanta" -#: builtin/revert.c msgid "parent-number" msgstr "uimhir tuismitheora" -#: builtin/revert.c msgid "select mainline parent" msgstr "roghnaigh tuismitheoir prÃomh" -#: builtin/revert.c msgid "merge strategy" msgstr "straitéis cumaisc" -#: builtin/revert.c msgid "option for merge strategy" msgstr "rogha le haghaidh straitéis cumaisc" -#: builtin/revert.c msgid "append commit name" msgstr "ainm tiomanta a chur leis" -#: builtin/revert.c msgid "preserve initially empty commits" msgstr "gealltanais folamh a chaomhnú ar dt" -#: builtin/revert.c msgid "allow commits with empty messages" msgstr "gealltanna a cheadú le teachtaireachtaà folamh" -#: builtin/revert.c msgid "deprecated: use --empty=keep instead" msgstr "dÃscrÃofa: bain úsáid as --empty=keep ina ionad" -#: builtin/revert.c msgid "use the 'reference' format to refer to commits" msgstr "" "bain úsáid as an bhformáid 'tagartha' chun tagairt a dhéanamh do ghealltanais" -#: builtin/revert.c msgid "revert failed" msgstr "theip ar ais" -#: builtin/revert.c msgid "cherry-pick failed" msgstr "theip ar an rogha silÃnÃ" -#: builtin/rm.c msgid "" "git rm [-f | --force] [-n] [-r] [--cached] [--ignore-unmatch]\n" " [--quiet] [--pathspec-from-file=<file> [--pathspec-file-nul]]\n" @@ -15264,7 +12904,6 @@ msgstr "" " <file>[--quiet] [--pathspec-ó-comhad = [--pathspec-comhad-nul]]\n" " [--] [<pathspec>...]" -#: builtin/rm.c msgid "" "the following file has staged content different from both the\n" "file and the HEAD:" @@ -15281,7 +12920,6 @@ msgstr[2] "" "tá ábhar stáitseáilte difriúil idir an comhad agus \n" "an CEAD sna comhaid seo a leanas:" -#: builtin/rm.c msgid "" "\n" "(use -f to force removal)" @@ -15289,14 +12927,12 @@ msgstr "" "\n" "(bain úsáid as -f chun a chur i bhfeidhm)" -#: builtin/rm.c msgid "the following file has changes staged in the index:" msgid_plural "the following files have changes staged in the index:" msgstr[0] "tá athruithe céime san innéacs ag an gcomhad seo a leanas:" msgstr[1] "tá athruithe céimnithe san innéacs sna comhaid seo a leanas:" msgstr[2] "tá athruithe céimnithe san innéacs sna comhaid seo a leanas:" -#: builtin/rm.c msgid "" "\n" "(use --cached to keep the file, or -f to force removal)" @@ -15305,53 +12941,42 @@ msgstr "" "(bain úsáid as --cached chun an comhad a choinneáil, nó -f chun a bhaint a " "chur i bhfeidhm)" -#: builtin/rm.c msgid "the following file has local modifications:" msgid_plural "the following files have local modifications:" msgstr[0] "tá modhnuithe áitiúla sa chomhad seo a leanas:" msgstr[1] "tá modhnuithe áitiúla ar na comhaid seo a leanas:" msgstr[2] "tá modhnuithe áitiúla ar na comhaid seo a leanas:" -#: builtin/rm.c msgid "do not list removed files" msgstr "ná liostáil comhaid a bhaintear" -#: builtin/rm.c msgid "only remove from the index" msgstr "ach a bhaint as an innéacs" -#: builtin/rm.c msgid "override the up-to-date check" msgstr "an seiceáil cothrom le dáta a chur ar" -#: builtin/rm.c msgid "allow recursive removal" msgstr "cead a bhaint athfhillteach" -#: builtin/rm.c msgid "exit with a zero status even if nothing matched" msgstr "imeacht le stádas nialasach fiú mura bhfuil aon rud comhoiriúnach" -#: builtin/rm.c msgid "No pathspec was given. Which files should I remove?" msgstr "NÃor tugadh aon bhealach. Cé na comhaid ba chóir dom a bhaint?" -#: builtin/rm.c msgid "please stage your changes to .gitmodules or stash them to proceed" msgstr "" "cuir do chuid athruithe ar .gitmodules nó iad a stóráil chun dul ar aghaidh" -#: builtin/rm.c #, c-format msgid "not removing '%s' recursively without -r" msgstr "gan '%s' a bhaint go athshlánach gan -r" -#: builtin/rm.c #, c-format msgid "git rm: unable to remove %s" msgstr "git rm: nà féidir %s a bhaint" -#: builtin/send-pack.c msgid "" "git send-pack [--mirror] [--dry-run] [--force]\n" " [--receive-pack=<git-receive-pack>]\n" @@ -15365,85 +12990,65 @@ msgstr "" " [--[no-]signed | --signed=(true|false|if-asked)]\n" " [<host>:]<directory> (--all | <ref>...)" -#: builtin/send-pack.c msgid "remote name" msgstr "ainm iargúlta" -#: builtin/send-pack.c msgid "push all refs" msgstr "brúigh gach ceann" -#: builtin/send-pack.c msgid "use stateless RPC protocol" msgstr "prótacal RPC gan stáit a úsáid" -#: builtin/send-pack.c msgid "read refs from stdin" msgstr "léigh refs ó stdin" -#: builtin/send-pack.c msgid "print status from remote helper" msgstr "stádas priontála ó chúntóir cianda" -#: builtin/shortlog.c msgid "git shortlog [<options>] [<revision-range>] [[--] <path>...]" -msgstr "git shortlog [<options>] [<revision-range>] [[--]<path>...]" +msgstr "git shortlog [<options>] [<revision-range>] [[--] <path>...]" -#: builtin/shortlog.c msgid "git log --pretty=short | git shortlog [<options>]" msgstr "git log --pretty=short | git shortlog [<options>]" -#: builtin/shortlog.c msgid "using multiple --group options with stdin is not supported" msgstr "nà thacaÃtear le roghanna iolracha --group le stdin a úsáid" -#: builtin/shortlog.c #, c-format msgid "using %s with stdin is not supported" msgstr "nà thacaÃtear le baint úsáide as %s le stdin" -#: builtin/shortlog.c #, c-format msgid "unknown group type: %s" msgstr "cineál grúpa anaithnid: %s" -#: builtin/shortlog.c msgid "group by committer rather than author" msgstr "grúpa de réir coimiteora seachas údar" -#: builtin/shortlog.c msgid "sort output according to the number of commits per author" msgstr "aschur a shórtáil de réir lÃon na ngealltanais in aghaidh an údair" -#: builtin/shortlog.c msgid "suppress commit descriptions, only provides commit count" msgstr "tuairiscà tiomanta a chur faoi chois, nà sholáthraÃonn" -#: builtin/shortlog.c msgid "show the email address of each author" msgstr "taispeáin seoladh rÃomhphoist gach údair" -#: builtin/shortlog.c msgid "<w>[,<i1>[,<i2>]]" msgstr "<w>[, <i1>[,<i2>]]" -#: builtin/shortlog.c msgid "linewrap output" msgstr "aschur linewrap" -#: builtin/shortlog.c msgid "field" msgstr "réimse" -#: builtin/shortlog.c msgid "group by field" msgstr "grúpa de réir réimse" -#: builtin/shortlog.c msgid "too many arguments given outside repository" msgstr "an iomarca argóintà a thugtar stóráil" -#: builtin/show-branch.c msgid "" "git show-branch [-a | --all] [-r | --remotes] [--topo-order | --date-order]\n" " [--current] [--color[=<when>] | --no-color] [--sparse]\n" @@ -15457,11 +13062,9 @@ msgstr "" " [--no-name | --sha1-name] [--topics]\n" " [(<rev> | <glob>)...]" -#: builtin/show-branch.c msgid "git show-branch (-g | --reflog)[=<n>[,<base>]] [--list] [<ref>]" -msgstr "<ref>git show-branch (-g | --reflog) [= [<n>,]] [--liosta] [<base>]" +msgstr "git show-branch (-g | --reflog)[=<n>[,<base>]] [--list] [<ref>]" -#: builtin/show-branch.c #, c-format msgid "ignoring %s; cannot handle more than %d ref" msgid_plural "ignoring %s; cannot handle more than %d refs" @@ -15472,84 +13075,64 @@ msgstr[1] "" msgstr[2] "" "ag déanamh neamhaird de %s; nà féidir nÃos mó ná %d tagairtà a láimhseáil" -#: builtin/show-branch.c #, c-format msgid "no matching refs with %s" msgstr "gan aon fhreagraà a mheaitseáil le %s" -#: builtin/show-branch.c msgid "show remote-tracking and local branches" msgstr "taispeáint cianrianú agus brainsà áitiúla" -#: builtin/show-branch.c msgid "show remote-tracking branches" msgstr "taispeáin brainsà cianrianaithe" -#: builtin/show-branch.c msgid "color '*!+-' corresponding to the branch" msgstr "dath '*! +-' a fhreagraÃonn don bhrainse" -#: builtin/show-branch.c msgid "show <n> more commits after the common ancestor" msgstr "taispeáint <n>nÃos mó gealltanais tar éis an sinsear coiteann" -#: builtin/show-branch.c msgid "synonym to more=-1" msgstr "comhchiallach le nÃos mó = -1" -#: builtin/show-branch.c msgid "suppress naming strings" msgstr "teaghráin ainmniúcháin" -#: builtin/show-branch.c msgid "include the current branch" msgstr "san áireamh an bhrainse reatha" -#: builtin/show-branch.c msgid "name commits with their object names" msgstr "geallann ainm lena n-ainmneacha réad" -#: builtin/show-branch.c msgid "show possible merge bases" msgstr "taispeáin bonn cumaisc féidear" -#: builtin/show-branch.c msgid "show refs unreachable from any other ref" msgstr "taispeántais neamh-inrochtana ó aon tagairt eile" -#: builtin/show-branch.c msgid "show commits in topological order" msgstr "gealltanna seó in ord topolaÃoch" -#: builtin/show-branch.c msgid "show only commits not on the first branch" msgstr "seó nà geallann ach ar an gcéad bhrainse" -#: builtin/show-branch.c msgid "show merges reachable from only one tip" msgstr "cumaisc seó inrochtana ó chomhairle amháin" -#: builtin/show-branch.c msgid "topologically sort, maintaining date order where possible" msgstr "a shórtáil topaiceach, ag coinneáil ord dáta nuair is féidir" -#: builtin/show-branch.c msgid "<n>[,<base>]" msgstr "<n>[,<base>]" -#: builtin/show-branch.c msgid "show <n> most recent ref-log entries starting at base" msgstr "taispeáin ion <n>trálacha ref-log is déanaà ag tosú ag an mbonn" -#: builtin/show-branch.c msgid "no branches given, and HEAD is not valid" msgstr "aon bhrainsà a thugtar, agus nÃl HEAD bailÃ" -#: builtin/show-branch.c msgid "--reflog option needs one branch name" msgstr "TeastaÃonn ainm brainse amháin ag teastáil ó rogha --reflog" -#: builtin/show-branch.c #, c-format msgid "only %d entry can be shown at one time." msgid_plural "only %d entries can be shown at one time." @@ -15557,12 +13140,10 @@ msgstr[0] "nà féidir ach %d iontráil a thaispeáint ag an am céanna." msgstr[1] "nà féidir ach %d iontráil a thaispeáint ag an am céanna." msgstr[2] "nà féidir ach %d iontráil a thaispeáint ag an am céanna." -#: builtin/show-branch.c #, c-format msgid "no such ref %s" msgstr "aon tagairt den sórt sin %s" -#: builtin/show-branch.c #, c-format msgid "cannot handle more than %d rev." msgid_plural "cannot handle more than %d revs." @@ -15570,25 +13151,20 @@ msgstr[0] "nà féidir nÃos mó ná %d luasghéarú a láimhseáil." msgstr[1] "nà féidir nÃos mó ná %d luasghéarú a láimhseáil." msgstr[2] "nà féidir nÃos mó ná %d luasghéarú a láimhseáil." -#: builtin/show-branch.c #, c-format msgid "'%s' is not a valid ref." msgstr "Nà tagairt bailà é '%s'." -#: builtin/show-branch.c #, c-format msgid "cannot find commit %s (%s)" msgstr "nà féidir teacht ar thiomantas %s (%s)" -#: builtin/show-index.c msgid "hash-algorithm" msgstr "hais-algartam" -#: builtin/show-index.c msgid "Unknown hash algorithm" msgstr "Algartam hash anaithnid" -#: builtin/show-ref.c msgid "" "git show-ref [--head] [-d | --dereference]\n" " [-s | --hash[=<n>]] [--abbrev[=<n>]] [--branches] [--tags]\n" @@ -15598,7 +13174,6 @@ msgstr "" " [-s | --hash[=<n>]] [--abbrev[=<n>]] [--branches] [--tags]\n" " [--] [<pattern>...]" -#: builtin/show-ref.c msgid "" "git show-ref --verify [-q | --quiet] [-d | --dereference]\n" " [-s | --hash[=<n>]] [--abbrev[=<n>]]\n" @@ -15608,78 +13183,55 @@ msgstr "" " [-s | --hash[=<n>]] [--abbrev[=<n>]]\n" " [--] [<ref>...]" -#: builtin/show-ref.c msgid "git show-ref --exclude-existing[=<pattern>]" msgstr "git show-ref --exclude-existing[=<pattern>]" -#: builtin/show-ref.c msgid "git show-ref --exists <ref>" msgstr "git show-ref --exists <ref>" -#: builtin/show-ref.c -msgid "reference does not exist" -msgstr "nÃl tagairt ann" - -#: builtin/show-ref.c -msgid "failed to look up reference" -msgstr "theip ort tagairt a lorg suas" - -#: builtin/show-ref.c msgid "only show tags (can be combined with --branches)" msgstr "" "taispeáin clibeanna amháin (is féidir iad a chomhcheangal le --branches)" -#: builtin/show-ref.c msgid "only show branches (can be combined with --tags)" msgstr "nà thaispeáin ach brainsà (is féidir iad a chomhcheangal le --tags)" -#: builtin/show-ref.c msgid "check for reference existence without resolving" msgstr "seiceáil chun tagartha a bheith ann gan réiteach" -#: builtin/show-ref.c msgid "stricter reference checking, requires exact ref path" msgstr "seiceáil tagartha nÃos doichte, teastaÃonn cosán tagartha" -#: builtin/show-ref.c msgid "show the HEAD reference, even if it would be filtered out" msgstr "taispeáin tagairt HEAD, fiú dá ndéanfaà é a scagadh amach" -#: builtin/show-ref.c msgid "dereference tags into object IDs" msgstr "clibeanna a dhÃthreorú isteach in IDanna réad" -#: builtin/show-ref.c msgid "only show SHA1 hash using <n> digits" msgstr "nà thaispeáin ach hais SHA1 ag úsáid <n> dhigit" -#: builtin/show-ref.c msgid "do not print results to stdout (useful with --verify)" msgstr "ná priontáil torthaà chuig stdout (úsáideach le --verify)" -#: builtin/show-ref.c msgid "show refs from stdin that aren't in local repository" msgstr "taispeáin airgeanna ó stdin nach bhfuil i stóras áitiúil" -#: builtin/sparse-checkout.c msgid "" "git sparse-checkout (init | list | set | add | reapply | disable | check-" -"rules) [<options>]" +"rules | clean) [<options>]" msgstr "" "git sparse-checkout (init | list | set | add | reapply | disable | check-" -"rules) [<options>]" +"rules | clean) [<options>]" -#: builtin/sparse-checkout.c msgid "this worktree is not sparse" msgstr "nÃl an crann oibre seo neamhchoitianta" -#: builtin/sparse-checkout.c msgid "this worktree is not sparse (sparse-checkout file may not exist)" msgstr "" "nÃl an crann oibre seo neamhchoitianta (b'fhéidir nach bhfuil comhad " "seiceála neamhchoitianta ann)" -#: builtin/sparse-checkout.c #, c-format msgid "" "directory '%s' contains untracked files, but is not in the sparse-checkout " @@ -15688,73 +13240,53 @@ msgstr "" "tá comhaid neamhrianaithe ag eolaire '%s', ach nÃl sé sa chón seiceála " "neamhchoitianta" -#: builtin/sparse-checkout.c #, c-format msgid "failed to remove directory '%s'" msgstr "theip ar eolaire '%s' a bhaint" -#: builtin/sparse-checkout.c msgid "failed to create directory for sparse-checkout file" msgstr "theip ar eolaire a chruthú do chomhad seiceála neamhchoitianta" -#: builtin/sparse-checkout.c #, c-format msgid "unable to fdopen %s" -msgstr "nach féidir %s a fdophrÃomhachtú" +msgstr "nà féidir %s a fdopen" -#: builtin/sparse-checkout.c msgid "failed to initialize worktree config" msgstr "theip orthu cumraÃocht crann oibre a thionscnamh" -#: builtin/sparse-checkout.c msgid "failed to modify sparse-index config" msgstr "theip orthu cumraÃocht innéacs neamhchoitianta a mhodhnú" -#: builtin/sparse-checkout.c msgid "initialize the sparse-checkout in cone mode" msgstr "an tseiceáil neamhchoitianta a thosú i mód cón" -#: builtin/sparse-checkout.c msgid "toggle the use of a sparse index" msgstr "athsholáthar úsáid innéacs neamhchoitianta" -#: builtin/sparse-checkout.c commit-graph.c midx-write.c sequencer.c -#, c-format -msgid "unable to create leading directories of %s" -msgstr "nach féidir eolairà tosaigh de %s a chruthú" - -#: builtin/sparse-checkout.c #, c-format msgid "failed to open '%s'" msgstr "theip ar '%s' a oscailt" -#: builtin/sparse-checkout.c #, c-format msgid "could not normalize path %s" msgstr "nà fhéadfaà cosán %s a normalú" -#: builtin/sparse-checkout.c #, c-format msgid "unable to unquote C-style string '%s'" -msgstr "nach féidir teaghrán '%s' i stÃl C a dhÃluachan" +msgstr "nà féidir ceanntásc %s a dhÃphacáil" -#: builtin/sparse-checkout.c msgid "unable to load existing sparse-checkout patterns" -msgstr "in ann patrúin seiceála neamhchoitianta atá ann a luchtú" +msgstr "nà féidir patrúin seiceála amach scaipthe atá ann cheana a luchtú" -#: builtin/sparse-checkout.c msgid "existing sparse-checkout patterns do not use cone mode" msgstr "nà úsáideann patrúin seiceála neamhchoitianta atá ann cheana modh cón" -#: builtin/sparse-checkout.c msgid "please run from the toplevel directory in non-cone mode" msgstr "rith ón eolaire topevel le do thoil i mód neamh-chón" -#: builtin/sparse-checkout.c msgid "specify directories rather than patterns (no leading slash)" msgstr "eolairà a shonrú seachas patrúin (gan aon slash tosaigh)" -#: builtin/sparse-checkout.c msgid "" "specify directories rather than patterns. If your directory starts with a " "'!', pass --skip-checks" @@ -15762,7 +13294,6 @@ msgstr "" "eolairà a shonrú seachas patrúin. Má thosaÃonn d'eolaire le '!', pas --skip-" "checks" -#: builtin/sparse-checkout.c msgid "" "specify directories rather than patterns. If your directory really has any " "of '*?[]\\' in it, pass --skip-checks" @@ -15770,7 +13301,6 @@ msgstr "" "eolairà a shonrú seachas patrúin. Má tá aon cheann de '* ag d'eolaire i " "ndáirÃre? []\\ 'ann, pas --skip-checks" -#: builtin/sparse-checkout.c #, c-format msgid "" "'%s' is not a directory; to treat it as a directory anyway, rerun with --" @@ -15779,7 +13309,6 @@ msgstr "" "Nà eolaire é '%s'; chun é a chóireáil mar eolaire ar aon nós, athrith le --" "skip-checks" -#: builtin/sparse-checkout.c #, c-format msgid "" "pass a leading slash before paths such as '%s' if you want a single file " @@ -15788,26 +13317,21 @@ msgstr "" "téigh slasc tosaigh roimh chosáin mar '%s' más mian leat comhad amháin " "(féach FADHBANNA NEAMH-CONE sa lámhleabhar seiceála git-sparse-checkout)." -#: builtin/sparse-checkout.c msgid "git sparse-checkout add [--skip-checks] (--stdin | <patterns>)" msgstr "git sparse-checkout add [--skip-checks] (--stdin | <patterns>)" -#: builtin/sparse-checkout.c msgid "" "skip some sanity checks on the given paths that might give false positives" msgstr "" "scipeáil roinnt seiceálacha sláinte ar na cosáin a thugtar a d'fhéadfadh " "dearfacha bréagacha a" -#: builtin/sparse-checkout.c msgid "read patterns from standard in" msgstr "léigh patrúin ó chaighdeán i" -#: builtin/sparse-checkout.c msgid "no sparse-checkout to add to" msgstr "gan aon seiceáil neamhchoitianta le cur leis" -#: builtin/sparse-checkout.c msgid "" "git sparse-checkout set [--[no-]cone] [--[no-]sparse-index] [--skip-checks] " "(--stdin | <patterns>)" @@ -15815,17 +13339,44 @@ msgstr "" "git sparse-checkout set [--[no-]cone] [--[no-]sparse-index] [--skip-checks] " "(--stdin | <patterns>)" -#: builtin/sparse-checkout.c msgid "must be in a sparse-checkout to reapply sparsity patterns" msgstr "" "caithfidh sé a bheith i seiceáil neamhchoitianta chun patrúin éagsúla a " "athchur i bhfeidh" -#: builtin/sparse-checkout.c +msgid "report each affected file, not just directories" +msgstr "tuairiscigh gach comhad lena mbaineann, nà hamháin eolairÃ" + +msgid "must be in a sparse-checkout to clean directories" +msgstr "nà mór é a bheith i seiceáil amach sparse chun eolairà a ghlanadh" + +msgid "must be in a cone-mode sparse-checkout to clean directories" +msgstr "" +"nà mór é a bheith i mód cóin le haghaidh seiceáil amach sparse chun eolairà " +"a ghlanadh" + +msgid "for safety, refusing to clean without one of --force or --dry-run" +msgstr "" +"ar mhaithe le sábháilteacht, diúltú glanadh gan ceann amháin de --force nó --" +"dry-run" + +msgid "failed to read index" +msgstr "theip ar an innéacs a léamh" + +msgid "" +"failed to convert index to a sparse index; resolve merge conflicts and try " +"again" +msgstr "" +"theip ar an innéacs a thiontú go hinnéacs gann; réitigh coinbhleachtaà " +"cumaisc agus déan iarracht arÃs" + +#, c-format +msgid "failed to remove '%s'" +msgstr "theip ar '%s' a bhaint" + msgid "error while refreshing working directory" msgstr "earráid agus tú ag athnuachan eolaire" -#: builtin/sparse-checkout.c msgid "" "git sparse-checkout check-rules [-z] [--skip-checks][--[no-]cone] [--rules-" "file <file>]" @@ -15833,24 +13384,19 @@ msgstr "" "git sparse-checkout check-rules [-z] [--skip-checks][--[no-]cone] [--rules-" "file <file>]" -#: builtin/sparse-checkout.c msgid "terminate input and output files by a NUL character" msgstr "comhaid ionchuir agus aschuir a fhoirceannadh le carachtar NUL" -#: builtin/sparse-checkout.c msgid "when used with --rules-file interpret patterns as cone mode patterns" msgstr "" "nuair a úsáidtear é le --rules-file patrúin a léirmhÃniú mar phatrúin mód" -#: builtin/sparse-checkout.c msgid "use patterns in <file> instead of the current ones." msgstr "úsáid patrúin in <file>ionad na cinn reatha." -#: builtin/stash.c msgid "git stash list [<log-options>]" -msgstr "<log-options>liosta git stash []" +msgstr "git stash list [<log-options>]" -#: builtin/stash.c msgid "" "git stash show [-u | --include-untracked | --only-untracked] [<diff-" "options>] [<stash>]" @@ -15858,28 +13404,21 @@ msgstr "" "git stash show [-u | --include-untracked | --only-untracked] [<diff-" "options>] [<stash>]" -#: builtin/stash.c msgid "git stash drop [-q | --quiet] [<stash>]" msgstr "git stash drop [-q | --quiet] [<stash>]" -#: builtin/stash.c msgid "git stash pop [--index] [-q | --quiet] [<stash>]" msgstr "git stash pop [--index] [-q | --quiet] [<stash>]" -#: builtin/stash.c msgid "git stash apply [--index] [-q | --quiet] [<stash>]" msgstr "git stash apply [--index] [-q | --quiet] [<stash>]" -#: builtin/stash.c msgid "git stash branch <branchname> [<stash>]" msgstr "git stash branch <branchname> [<stash>]" -#: builtin/stash.c msgid "git stash store [(-m | --message) <message>] [-q | --quiet] <commit>" -msgstr "" -"git stash store [(-m | --teachtaireacht)<message>] [-q | --ciúin] <commit>" +msgstr "git stash store [(-m | --message) <message>] [-q | --quiet] <commit>" -#: builtin/stash.c msgid "" "git stash [push [-p | --patch] [-S | --staged] [-k | --[no-]keep-index] [-q " "| --quiet]\n" @@ -15894,7 +13433,6 @@ msgstr "" " <file>[--pathspec-ó-comhad = [--pathspec-comhad-nul]]\n" " [--] [<pathspec>...]]" -#: builtin/stash.c msgid "" "git stash save [-p | --patch] [-S | --staged] [-k | --[no-]keep-index] [-q | " "--quiet]\n" @@ -15904,34 +13442,33 @@ msgstr "" "--quiet]\n" " [-u | --include-untracked] [-a | --all] [<message>]" -#: builtin/stash.c msgid "git stash create [<message>]" -msgstr "<message>git stash cruthaigh []" +msgstr "git stash create [<message>]" + +msgid "git stash export (--print | --to-ref <ref>) [<stash>...]" +msgstr "git stash export (--print | --to-ref <ref>) [<stash>...]" + +msgid "git stash import <commit>" +msgstr "git stash import <commit>" -#: builtin/stash.c #, c-format msgid "'%s' is not a stash-like commit" msgstr "Nà gealltanas cosúil le stash é '%s'" -#: builtin/stash.c +msgid "No stash entries found." +msgstr "NÃor aimsÃodh aon iontrálacha stash." + #, c-format msgid "Too many revisions specified:%s" msgstr "SonraÃtear an iomarca athbhreithnithe: %s" -#: builtin/stash.c -msgid "No stash entries found." -msgstr "NÃor aimsÃodh aon iontrálacha stash." - -#: builtin/stash.c #, c-format msgid "%s is not a valid reference" msgstr "Nà tagairt bailà é %s" -#: builtin/stash.c msgid "git stash clear with arguments is unimplemented" -msgstr "nÃl git stash clear le hargóintà neamh-chur i bhfeidhm" +msgstr "git stash clear with arguments is unimplemented" -#: builtin/stash.c #, c-format msgid "" "WARNING: Untracked file in way of tracked file! Renaming\n" @@ -15942,202 +13479,210 @@ msgstr "" " %s -> %s\n" " chun seomra a dhéanamh.\n" -#: builtin/stash.c msgid "cannot apply a stash in the middle of a merge" msgstr "nà féidir stash a chur i bhfeidhm i lár cumaisc" -#: builtin/stash.c #, c-format msgid "could not generate diff %s^!." msgstr "nà fhéadfaà diff %s^ a ghiniúint!." -#: builtin/stash.c msgid "conflicts in index. Try without --index." msgstr "coinbhleachtaà in innéacs. Bain triail as gan --index." -#: builtin/stash.c msgid "could not save index tree" msgstr "nà fhéadfadh crann innéacs a shábháil" -#: builtin/stash.c #, c-format msgid "Merging %s with %s" msgstr "Cumasc %s le %s" -#: builtin/stash.c msgid "Index was not unstashed." msgstr "Nà raibh an t-innéacs gan stashed." -#: builtin/stash.c msgid "could not restore untracked files from stash" msgstr "nà raibh in ann comhaid neamhrianaithe a chur ar ais ó stash" -#: builtin/stash.c msgid "attempt to recreate the index" msgstr "iarracht an t-innéacs a athchruthú" -#: builtin/stash.c #, c-format msgid "Dropped %s (%s)" msgstr "Scaoil %s (%s)" -#: builtin/stash.c #, c-format msgid "%s: Could not drop stash entry" msgstr "%s: Nà fhéadfaà iontráil stash a scaoileadh" -#: builtin/stash.c #, c-format msgid "'%s' is not a stash reference" msgstr "Nà tagairt stash é '%s'" -#: builtin/stash.c msgid "The stash entry is kept in case you need it again." msgstr "CoinnÃtear an iontráil stash ar eagla go dteastaÃonn sé uait arÃs." -#: builtin/stash.c msgid "No branch name specified" msgstr "NÃl aon ainm brainse sonraithe" -#: builtin/stash.c msgid "failed to parse tree" msgstr "theip ar chrann a pháirseáil" -#: builtin/stash.c msgid "failed to unpack trees" msgstr "theip ar chrainn a dhÃphacáil" -#: builtin/stash.c msgid "include untracked files in the stash" msgstr "comhaid neamhrianaithe san áireamh sa stash" -#: builtin/stash.c msgid "only show untracked files in the stash" msgstr "nà thaispeánann ach comhaid neamhrianaithe sa stash" -#: builtin/stash.c #, c-format msgid "Cannot update %s with %s" msgstr "Nà féidir %s a nuashonrú le %s" -#: builtin/stash.c msgid "stash message" msgstr "teachtaireacht stash" -#: builtin/stash.c msgid "\"git stash store\" requires one <commit> argument" msgstr "<commit>ÉilÃonn “git stash store†argóint amháin" -#: builtin/stash.c msgid "No staged changes" msgstr "Gan aon athruithe céime" -#: builtin/stash.c msgid "No changes selected" msgstr "Gan aon athruithe roghnaithe" -#: builtin/stash.c msgid "You do not have the initial commit yet" msgstr "NÃl an tiomantas tosaigh agat fós" -#: builtin/stash.c msgid "Cannot save the current index state" msgstr "Nà féidir an staid innéacs reatha a shábháil" -#: builtin/stash.c msgid "Cannot save the untracked files" msgstr "Nà féidir na comhaid neamhrianaithe a shábháil" -#: builtin/stash.c msgid "Cannot save the current worktree state" msgstr "Nà féidir an stát crainn oibre reatha a shábháil" -#: builtin/stash.c msgid "Cannot save the current staged state" msgstr "Nà féidir an stát stáitse reatha a shábháil" -#: builtin/stash.c msgid "Cannot record working tree state" msgstr "Nà féidir stát crann oibre a thaifead" -#: builtin/stash.c msgid "Can't use --patch and --include-untracked or --all at the same time" msgstr "" "Nà féidir --patch agus --include-untracked nó --all a úsáid ag an am céanna" -#: builtin/stash.c msgid "Can't use --staged and --include-untracked or --all at the same time" msgstr "" "Nà féidir --staged agus --include-untracked nó --all a úsáid ag an am céanna" -#: builtin/stash.c msgid "Did you forget to 'git add'?" msgstr "Ar ndearna tú dearmad 'git add'?" -#: builtin/stash.c msgid "No local changes to save" msgstr "NÃl aon athruithe áitiúla le sábháil" -#: builtin/stash.c msgid "Cannot initialize stash" msgstr "Nà féidir stash a thionscnamh" -#: builtin/stash.c msgid "Cannot save the current status" msgstr "Nà féidir an stádas reatha a shábháil" -#: builtin/stash.c #, c-format msgid "Saved working directory and index state %s" msgstr "Eolaire oibre shábháilte agus staid innéacs %s" -#: builtin/stash.c msgid "Cannot remove worktree changes" msgstr "Nà féidir athruithe crann oibre a bhaint" -#: builtin/stash.c msgid "keep index" msgstr "coinnigh innéacs" -#: builtin/stash.c msgid "stash staged changes only" msgstr "athruithe céimeádta stash amháin" -#: builtin/stash.c msgid "stash in patch mode" msgstr "stash i mód paiste" -#: builtin/stash.c msgid "quiet mode" msgstr "modh ciúin" -#: builtin/stash.c msgid "include untracked files in stash" msgstr "comhaid neamhrianaithe a chur san áireamh i stash" -#: builtin/stash.c msgid "include ignore files" msgstr "áireamh neamhaird a dhéanamh" -#: builtin/stripspace.c -msgid "skip and remove all lines starting with comment character" -msgstr "scipeáil agus bain gach lÃne ag tosú le carachtar trácht" +#, c-format +msgid "cannot parse commit %s" +msgstr "nà féidir an tiomantas %s a pharsáil" -#: builtin/stripspace.c -msgid "prepend comment character and space to each line" -msgstr "carachtar tráchta agus spás a chur ar fáil chuig gach lÃne" +#, c-format +msgid "invalid author or committer for %s" +msgstr "údar nó tiomnóir neamhbhailà do %s" + +msgid "could not write commit" +msgstr "nÃorbh fhéidir commit a scrÃobh" -#: builtin/submodule--helper.c #, c-format -msgid "Expecting a full ref name, got %s" -msgstr "Ag súil le hainm tagartha iomlán, fuair %s" +msgid "not a valid revision: %s" +msgstr "nà athbhreithniú bailà é: %s" -#: builtin/submodule--helper.c #, c-format -msgid "could not get a repository handle for submodule '%s'" -msgstr "nà fhéadfaà láimhseáil stór a fháil do fho-mhodúl '%s'" +msgid "not a commit: %s" +msgstr "nà tiomantas é: %s" + +#, c-format +msgid "%s is not a valid exported stash commit" +msgstr "Nà tiomnú stash easpórtáilte bailà é %s" + +#, c-format +msgid "found root commit %s with invalid data" +msgstr "fuarthas an commit fréimhe %s le sonraà neamhbhailÃ" + +#, c-format +msgid "found stash commit %s without expected prefix" +msgstr "fuarthas an tiomnú stash %s gan an réimÃr a raibh súil leis" + +#, c-format +msgid "cannot parse parents of commit: %s" +msgstr "nà féidir tuismitheoirà an tiomantas a pharsáil: %s" + +#, c-format +msgid "%s does not look like a stash commit" +msgstr "Nà cosúil go bhfuil %s ina thiomantas stash" + +#, c-format +msgid "cannot read commit buffer for %s" +msgstr "nà féidir maolán tiomantais a léamh do %s" + +#, c-format +msgid "cannot save the stash for %s" +msgstr "nà féidir an stór a shábháil do %s" + +msgid "unable to write base commit" +msgstr "nà féidir an bonn-thiomantas a scrÃobh" + +#, c-format +msgid "unable to find stash entry %s" +msgstr "nà féidir an iontráil stash %s a aimsiú" + +msgid "print the object ID instead of writing it to a ref" +msgstr "priontáil an ID réada in ionad é a scrÃobh chuig tagairt" + +msgid "save the data to the given ref" +msgstr "sábháil na sonraà chuig an tagairt tugtha" + +msgid "exactly one of --print and --to-ref is required" +msgstr "tá ceann amháin de --print agus --to-ref ag teastáil" + +msgid "skip and remove all lines starting with comment character" +msgstr "scipeáil agus bain gach lÃne ag tosú le carachtar trácht" + +msgid "prepend comment character and space to each line" +msgstr "carachtar tráchta agus spás a chur ar fáil chuig gach lÃne" -#: builtin/submodule--helper.c #, c-format msgid "" "could not look up configuration '%s'. Assuming this repository is its own " @@ -16146,17 +13691,18 @@ msgstr "" "nà fhéadfaà cumraÃocht '%s' a fheiceáil suas. Ag glacadh leis gurb é an stór " "seo a údarásach suas sruth féin." -#: builtin/submodule--helper.c +#, c-format +msgid "could not get a repository handle for submodule '%s'" +msgstr "nà fhéadfaà láimhseáil stór a fháil do fho-mhodúl '%s'" + #, c-format msgid "No url found for submodule path '%s' in .gitmodules" msgstr "NÃl aon url le haghaidh cosán fo-mhodúil '%s' i .gitmodules" -#: builtin/submodule--helper.c #, c-format msgid "Entering '%s'\n" msgstr "Ag iontráil '%s'\n" -#: builtin/submodule--helper.c #, c-format msgid "" "run_command returned non-zero status for %s\n" @@ -16165,7 +13711,6 @@ msgstr "" "thug run_command stádas neamh-nialas ar ais do %s.\n" "." -#: builtin/submodule--helper.c #, c-format msgid "" "run_command returned non-zero status while recursing in the nested " @@ -16176,67 +13721,53 @@ msgstr "" "mhodúil neadaithe de %s\n" "." -#: builtin/submodule--helper.c msgid "suppress output of entering each submodule command" msgstr "cosc a chur ar aschur gach ordú fo-mhodúil a chur isteach" -#: builtin/submodule--helper.c msgid "recurse into nested submodules" msgstr "athshlánú isteach i bhfo-mhodúil neadaithe" -#: builtin/submodule--helper.c msgid "git submodule foreach [--quiet] [--recursive] [--] <command>" msgstr "git submodule foreach [--quiet] [--recursive] [--] <command>" -#: builtin/submodule--helper.c #, c-format msgid "Failed to register url for submodule path '%s'" msgstr "Theip ar url a chlárú le haghaidh cosán fo-mhodúil '%s'" -#: builtin/submodule--helper.c #, c-format msgid "Submodule '%s' (%s) registered for path '%s'\n" msgstr "Fo-mhodúl '%s' (%s) cláraithe le haghaidh cosán '%s'\n" -#: builtin/submodule--helper.c #, c-format msgid "warning: command update mode suggested for submodule '%s'\n" msgstr "rabhadh: modh nuashonraithe ordaithe a mholtar don fho-mhodúl '%s'\n" -#: builtin/submodule--helper.c #, c-format msgid "Failed to register update mode for submodule path '%s'" msgstr "Theip ar mhodh nuashonraithe a chlárú do chonair fo-mhodúil '%s'" -#: builtin/submodule--helper.c msgid "suppress output for initializing a submodule" msgstr "aschur a chur faoi chois chun fo-mhodúl a thosú" -#: builtin/submodule--helper.c msgid "git submodule init [<options>] [<path>]" msgstr "git submodule init [<options>] [<path>]" -#: builtin/submodule--helper.c #, c-format msgid "no submodule mapping found in .gitmodules for path '%s'" msgstr "" "nÃl aon mhapáil fo-mhodúil le fáil i .gitmodules le haghaidh cosán '%s'" -#: builtin/submodule--helper.c #, c-format msgid "could not resolve HEAD ref inside the submodule '%s'" msgstr "nà fhéadfaà tagairt HEAD a réiteach taobh istigh den fho-mhodúl '%s'" -#: builtin/submodule--helper.c #, c-format msgid "failed to recurse into submodule '%s'" msgstr "theip ar athshlánú isteach i bhfo-mhodúl '%s'" -#: builtin/submodule--helper.c msgid "suppress submodule status output" msgstr "aschur stádas fo-mhodúil a chur faoi cho" -#: builtin/submodule--helper.c msgid "" "use commit stored in the index instead of the one stored in the submodule " "HEAD" @@ -16244,86 +13775,68 @@ msgstr "" "bain úsáid as tiomantas atá stóráilte san innéacs in ionad an ceann atá " "stóráilte sa fho-mhodúl HEAD" -#: builtin/submodule--helper.c msgid "git submodule status [--quiet] [--cached] [--recursive] [<path>...]" msgstr "git submodule status [--quiet] [--cached] [--recursive] [<path>...]" -#: builtin/submodule--helper.c #, c-format msgid "* %s %s(blob)->%s(submodule)" msgstr "* %s %s (blob) -> %s (fo-mhodúl)" -#: builtin/submodule--helper.c #, c-format msgid "* %s %s(submodule)->%s(blob)" msgstr "* %s %s (fo-mhodúl) -> %s (blob)" -#: builtin/submodule--helper.c #, c-format msgid "%s" msgstr "%s" -#: builtin/submodule--helper.c #, c-format msgid "couldn't hash object from '%s'" msgstr "nà fhéadfaà réad hash ó '%s'" -#: builtin/submodule--helper.c #, c-format msgid "unexpected mode %o" msgstr "modh gan choinne %o" -#: builtin/submodule--helper.c msgid "use the commit stored in the index instead of the submodule HEAD" msgstr "" "bain úsáid as an gealltanas atá stóráilte san innéacs in ionad an fho-mhodúl " "HEAD" -#: builtin/submodule--helper.c msgid "compare the commit in the index with that in the submodule HEAD" msgstr "" "comparáid a dhéanamh idir an tiomantas san innéacs leis an bhfo-mhodúl HEAD" -#: builtin/submodule--helper.c msgid "skip submodules with 'ignore_config' value set to 'all'" msgstr "scipeáil fo-mhodúil le luach 'ignore_config' socraithe go 'go léir'" -#: builtin/submodule--helper.c msgid "limit the summary size" msgstr "teorainn a chur leis an méid achoimre" -#: builtin/submodule--helper.c msgid "git submodule summary [<options>] [<commit>] [--] [<path>]" msgstr "git achoimre fo-mhodúil [<options>] [<commit>] [--] [<path>]" -#: builtin/submodule--helper.c msgid "could not fetch a revision for HEAD" msgstr "nà fhéadfaà athbhreithniú a fháil do HEAD" -#: builtin/submodule--helper.c #, c-format msgid "Synchronizing submodule url for '%s'\n" msgstr "Url fo-mhodúil a shioncrónú do '%s'\n" -#: builtin/submodule--helper.c #, c-format msgid "failed to register url for submodule path '%s'" msgstr "theip ar url a chlárú le haghaidh cosán fo-mhodúil '%s'" -#: builtin/submodule--helper.c #, c-format msgid "failed to update remote for submodule '%s'" msgstr "theip ar iargúlta a nuashonrú do fho-mhodúl '%s'" -#: builtin/submodule--helper.c msgid "suppress output of synchronizing submodule url" msgstr "aschur url fo-mhodúil sioncrónaithe a chur faoi chois" -#: builtin/submodule--helper.c msgid "git submodule sync [--quiet] [--recursive] [<path>]" msgstr "git sioncrónú fo-mhodúil [--quiet] [--recursive] [<path>]" -#: builtin/submodule--helper.c #, c-format msgid "" "Submodule work tree '%s' contains a .git directory. This will be replaced " @@ -16332,7 +13845,6 @@ msgstr "" "Tá eolair .git i gcrann oibre fo-mhodúil '%s'. Cuirfear comhad .git in ionad " "seo trà absorbgitdirs a úsáid." -#: builtin/submodule--helper.c #, c-format msgid "" "Submodule work tree '%s' contains local modifications; use '-f' to discard " @@ -16341,45 +13853,36 @@ msgstr "" "Tá modhnuithe áitiúla i gcrann oibre fo-mhodúil '%s'; bain úsáid as '-f' " "chun iad a dhiúscairt" -#: builtin/submodule--helper.c #, c-format msgid "Cleared directory '%s'\n" msgstr "Glanadh an eolaire '%s'\n" -#: builtin/submodule--helper.c #, c-format msgid "Could not remove submodule work tree '%s'\n" msgstr "NÃor féidir crann oibre fo-mhodúil '%s' a bhaint\n" -#: builtin/submodule--helper.c #, c-format msgid "could not create empty submodule directory %s" msgstr "nà fhéadfaà eolaire fo-mhodúil folamh %s a chruthú" -#: builtin/submodule--helper.c #, c-format msgid "Submodule '%s' (%s) unregistered for path '%s'\n" msgstr "Fo-mhodúl '%s' (%s) neamhchláraithe le haghaidh cosán '%s'\n" -#: builtin/submodule--helper.c msgid "remove submodule working trees even if they contain local changes" msgstr "crainn oibre fo-mhodúil a bhaint fiú má tá athruithe áitiúla iontu" -#: builtin/submodule--helper.c msgid "unregister all submodules" msgstr "gach fo-mhodúl a dhÃchlárú" -#: builtin/submodule--helper.c msgid "" "git submodule deinit [--quiet] [-f | --force] [--all | [--] [<path>...]]" msgstr "" -"git fo-mhodúil deinit [--quiet] [-f | --force] [--all | [--] [<path>...]]" +"git submodule deinit [--quiet] [-f | --force] [--all | [--] [<path>...]]" -#: builtin/submodule--helper.c msgid "Use '--all' if you really want to deinitialize all submodules" msgstr "Úsáid '--all' más mian leat gach fo-mhodúl a dhÃthionsú i ndáirÃre" -#: builtin/submodule--helper.c 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" @@ -16392,75 +13895,59 @@ msgstr "" "le\n" "'--reference-if-able' in ionad '--reference'." -#: builtin/submodule--helper.c #, c-format msgid "could not get a repository handle for gitdir '%s'" msgstr "nà fhéadfaà láimhseáil stór a fháil do gitdir '%s'" -#: builtin/submodule--helper.c #, c-format msgid "submodule '%s' cannot add alternate: %s" msgstr "nà féidir le fo-mhodúl '%s' malartach a chur leis: %s" -#: builtin/submodule--helper.c #, c-format msgid "Value '%s' for submodule.alternateErrorStrategy is not recognized" msgstr "Luach '%s' le haghaidh submodule.alternateErrorStrategy nà aithnÃtear" -#: builtin/submodule--helper.c #, c-format msgid "Value '%s' for submodule.alternateLocation is not recognized" msgstr "Luach '%s' le haghaidh submodule.alternateLocation nà aithnÃtear" -#: builtin/submodule--helper.c submodule.c #, c-format msgid "refusing to create/use '%s' in another submodule's git dir" msgstr "diúltú '%s' a chruthú/úsáid i git dir fo-mhodúil eile" -#: builtin/submodule--helper.c #, c-format msgid "directory not empty: '%s'" msgstr "eolaire nach folamh: '%s'" -#: builtin/submodule--helper.c #, c-format msgid "clone of '%s' into submodule path '%s' failed" msgstr "theip ar chlón '%s' isteach i gcosán fo-mhodúil '%s'" -#: builtin/submodule--helper.c #, c-format msgid "could not get submodule directory for '%s'" msgstr "nà fhéadfaà eolaire fo-mhodúil a fháil do '%s'" -#: builtin/submodule--helper.c msgid "alternative anchor for relative paths" msgstr "ancaire malartach do chonair choibhneasta" -#: builtin/submodule--helper.c msgid "where the new submodule will be cloned to" msgstr "áit a gclónófar an fo-mhodúl nua" -#: builtin/submodule--helper.c msgid "name of the new submodule" msgstr "ainm an fho-mhodúil nua" -#: builtin/submodule--helper.c msgid "url where to clone the submodule from" msgstr "url cá háit ar féidir an fo-mhodúl a chlónáil" -#: builtin/submodule--helper.c msgid "depth for shallow clones" msgstr "doimhneacht do chlóin éadomhain" -#: builtin/submodule--helper.c msgid "force cloning progress" msgstr "dul chun cinn clónaithe fórsa" -#: builtin/submodule--helper.c msgid "disallow cloning into non-empty directory" msgstr "clónú a dhÃcheadú isteach i eolaire neamh-folamh" -#: builtin/submodule--helper.c msgid "" "git submodule--helper clone [--prefix=<path>] [--quiet] [--reference " "<repository>] [--name <name>] [--depth <depth>] [--single-branch] [--filter " @@ -16470,94 +13957,76 @@ msgstr "" "<repository>] [--name <name>] [--depth <depth>] [--single-branch] [--filter " "<filter-spec>] --url <url> --path <path>" -#: builtin/submodule--helper.c #, c-format msgid "Invalid update mode '%s' configured for submodule path '%s'" msgstr "" "Modh nuashonraithe neamhbhailà '%s' cumraithe le haghaidh cosán fo-mhodúil " "'%s'" -#: builtin/submodule--helper.c #, c-format msgid "Submodule path '%s' not initialized" msgstr "NÃor thosaigh cosán fo-mhodúil '%s'" -#: builtin/submodule--helper.c msgid "Maybe you want to use 'update --init'?" msgstr "B'fhéidir gur mhaith leat 'update --init' a úsáid?" -#: builtin/submodule--helper.c #, c-format msgid "Skipping unmerged submodule %s" -msgstr "Fo-mhodúl neamh-mheánaithe %s a scipeáil" +msgstr "Ag scipeáil an fho-mhodúil neamh-chomhcheangailte %s" -#: builtin/submodule--helper.c #, c-format msgid "Skipping submodule '%s'" -msgstr "Fo-mhodúl '%s' a scipeáil" +msgstr "Ag scipeáil an fho-mhodúil '%s'" -#: builtin/submodule--helper.c #, c-format msgid "cannot clone submodule '%s' without a URL" msgstr "nà féidir le fo-mhodúl '%s' a chlónú gan URL" -#: builtin/submodule--helper.c #, c-format msgid "Failed to clone '%s'. Retry scheduled" msgstr "Theip ar chlónáil '%s'. Déan iarracht sceidealta" -#: builtin/submodule--helper.c #, c-format msgid "Failed to clone '%s' a second time, aborting" msgstr "Theip ar chlónáil '%s' an dara huair, ag cur isteach" -#: builtin/submodule--helper.c #, c-format msgid "Unable to checkout '%s' in submodule path '%s'" msgstr "Nà féidir '%s' a sheiceáil i gcosán fo-mhodúil '%s'" -#: builtin/submodule--helper.c #, c-format msgid "Unable to rebase '%s' in submodule path '%s'" msgstr "Nà féidir '%s' a athbhunú i gcosán fo-mhodúil '%s'" -#: builtin/submodule--helper.c #, c-format msgid "Unable to merge '%s' in submodule path '%s'" msgstr "Nà féidir '%s' a chumasc i gcosán fo-mhodúil '%s'" -#: builtin/submodule--helper.c #, c-format msgid "Execution of '%s %s' failed in submodule path '%s'" msgstr "Theip ar fhorghnÃomhú '%s %s' i gcosán fo-mhodúil '%s'" -#: builtin/submodule--helper.c #, c-format msgid "Submodule path '%s': checked out '%s'\n" msgstr "Conair fo-mhodúil '%s': seiceáil amach '%s'\n" -#: builtin/submodule--helper.c #, c-format msgid "Submodule path '%s': rebased into '%s'\n" msgstr "Conair fo-mhodúil '%s': athbhunaithe go '%s'\n" -#: builtin/submodule--helper.c #, c-format msgid "Submodule path '%s': merged in '%s'\n" msgstr "Conair fo-mhodúil '%s': cumasc i '%s'\n" -#: builtin/submodule--helper.c #, c-format msgid "Submodule path '%s': '%s %s'\n" msgstr "Conair fo-mhodúil '%s': '%s %s'\n" -#: builtin/submodule--helper.c #, c-format msgid "Unable to fetch in submodule path '%s'; trying to directly fetch %s:" msgstr "" "Nà féidir cosán fo-mhodúil '%s' a fháil; ag iarraidh %s a fháil go dÃreach:" -#: builtin/submodule--helper.c #, c-format msgid "" "Fetched in submodule path '%s', but it did not contain %s. Direct fetching " @@ -16566,12 +14035,10 @@ msgstr "" "Faightear i gcosán fo-mhodúil '%s', ach nà raibh %s ann. Theip ar an " "tiomantas sin a thógáil go dÃreach." -#: builtin/submodule--helper.c #, c-format msgid "could not initialize submodule at path '%s'" msgstr "nà fhéadfaà fo-mhodúl a thosú ag cosán '%s'" -#: builtin/submodule--helper.c #, c-format msgid "" "Submodule (%s) branch configured to inherit branch from superproject, but " @@ -16580,81 +14047,67 @@ msgstr "" "Brainse fo-mhodúil (%s) atá cumraithe chun brainse a oidhreacht ó " "sárthionscadal, ach nÃl an sárthionscadal ar aon bhrainse" -#: builtin/submodule--helper.c +#, c-format +msgid "Expecting a full ref name, got %s" +msgstr "Ag súil le hainm tagartha iomlán, fuair %s" + #, c-format msgid "Unable to find current revision in submodule path '%s'" msgstr "Nà féidir an t-athbhreithniú reatha a fháil i gcosán fo-mhodúil '%s'" -#: builtin/submodule--helper.c #, c-format msgid "Unable to fetch in submodule path '%s'" msgstr "Nà féidir le cosán fo-mhodúil '%s' a fháil" -#: builtin/submodule--helper.c #, c-format msgid "Unable to find %s revision in submodule path '%s'" msgstr "Nà féidir athbhreithniú %s a aimsiú i gcosán fo-mhodúil '%s'" -#: builtin/submodule--helper.c #, c-format msgid "Failed to recurse into submodule path '%s'" msgstr "Theip ar athshlánú isteach i gcosán fo-mhodúil '%s'" -#: builtin/submodule--helper.c msgid "force checkout updates" msgstr "nuashonruithe seiceála de" -#: builtin/submodule--helper.c msgid "initialize uninitialized submodules before update" msgstr "fo-mhodúil neamhthosaithe a thosú roimh an nuashonrú" -#: builtin/submodule--helper.c msgid "use SHA-1 of submodule's remote tracking branch" msgstr "úsáid SHA-1 de bhrainse cianrianaithe an fho-mhodúil" -#: builtin/submodule--helper.c msgid "traverse submodules recursively" msgstr "fo-mhodúil a thrasú go athshlánach" -#: builtin/submodule--helper.c msgid "don't fetch new objects from the remote site" msgstr "ná faigh rudaà nua ón suÃomh iargúlta" -#: builtin/submodule--helper.c msgid "use the 'checkout' update strategy (default)" msgstr "úsáid an straitéis nuashonraithe 'tseiceáil' (réamhshocraithe)" -#: builtin/submodule--helper.c msgid "use the 'merge' update strategy" msgstr "úsáid an straitéis nuashonraithe 'cumaisc'" -#: builtin/submodule--helper.c msgid "use the 'rebase' update strategy" msgstr "bain úsáid as an straitéis nuashonraithe 'rebase'" -#: builtin/submodule--helper.c msgid "create a shallow clone truncated to the specified number of revisions" msgstr "" "clón éadomhain a chruthú a ghearrtar go dtà an lÃon sonraithe athbhreithnithe" -#: builtin/submodule--helper.c msgid "parallel jobs" msgstr "poist chomhthreomhara" -#: builtin/submodule--helper.c msgid "whether the initial clone should follow the shallow recommendation" msgstr "cibé an chóir don chlón tosaigh an moladh éadrom a leanú" -#: builtin/submodule--helper.c msgid "don't print cloning progress" msgstr "ná déan dul chun cinn clónaithe a phriontáil" -#: builtin/submodule--helper.c msgid "disallow cloning into non-empty directory, implies --init" msgstr "" "clónú a dhÃcheadú isteach i eolaire neamh-folamh, tugann le tuiscint --init" -#: builtin/submodule--helper.c msgid "" "git submodule [--quiet] update [--init [--filter=<filter-spec>]] [--remote] " "[-N|--no-fetch] [-f|--force] [--checkout|--merge|--rebase] [--[no-]recommend-" @@ -16666,55 +14119,42 @@ msgstr "" "shallow] [--reference <repository>] [--recursive] [--[no-]single-branch] " "[--] [<path>...]" -#: builtin/submodule--helper.c submodule.c msgid "Failed to resolve HEAD as a valid ref." msgstr "Theip ar HEAD a réiteach mar thagartha bailÃ." -#: builtin/submodule--helper.c msgid "git submodule absorbgitdirs [<options>] [<path>...]" msgstr "git submodule absorbgitdirs [<options>] [<path>...]" -#: builtin/submodule--helper.c msgid "suppress output for setting url of a submodule" msgstr "aschur a chur faoi chois chun url fo-mhodúil a shocrú" -#: builtin/submodule--helper.c msgid "git submodule set-url [--quiet] <path> <newurl>" msgstr "git submodule set-url [--quiet] <path> <newurl>" -#: builtin/submodule--helper.c msgid "set the default tracking branch to master" msgstr "socraigh an mbrainse rianaithe réamhshocraithe chun" -#: builtin/submodule--helper.c msgid "set the default tracking branch" msgstr "socraigh an brainse rianaithe réamhshoc" -#: builtin/submodule--helper.c msgid "git submodule set-branch [-q|--quiet] (-d|--default) <path>" msgstr "git submodule set-branch [-q|--quiet] (-d|--default) <path>" -#: builtin/submodule--helper.c msgid "git submodule set-branch [-q|--quiet] (-b|--branch) <branch> <path>" msgstr "git submodule set-branch [-q|--quiet] (-b|--branch) <branch> <path>" -#: builtin/submodule--helper.c msgid "--branch or --default required" msgstr "--branch nó --default ag teastáil" -#: builtin/submodule--helper.c msgid "print only error messages" msgstr "teachtaireachtaà earráide amháin a phrion" -#: builtin/submodule--helper.c msgid "force creation" msgstr "cruthú fórsa" -#: builtin/submodule--helper.c msgid "show whether the branch would be created" msgstr "taispeáint an cruthófaà an mbrainse" -#: builtin/submodule--helper.c msgid "" "git submodule--helper create-branch [-f|--force] [--create-reflog] [-q|--" "quiet] [-t|--track] [-n|--dry-run] <name> <start-oid> <start-name>" @@ -16722,27 +14162,22 @@ msgstr "" "git submodule--helper create-branch [-f|--force] [--create-reflog] [-q|--" "quiet] [-t|--track] [-n|--dry-run] <name> <start-oid> <start-name>" -#: builtin/submodule--helper.c #, c-format msgid "creating branch '%s'" msgstr "ag cruthú brainse '%s'" -#: builtin/submodule--helper.c #, c-format msgid "Adding existing repo at '%s' to the index\n" msgstr "Ag cur repo atá ann cheana ag '%s' leis an innéacs\n" -#: builtin/submodule--helper.c #, c-format msgid "'%s' already exists and is not a valid git repo" msgstr "Tá '%s' ann cheana féin agus nà repo git bailà é" -#: builtin/submodule--helper.c #, c-format msgid "A git directory for '%s' is found locally with remote(s):\n" msgstr "Faightear eolaire git le haghaidh '%s' go háitiúil le cianda(Ã):\n" -#: builtin/submodule--helper.c #, c-format msgid "" "If you want to reuse this local git directory instead of cloning again from\n" @@ -16759,58 +14194,46 @@ msgstr "" "nó nÃl tú cinnte cad a chiallaÃonn sé seo roghnaigh ainm eile leis an rogha " "'--name'." -#: builtin/submodule--helper.c #, c-format msgid "Reactivating local git directory for submodule '%s'\n" msgstr "Eolaire git áitiúil a athghnÃomhachtú do fho-mhodúl '%s'\n" -#: builtin/submodule--helper.c #, c-format msgid "unable to checkout submodule '%s'" msgstr "nà féidir le fo-mhodúl '%s' a sheiceáil" -#: builtin/submodule--helper.c msgid "please make sure that the .gitmodules file is in the working tree" msgstr "déan cinnte go bhfuil an comhad .gitmodules sa chrann oibre" -#: builtin/submodule--helper.c #, c-format msgid "Failed to add submodule '%s'" msgstr "Theip ar fho-mhodúl '%s' a chur leis" -#: builtin/submodule--helper.c #, c-format msgid "Failed to register submodule '%s'" msgstr "Theip ar fho-mhodúl '%s' a chlárú" -#: builtin/submodule--helper.c #, c-format msgid "'%s' already exists in the index" msgstr "Tá '%s' ann cheana féin san innéacs" -#: builtin/submodule--helper.c #, c-format msgid "'%s' already exists in the index and is not a submodule" msgstr "Tá '%s' ann cheana féin san innéacs agus nà fo-mhodúl é" -#: builtin/submodule--helper.c read-cache.c #, c-format msgid "'%s' does not have a commit checked out" msgstr "NÃl tiomantas seiceáilte ag '%s'" -#: builtin/submodule--helper.c msgid "branch of repository to add as submodule" msgstr "brainse an stór le cur mar fho-mhodúl" -#: builtin/submodule--helper.c msgid "allow adding an otherwise ignored submodule path" msgstr "ligean cosán fo-mhodúil a neamhaird a chur leis" -#: builtin/submodule--helper.c msgid "borrow the objects from reference repositories" msgstr "iasacht na rudaà ó stórais tagartha" -#: builtin/submodule--helper.c msgid "" "sets the submodule's name to the given string instead of defaulting to its " "path" @@ -16818,67 +14241,56 @@ msgstr "" "socraÃonn ainm an fho-mhodúil don teaghrán a thugtar in ionad réamhshocrú ar " "a chosán" -#: builtin/submodule--helper.c msgid "git submodule add [<options>] [--] <repository> [<path>]" msgstr "git submodule add [<options>] [--] <repository> [<path>]" -#: builtin/submodule--helper.c msgid "Relative path can only be used from the toplevel of the working tree" msgstr "Nà féidir cosán coibhneasta a úsáid ach ó bharr an chrainn oibre" -#: builtin/submodule--helper.c #, c-format msgid "repo URL: '%s' must be absolute or begin with ./|../" msgstr "repo URL: caithfidh '%s' a bheith iomlán nó tosú leis. /| .. /" -#: builtin/submodule--helper.c +#, c-format +msgid "submodule name '%s' already used for path '%s'" +msgstr "tá ainm an fhomhodúil '%s' in úsáid cheana féin don chonair '%s'" + #, c-format msgid "'%s' is not a valid submodule name" msgstr "Nà ainm bailà fo-mhodúil é '%s'" -#: builtin/submodule--helper.c msgid "git submodule--helper <command>" msgstr "git submodule--helper <command>" -#: builtin/symbolic-ref.c msgid "git symbolic-ref [-m <reason>] <name> <ref>" msgstr "git symbolic-ref [-m <reason>] <name> <ref>" -#: builtin/symbolic-ref.c msgid "git symbolic-ref [-q] [--short] [--no-recurse] <name>" msgstr "git symbolic-ref [-q] [--short] [--no-recurse] <name>" -#: builtin/symbolic-ref.c msgid "git symbolic-ref --delete [-q] <name>" msgstr "git symbolic-ref --delete [-q] <name>" -#: builtin/symbolic-ref.c msgid "suppress error message for non-symbolic (detached) refs" msgstr "" "teachtaireacht earráide a chur faoi chois le haghaidh tuairimà neamh-" "shiombalacha" -#: builtin/symbolic-ref.c msgid "delete symbolic ref" msgstr "scrios tagairt siombalach" -#: builtin/symbolic-ref.c msgid "shorten ref output" msgstr "aschur tagairt a ghiorrú" -#: builtin/symbolic-ref.c msgid "recursively dereference (default)" msgstr "dereference athshlánach (réamhshocraithe)" -#: builtin/symbolic-ref.c builtin/update-ref.c msgid "reason" msgstr "cúis" -#: builtin/symbolic-ref.c builtin/update-ref.c msgid "reason of the update" msgstr "cúis an nuashonraithe" -#: builtin/tag.c msgid "" "git tag [-a | -s | -u <key-id>] [-f] [-m <msg> | -F <file>] [-e]\n" " [(--trailer <token>[(=|:)<value>])...]\n" @@ -16888,37 +14300,31 @@ msgstr "" " [(--trailer <token>[(=|:)<value>])...]\n" " <tagname> [<commit> | <object>]" -#: builtin/tag.c msgid "git tag -d <tagname>..." msgstr "git tag -d <tagname>..." -#: builtin/tag.c msgid "" "git tag [-n[<num>]] -l [--contains <commit>] [--no-contains <commit>]\n" " [--points-at <object>] [--column[=<options>] | --no-column]\n" " [--create-reflog] [--sort=<key>] [--format=<format>]\n" " [--merged <commit>] [--no-merged <commit>] [<pattern>...]" msgstr "" -"<commit>tag git [-n [<num>]] -l [--conté] [--no-conté<commit>]\n" -" <options>[--points-ag<object>] [--column [=] | --no-column]\n" -" <key><format>[--create-reflog] [--sort=] [--format =]\n" -" <pattern>[--cumaisc<commit>] [--no-cumaisc] [...<commit>]" +"git tag [-n[<num>]] -l [--contains <commit>] [--no-contains <commit>]\n" +" [--points-at <object>] [--column[=<options>] | --no-column]\n" +" [--create-reflog] [--sort=<key>] [--format=<format>]\n" +" [--merged <commit>] [--no-merged <commit>] [<pattern>...]" -#: builtin/tag.c msgid "git tag -v [--format=<format>] <tagname>..." -msgstr "<format><tagname>tag git -v [--format =]..." +msgstr "git tag -v [--format=<format>] <tagname>..." -#: builtin/tag.c #, c-format msgid "tag '%s' not found." msgstr "nÃor aimsÃodh tag '%s'." -#: builtin/tag.c #, c-format msgid "Deleted tag '%s' (was %s)\n" msgstr "Clib scriosta '%s' (bhà %s)\n" -#: builtin/tag.c #, c-format msgid "" "\n" @@ -16931,7 +14337,6 @@ msgstr "" " %s\n" "Déanfar neamhaird ar lÃnte a thosaÃonn le '%s'.\n" -#: builtin/tag.c #, c-format msgid "" "\n" @@ -16946,11 +14351,9 @@ msgstr "" "Coinneofar lÃnte a thosaÃonn le '%s'; féadfaidh tú iad a bhaint féin más " "mian leat.\n" -#: builtin/tag.c msgid "unable to sign the tag" -msgstr "in ann an chlib a shÃniú" +msgstr "nà féidir an clib a shÃniú" -#: builtin/tag.c #, c-format msgid "" "You have created a nested tag. The object referred to by your new tag is\n" @@ -16964,351 +14367,268 @@ msgstr "" "\n" " clib git -f %s %s^ {}" -#: builtin/tag.c msgid "bad object type." msgstr "droch-chineál réad." -#: builtin/tag.c msgid "no tag message?" msgstr "gan aon teachtaireacht clib?" -#: builtin/tag.c #, c-format msgid "The tag message has been left in %s\n" msgstr "Tá an teachtaireacht clib fágtha i %s\n" -#: builtin/tag.c msgid "list tag names" msgstr "ainmneacha clibeanna liosta" -#: builtin/tag.c msgid "print <n> lines of each tag message" msgstr "<n>lÃnte priontála de gach teachtaireacht clib" -#: builtin/tag.c msgid "delete tags" msgstr "clibeanna a scriosadh" -#: builtin/tag.c msgid "verify tags" msgstr "clibeanna a fÃorú" -#: builtin/tag.c msgid "Tag creation options" msgstr "Roghanna cruthaithe clibeanna" -#: builtin/tag.c msgid "annotated tag, needs a message" msgstr "clib anótáilte, teastaÃonn teachtaireacht" -#: builtin/tag.c msgid "tag message" msgstr "teachtaireacht tag" -#: builtin/tag.c msgid "force edit of tag message" msgstr "eagarthóireacht fórsa ar theachtaireacht" -#: builtin/tag.c msgid "annotated and GPG-signed tag" msgstr "clib anótáilte agus sÃnithe GPS" -#: builtin/tag.c msgid "use another key to sign the tag" msgstr "bain úsáid as eochair eile chun an chlib a shÃniú" -#: builtin/tag.c msgid "replace the tag if exists" msgstr "athsholáthar an chlib má tá sé ann" -#: builtin/tag.c builtin/update-ref.c msgid "create a reflog" msgstr "cruthaigh reflog" -#: builtin/tag.c msgid "Tag listing options" msgstr "Roghanna liostaithe clibeanna" -#: builtin/tag.c msgid "show tag list in columns" msgstr "taispeáin liosta clibeanna i gcolúin" -#: builtin/tag.c msgid "print only tags that contain the commit" msgstr "clibeanna a phriontáil ach ina bhfuil an tiomantas" -#: builtin/tag.c msgid "print only tags that don't contain the commit" msgstr "clibeanna nach bhfuil an tiomantas a phriontáil ach amháin" -#: builtin/tag.c msgid "print only tags that are merged" msgstr "clibeanna a chumasc amháin a phriontáil" -#: builtin/tag.c msgid "print only tags that are not merged" msgstr "clibeanna nach ndéantar cumaisc a phriontáil ach amháin" -#: builtin/tag.c msgid "print only tags of the object" msgstr "clibeanna den réad amháin a phriontáil" -#: builtin/tag.c msgid "could not start 'git column'" msgstr "nà fhéadfaà 'git column' a thosú" -#: builtin/tag.c #, c-format msgid "the '%s' option is only allowed in list mode" msgstr "nà cheadaÃtear an rogha '%s' ach i mód liosta" -#: builtin/tag.c #, c-format msgid "'%s' is not a valid tag name." msgstr "Nà ainm bailà clibeanna é '%s'." -#: builtin/tag.c #, c-format msgid "tag '%s' already exists" msgstr "tá clib '%s' ann cheana féin" -#: builtin/tag.c sequencer.c #, c-format msgid "Invalid cleanup mode %s" msgstr "Modh glantacháin neamhbhailà %s" -#: builtin/tag.c #, c-format msgid "Updated tag '%s' (was %s)\n" msgstr "Clib nuashonraithe '%s' (bhà %s)\n" -#: builtin/unpack-objects.c msgid "pack exceeds maximum allowed size" msgstr "sáraÃonn an pacáiste an méid uasta a" -#: builtin/unpack-objects.c msgid "failed to write object in stream" msgstr "theip ar réad a scrÃobh sa sruth" -#: builtin/unpack-objects.c #, c-format msgid "inflate returned (%d)" msgstr "inflate ar ais (%d)" -#: builtin/unpack-objects.c msgid "invalid blob object from stream" msgstr "réad blob neamhbhailà ón sruth" -#: builtin/unpack-objects.c msgid "Unpacking objects" msgstr "Rudaà a dhÃphacáil" -#: builtin/update-index.c #, c-format msgid "failed to create directory %s" msgstr "theip ar eolaire %s a chruthú" -#: builtin/update-index.c #, c-format msgid "failed to delete file %s" msgstr "theip ar chomhad %s a scriosadh" -#: builtin/update-index.c #, c-format msgid "failed to delete directory %s" msgstr "theip ar eolaire %s a scriosadh" -#: builtin/update-index.c #, c-format msgid "Testing mtime in '%s' " msgstr "Tástáil mtime i '%s' " -#: builtin/update-index.c msgid "directory stat info does not change after adding a new file" msgstr "nà athraÃonn eolas stat eolaire tar éis comhad nua a chur leis" -#: builtin/update-index.c msgid "directory stat info does not change after adding a new directory" msgstr "nà athraÃonn eolas stat eolaire tar éis eolaire nua a chur leis" -#: builtin/update-index.c msgid "directory stat info changes after updating a file" msgstr "athraÃonn faisnéis eolaire stat tar éis comhad a nuashonrú" -#: builtin/update-index.c msgid "directory stat info changes after adding a file inside subdirectory" msgstr "" "athraÃonn eolas stat eolaire tar éis comhad a chur taobh istigh den fho-" "eolaire" -#: builtin/update-index.c msgid "directory stat info does not change after deleting a file" msgstr "nà athraÃonn eolas stat eolaire tar éis comhad a scriosadh" -#: builtin/update-index.c msgid "directory stat info does not change after deleting a directory" msgstr "nà athraÃonn eolas stat eolaire tar éis eolaire a scriosadh" -#: builtin/update-index.c msgid " OK" msgstr " CEART GO LEOR" -#: builtin/update-index.c msgid "git update-index [<options>] [--] [<file>...]" -msgstr "<file>git update-index [<options>] [--] [...]" +msgstr "git update-index [<options>] [--] [<file>...]" -#: builtin/update-index.c msgid "continue refresh even when index needs update" msgstr "leanúint ar aghaidh ar aghaidh ag athnuachan fiú nu" -#: builtin/update-index.c msgid "refresh: ignore submodules" msgstr "athnuachan: neamhaird a dhéanamh ar fho" -#: builtin/update-index.c msgid "do not ignore new files" msgstr "ná déan neamhaird de chomhaid nua" -#: builtin/update-index.c msgid "let files replace directories and vice-versa" msgstr "lig do chomhaid eolairà in ionad agus a mhalairt" -#: builtin/update-index.c msgid "notice files missing from worktree" msgstr "fógra comhaid atá ar iarraidh ón gcrann oibre" -#: builtin/update-index.c msgid "refresh even if index contains unmerged entries" msgstr "athnuachan fiú má tá iontrálacha neamh-iontrálacha" -#: builtin/update-index.c msgid "refresh stat information" msgstr "faisnéis stáit a athnuachan" -#: builtin/update-index.c msgid "like --refresh, but ignore assume-unchanged setting" msgstr "cosúil le --refresh, ach déan neamhaird de shuÃomh gan athrú" -#: builtin/update-index.c msgid "<mode>,<object>,<path>" msgstr "<mode>,<object>, <path>" -#: builtin/update-index.c msgid "add the specified entry to the index" msgstr "cuir an iontráil sonraithe leis an innéacs" -#: builtin/update-index.c msgid "mark files as \"not changing\"" msgstr "comhad a mharcáil mar “gan athrúâ€" -#: builtin/update-index.c msgid "clear assumed-unchanged bit" msgstr "giotán soiléir glactha gan athrú" -#: builtin/update-index.c msgid "mark files as \"index-only\"" msgstr "comhad a mharcáil mar “innéacs amháinâ€" -#: builtin/update-index.c msgid "clear skip-worktree bit" msgstr "giotán crainn oibre scipeála soiléir" -#: builtin/update-index.c msgid "do not touch index-only entries" msgstr "ná déan teagmháil le iontrálacha innéacs amháin" -#: builtin/update-index.c msgid "add to index only; do not add content to object database" msgstr "cuir le hinnéacs amháin; ná cuir ábhar le bunachar sonraà réada" -#: builtin/update-index.c msgid "remove named paths even if present in worktree" msgstr "bain cosáin ainmnithe fiú má tá sé i gcrann oibre" -#: builtin/update-index.c msgid "with --stdin: input lines are terminated by null bytes" msgstr "le --stdin: cuirtear deireadh le lÃnte ionchuir le bytes null" -#: builtin/update-index.c msgid "read list of paths to be updated from standard input" msgstr "léigh liosta na gcosáin atá le nuashonrú ó ionchur caighdeánach" -#: builtin/update-index.c msgid "add entries from standard input to the index" msgstr "cuir iontrálacha ón ionchur caighdeánach leis an innéacs" -#: builtin/update-index.c msgid "repopulate stages #2 and #3 for the listed paths" msgstr "céimeanna #2 agus #3 a athdhÃonrú do na cosáin liostaithe" -#: builtin/update-index.c msgid "only update entries that differ from HEAD" msgstr "ach iontrálacha a nuashonrú atá difriúil ó HEAD" -#: builtin/update-index.c msgid "ignore files missing from worktree" msgstr "neamhaird a dhéanamh ar chomhaid atá in easnamh" -#: builtin/update-index.c msgid "report actions to standard output" msgstr "gnÃomhartha a thuairisciú go dtÃ" -#: builtin/update-index.c msgid "(for porcelains) forget saved unresolved conflicts" msgstr "(le haghaidh poircealláin) déan dearmad ar choimhlintà gan réiteach" -#: builtin/update-index.c msgid "write index in this format" msgstr "scrÃobh innéacs san fhormáid seo" -#: builtin/update-index.c msgid "report on-disk index format version" msgstr "leagan formáid innéacs ar dhiosca tuairisc" -#: builtin/update-index.c msgid "enable or disable split index" msgstr "innéacs scoilte a chumasú nó a dh" -#: builtin/update-index.c msgid "enable/disable untracked cache" msgstr "taisce neamhrianaithe a chumasú/a dhÃchumasú" -#: builtin/update-index.c msgid "test if the filesystem supports untracked cache" msgstr "tástáil an dtacaÃonn an córas comhaid le taisce neamhrianaithe" -#: builtin/update-index.c msgid "enable untracked cache without testing the filesystem" msgstr "taisce neamhrianaithe a chumasú gan an córas comhaid a thástáil" -#: builtin/update-index.c msgid "write out the index even if is not flagged as changed" msgstr "" "scrÃobh amach an t-innéacs fiú mura bhfuil sé brataithe mar a athraÃtear" -#: builtin/update-index.c msgid "enable or disable file system monitor" msgstr "monatóireacht chórais chomhaid a chumasú" -#: builtin/update-index.c msgid "mark files as fsmonitor valid" msgstr "comhad a mharcáil mar fsmonitor bailÃ" -#: builtin/update-index.c msgid "clear fsmonitor valid bit" msgstr "giotán bailà fsmonitor soiléir" -#: builtin/update-index.c #, c-format msgid "%d\n" msgstr "%d\n" -#: builtin/update-index.c #, c-format msgid "index-version: was %d, set to %d" msgstr "leagan innéacs: bhà %d, socraithe go %d" -#: builtin/update-index.c msgid "" "core.splitIndex is set to false; remove or change it, if you really want to " "enable split index" @@ -17316,7 +14636,6 @@ msgstr "" "tá core.splitIndex socraithe go bréagach; bain nó athraigh é, más mian leat " "innéacs scoilte a chumasú i ndáirÃre" -#: builtin/update-index.c msgid "" "core.splitIndex is set to true; remove or change it, if you really want to " "disable split index" @@ -17324,7 +14643,6 @@ msgstr "" "tá core.splitIndex socraithe go fÃor; bain nó athraigh é, más mian leat " "innéacs scoilte a dhÃchumasú" -#: builtin/update-index.c msgid "" "core.untrackedCache is set to true; remove or change it, if you really want " "to disable the untracked cache" @@ -17332,11 +14650,9 @@ msgstr "" "tá core.untrackedCache go fÃor; bain nó athraigh é, más mian leat an taisce " "neamhrianaithe a dhÃchumasú" -#: builtin/update-index.c msgid "Untracked cache disabled" msgstr "Taisce neamhrianaithe mÃchumasaithe" -#: builtin/update-index.c msgid "" "core.untrackedCache is set to false; remove or change it, if you really want " "to enable the untracked cache" @@ -17344,69 +14660,54 @@ msgstr "" "tá core.untrackedCache socraithe go bréagach; bain nó athraigh é, más mian " "leat an taisce neamhrianaithe a chumasú" -#: builtin/update-index.c #, c-format msgid "Untracked cache enabled for '%s'" msgstr "CumasaÃodh taisce neamhrianaithe do '%s'" -#: builtin/update-index.c msgid "core.fsmonitor is unset; set it if you really want to enable fsmonitor" msgstr "" "tá core.fsmonitor dÃshocraithe; socraigh é más mian leat fsmonitor a chumasú " "i ndáirÃre" -#: builtin/update-index.c msgid "fsmonitor enabled" msgstr "fsmonitor cumasaithe" -#: builtin/update-index.c msgid "" "core.fsmonitor is set; remove it if you really want to disable fsmonitor" msgstr "" "tá core.fsmonitor socraithe; bain é más mian leat fsmonitor a dhÃchumasú i " "ndáirÃre" -#: builtin/update-index.c msgid "fsmonitor disabled" msgstr "fsmonitor mÃchumasaithe" -#: builtin/update-ref.c msgid "git update-ref [<options>] -d <refname> [<old-oid>]" -msgstr "<refname><old-oid>git update-ref [<options>] -d []" +msgstr "git update-ref [<options>] -d <refname> [<old-oid>]" -#: builtin/update-ref.c msgid "git update-ref [<options>] <refname> <new-oid> [<old-oid>]" -msgstr "<refname><new-oid><old-oid>git update-ref [<options>] []" +msgstr "git update-ref [<options>] <refname> <new-oid> [<old-oid>]" -#: builtin/update-ref.c msgid "git update-ref [<options>] --stdin [-z] [--batch-updates]" msgstr "git update-ref [<options>] --stdin [-z] [--batch-updates]" -#: builtin/update-ref.c msgid "delete the reference" msgstr "scrios an tagairt" -#: builtin/update-ref.c msgid "update <refname> not the one it points to" msgstr "nuashon <refname>raigh nà an ceann a thugann sé in iúl" -#: builtin/update-ref.c msgid "stdin has NUL-terminated arguments" msgstr "tá argóintà ag foirceannadh NUL ag stdin" -#: builtin/update-ref.c msgid "read updates from stdin" msgstr "léigh nuashonruithe ó stdin" -#: builtin/update-ref.c msgid "batch reference updates" msgstr "nuashonruithe tagairt baisc" -#: builtin/update-server-info.c msgid "update the info files from scratch" msgstr "nuashonraigh na comhaid faisnéise ón tús" -#: builtin/upload-pack.c msgid "" "git-upload-pack [--[no-]strict] [--timeout=<n>] [--stateless-rpc]\n" " [--advertise-refs] <directory>" @@ -17414,57 +14715,44 @@ msgstr "" "git-upload-pack [--[no-]strict] [--timeout=<n>] [--stateless-rpc]\n" " [--advertise-refs] <directory>" -#: builtin/upload-pack.c t/helper/test-serve-v2.c msgid "quit after a single request/response exchange" msgstr "scor tar éis iarrata/malartú freagartha amháin" -#: builtin/upload-pack.c msgid "serve up the info/refs for git-http-backend" msgstr "freastal suas ar na faisnéise/réimsà le haghaidh git-http-backend" -#: builtin/upload-pack.c msgid "do not try <directory>/.git/ if <directory> is no Git directory" msgstr "" "ná déan iarracht <directory>/.git/ mura bhfuil aon eolaire G <directory> it " "ann" -#: builtin/upload-pack.c msgid "interrupt transfer after <n> seconds of inactivity" msgstr "cur isteach ar aistriú tar éis so <n>icind neamhghnÃomhach" -#: builtin/verify-commit.c msgid "git verify-commit [-v | --verbose] [--raw] <commit>..." msgstr "git verify-commit [-v | --verbose] [--raw] <commit>..." -#: builtin/verify-commit.c msgid "print commit contents" msgstr "ábhair tiomanta priontála" -#: builtin/verify-commit.c builtin/verify-tag.c msgid "print raw gpg status output" msgstr "aschur stádas amh-gpg a phriontáil" -#: builtin/verify-pack.c msgid "git verify-pack [-v | --verbose] [-s | --stat-only] [--] <pack>.idx..." msgstr "git verify-pack [-v | --verbose] [-s | --stat-only] [--] <pack>.idx..." -#: builtin/verify-pack.c msgid "verbose" msgstr "eolach" -#: builtin/verify-pack.c msgid "show statistics only" msgstr "taispeáin staitisticà amháin" -#: builtin/verify-tag.c msgid "git verify-tag [-v | --verbose] [--format=<format>] [--raw] <tag>..." -msgstr "<format><tag>git verify-tag [-v | --verbose] [--format =] [--raw]..." +msgstr "git verify-tag [-v | --verbose] [--format=<format>] [--raw] <tag>..." -#: builtin/verify-tag.c msgid "print tag contents" msgstr "ábhar clib priontáil" -#: builtin/worktree.c msgid "" "git worktree add [-f] [--detach] [--checkout] [--lock [--reason <string>]]\n" " [--orphan] [(-b | -B) <new-branch>] <path> [<commit-ish>]" @@ -17472,39 +14760,30 @@ msgstr "" "git worktree add [-f] [--detach] [--checkout] [--lock [--reason <string>]]\n" " [--orphan] [(-b | -B) <new-branch>] <path> [<commit-ish>]" -#: builtin/worktree.c msgid "git worktree list [-v | --porcelain [-z]]" msgstr "liosta crann oibre git [-v | --poirceallán [-z]]" -#: builtin/worktree.c msgid "git worktree lock [--reason <string>] <worktree>" -msgstr "<string>glas crann oibre git [--reason] <worktree>" +msgstr "git worktree lock [--reason <string>] <worktree>" -#: builtin/worktree.c msgid "git worktree move <worktree> <new-path>" -msgstr "gluaiseacht sraith oibre git <worktree><new-path>" +msgstr "git worktree move <worktree> <new-path>" -#: builtin/worktree.c msgid "git worktree prune [-n] [-v] [--expire <expire>]" -msgstr "<expire>git worktree prun [-n] [-v] [--dul in éag]" +msgstr "git worktree prune [-n] [-v] [--expire <expire>]" -#: builtin/worktree.c msgid "git worktree remove [-f] <worktree>" -msgstr "git worktree a bhaint [-f] <worktree>" +msgstr "git worktree remove [-f] <worktree>" -#: builtin/worktree.c msgid "git worktree repair [<path>...]" -msgstr "deisiú crainn oibre git [<path>...]" +msgstr "git worktree repair [<path>...]" -#: builtin/worktree.c msgid "git worktree unlock <worktree>" -msgstr "dÃghlasáil git worktree <worktree>" +msgstr "git worktree unlock <worktree>" -#: builtin/worktree.c msgid "No possible source branch, inferring '--orphan'" msgstr "NÃl aon bhrainse foinse féideartha, ag tabhairt faoi deara '--orphan'" -#: builtin/worktree.c #, c-format msgid "" "If you meant to create a worktree containing a new unborn branch\n" @@ -17521,7 +14800,6 @@ msgstr "" "\n" " git worktree add --orphan -b %s %s\n" -#: builtin/worktree.c #, c-format msgid "" "If you meant to create a worktree containing a new unborn branch\n" @@ -17538,30 +14816,24 @@ msgstr "" "\n" " git worktree add --orphan %s\n" -#: builtin/worktree.c #, c-format msgid "Removing %s/%s: %s" msgstr "Ag baint %s/%s: %s" -#: builtin/worktree.c msgid "report pruned working trees" msgstr "crainn oibre gearrtha a thuairisciú" -#: builtin/worktree.c msgid "expire working trees older than <time>" msgstr "dul in éag crainn oibre nÃos sine ná <time>" -#: builtin/worktree.c #, c-format msgid "'%s' already exists" msgstr "Tá '%s' ann cheana féin" -#: builtin/worktree.c #, c-format msgid "unusable worktree destination '%s'" msgstr "ceann scrÃbe crainn oibre neamhúsáidte '%s'" -#: builtin/worktree.c #, c-format msgid "" "'%s' is a missing but locked worktree;\n" @@ -17571,7 +14843,6 @@ msgstr "" "bain úsáid as '%s -f 'chun athshealbhú, nó' dÃghlasáil 'agus' bearradh 'nó' " "bhaint 'chun a ghlanadh" -#: builtin/worktree.c #, c-format msgid "" "'%s' is a missing but already registered worktree;\n" @@ -17581,63 +14852,47 @@ msgstr "" "bain úsáid as '%s -f' chun athshlánú, nó 'bearradh' nó 'bhaint' chun a " "ghlanadh" -#: builtin/worktree.c #, c-format msgid "failed to copy '%s' to '%s'; sparse-checkout may not work correctly" msgstr "" "theip ar '%s' a chóipeáil go '%s'; b'fhéidir nach n-oibreoidh an tseiceáil " "neamhchoitianta i gceart" -#: builtin/worktree.c #, c-format msgid "failed to copy worktree config from '%s' to '%s'" msgstr "theip ar chumraÃocht crann oibre a chóipeáil ó '%s' go '%s'" -#: builtin/worktree.c #, c-format msgid "failed to unset '%s' in '%s'" msgstr "theip ar '%s' a dhÃshocrú i '%s'" -#: builtin/worktree.c #, c-format msgid "could not create directory of '%s'" msgstr "nà raibh in ann eolaire de '%s' a chruthú" -#: builtin/worktree.c msgid "initializing" msgstr "a thionscnamh" -#: builtin/worktree.c #, c-format msgid "could not find created worktree '%s'" msgstr "nà raibh an crann oibre cruthaithe '%s' a aimsiú" -#: builtin/worktree.c #, c-format msgid "Preparing worktree (new branch '%s')" msgstr "Crann oibre a ullmhú (brainse nua '%s')" -#: builtin/worktree.c #, c-format msgid "Preparing worktree (resetting branch '%s'; was at %s)" msgstr "Ullmhú crann oibre (athshocrú brainse '%s'; bhà ag %s)" -#: builtin/worktree.c #, c-format msgid "Preparing worktree (checking out '%s')" msgstr "Crann oibre a ullmhú (seiceáil '%s')" -#: builtin/worktree.c -#, c-format -msgid "unreachable: invalid reference: %s" -msgstr "unrochtana: tagairt neamhbhailÃ: %s" - -#: builtin/worktree.c #, c-format msgid "Preparing worktree (detached HEAD %s)" msgstr "Crann oibre a ullmhú (CEAD scoite %s)" -#: builtin/worktree.c #, c-format msgid "" "HEAD points to an invalid (or orphaned) reference.\n" @@ -17645,10 +14900,9 @@ msgid "" "HEAD contents: '%s'" msgstr "" "Tugann HEAD in iúl do thagairt neamhbhailà (nó dÃlleachta).\n" -"Conair CEAD: '%s'\n" -"Ãbhar CEAD: '%s'" +"Conair HEAD: '%s'\n" +"Ãbhar HEAD: '%s'" -#: builtin/worktree.c msgid "" "No local or remote refs exist despite at least one remote\n" "present, stopping; use 'add -f' to override or fetch a remote first" @@ -17658,121 +14912,94 @@ msgstr "" "láthair, ag stopadh; bain úsáid as 'add -f' chun iargúlta a shárú nó a fháil " "ar dtús" -#: builtin/worktree.c msgid "checkout <branch> even if already checked out in other worktree" msgstr "" "seiceáil <branch>fiú má tá sé seiceáilte cheana féin i gcrann oibre eile" -#: builtin/worktree.c msgid "create a new branch" msgstr "brainse nua a chruthú" -#: builtin/worktree.c msgid "create or reset a branch" msgstr "brainse a chruthú nó a athshocrú" -#: builtin/worktree.c msgid "create unborn branch" msgstr "cruthú brainse gan breith" -#: builtin/worktree.c msgid "populate the new working tree" msgstr "an crann oibre nua a dhaonrú" -#: builtin/worktree.c msgid "keep the new working tree locked" msgstr "coinnigh an crann oibre nua faoi ghlas" -#: builtin/worktree.c msgid "reason for locking" msgstr "cúis le glasáil" -#: builtin/worktree.c msgid "set up tracking mode (see git-branch(1))" -msgstr "modh rianaithe a bhunú (féach git-branch (1))" +msgstr "socraigh mód rianaithe (féach git-branch(1))" -#: builtin/worktree.c msgid "try to match the new branch name with a remote-tracking branch" msgstr "" "déan iarracht ainm nua na brainse a mheaitseáil le brainse cianrianaithe" -#: builtin/worktree.c msgid "use relative paths for worktrees" msgstr "úsáid cosáin choibhneasta do chrainn oibre" -#: builtin/worktree.c diff.c parse-options.c #, c-format msgid "options '%s', '%s', and '%s' cannot be used together" msgstr "nà féidir roghanna '%s', '%s', agus '%s' a úsáid le chéile" -#: builtin/worktree.c #, c-format msgid "option '%s' and commit-ish cannot be used together" msgstr "nà féidir rogha '%s' agus comm-ish a úsáid le chéile" -#: builtin/worktree.c msgid "added with --lock" msgstr "cuireadh leis le --lock" -#: builtin/worktree.c msgid "--[no-]track can only be used if a new branch is created" msgstr "Nà féidir --[no-]rian a úsáid ach amháin má chruthaÃtear brainse nua" -#: builtin/worktree.c msgid "show extended annotations and reasons, if available" msgstr "anótaà agus cúiseanna leathnaithe a thaispeáint, má tá sé ar fáil" -#: builtin/worktree.c msgid "add 'prunable' annotation to worktrees older than <time>" msgstr "cuir anótáil 'prunable' le crainn oibre nÃos sine ná <time>" -#: builtin/worktree.c msgid "terminate records with a NUL character" msgstr "deireadh a chur le taifid le carachtar NUL" -#: builtin/worktree.c #, c-format msgid "'%s' is not a working tree" msgstr "Nà crann oibre é '%s'" -#: builtin/worktree.c msgid "The main working tree cannot be locked or unlocked" msgstr "Nà féidir an prÃomhchrann oibre a ghlasáil nó a dhÃghlasáil" -#: builtin/worktree.c #, c-format msgid "'%s' is already locked, reason: %s" msgstr "Tá '%s' faoi ghlas cheana féin, cúis: %s" -#: builtin/worktree.c #, c-format msgid "'%s' is already locked" msgstr "Tá '%s' faoi ghlas cheana féin" -#: builtin/worktree.c #, c-format msgid "'%s' is not locked" msgstr "NÃl '%s' faoi ghlas" -#: builtin/worktree.c msgid "working trees containing submodules cannot be moved or removed" msgstr "nà féidir crainn oibre ina bhfuil fo-mhodúil a bhogadh ná a bhaint" -#: builtin/worktree.c msgid "force move even if worktree is dirty or locked" msgstr "bogadh fórsa fiú má tá crann oibre salach nó faoi ghlas" -#: builtin/worktree.c #, c-format msgid "'%s' is a main working tree" msgstr "Is prÃomhchrann oibre é '%s'" -#: builtin/worktree.c #, c-format msgid "could not figure out destination name from '%s'" msgstr "nà fhéadfaà ainm ceann scrÃbe a fháil amach ó '%s'" -#: builtin/worktree.c #, c-format msgid "" "cannot move a locked working tree, lock reason: %s\n" @@ -17781,7 +15008,6 @@ msgstr "" "nà féidir crann oibre faoi ghlas a bhogadh, cúis ghlasála: %s\n" "bain úsáid as 'move -f -f' chun athshárú nó a dhÃghlasáil ar dtús" -#: builtin/worktree.c msgid "" "cannot move a locked working tree;\n" "use 'move -f -f' to override or unlock first" @@ -17789,38 +15015,31 @@ msgstr "" "nà féidir le crann oibre faoi ghlas a bhogadh;\n" "bain úsáid as 'move -f -f' chun athshárú nó a dhÃghlasáil ar dtús" -#: builtin/worktree.c #, c-format msgid "validation failed, cannot move working tree: %s" msgstr "theip ar bhailÃochtú, nà féidir crann oibre a bhogadh: %s" -#: builtin/worktree.c #, c-format msgid "failed to move '%s' to '%s'" msgstr "theip ar '%s' a bhogadh go '%s'" -#: builtin/worktree.c #, c-format msgid "failed to run 'git status' on '%s'" msgstr "theip ar 'git status' a reáchtáil ar '%s'" -#: builtin/worktree.c #, c-format msgid "'%s' contains modified or untracked files, use --force to delete it" msgstr "" "Tá comhaid modhnaithe nó neamhrianaithe i '%s', bain úsáid as --force chun é " "a scriosadh" -#: builtin/worktree.c #, c-format msgid "failed to run 'git status' on '%s', code %d" msgstr "theip ar 'git status' a reáchtáil ar '%s', cód %d" -#: builtin/worktree.c msgid "force removal even if worktree is dirty or locked" msgstr "bhaint fórsa fiú má tá crann oibre salach nó faoi ghlas" -#: builtin/worktree.c #, c-format msgid "" "cannot remove a locked working tree, lock reason: %s\n" @@ -17829,7 +15048,6 @@ msgstr "" "nà féidir crann oibre faoi ghlas a bhaint, cúis ghlasála: %s\n" "bain úsáid as 'remove -f -f' chun athshárú nó a dhÃghlasáil ar dtús" -#: builtin/worktree.c msgid "" "cannot remove a locked working tree;\n" "use 'remove -f -f' to override or unlock first" @@ -17837,134 +15055,102 @@ msgstr "" "nà féidir crann oibre faoi ghlas a bhaint;\n" "bain úsáid as 'remove -f -f' chun athshárú nó a dhÃghlasáil ar dtús" -#: builtin/worktree.c #, c-format msgid "validation failed, cannot remove working tree: %s" msgstr "theip ar bhailÃochtú, nà féidir crann oibre a bhaint: %s" -#: builtin/worktree.c #, c-format msgid "repair: %s: %s" msgstr "deisiú: %s: %s" -#: builtin/worktree.c #, c-format msgid "error: %s: %s" msgstr "earráid: %s: %s" -#: builtin/write-tree.c msgid "git write-tree [--missing-ok] [--prefix=<prefix>/]" msgstr "git write-tree [--missing-ok] [--prefix=<prefix>/]" -#: builtin/write-tree.c msgid "<prefix>/" msgstr "<prefix>/" -#: builtin/write-tree.c msgid "write tree object for a subdirectory <prefix>" msgstr "scrÃobh réad crann le haghaidh fo-eolaire <prefix>" -#: builtin/write-tree.c msgid "only useful for debugging" msgstr "ach úsáideach le haghaidh dÃfhabhtú" -#: bulk-checkin.c -msgid "core.fsyncMethod = batch is unsupported on this platform" -msgstr "core.fsyncMethod = nà thacaÃtear leis an bhaisc ar an ardán seo" - -#: bundle-uri.c #, c-format msgid "could not parse bundle list key %s with value '%s'" msgstr "nà fhéadfaà eochair liosta beartán %s a pháirseáil le luach '%s'" -#: bundle-uri.c #, c-format msgid "bundle list at '%s' has no mode" msgstr "nÃl aon mhodh ag liosta beartán ag '%s'" -#: bundle-uri.c msgid "failed to create temporary file" msgstr "theip ar chomhad sealadach a chruthú" -#: bundle-uri.c msgid "insufficient capabilities" msgstr "cumais neamhleor" -#: bundle-uri.c #, c-format msgid "file downloaded from '%s' is not a bundle" msgstr "nà beartán é an comhad a Ãoslódáladh ó '%s'" -#: bundle-uri.c msgid "failed to store maximum creation token" msgstr "theip ar an comhartha cruthaithe uasta a stórá" -#: bundle-uri.c #, c-format msgid "unrecognized bundle mode from URI '%s'" msgstr "modh beartán neamhaithnithe ó URI '%s'" -#: bundle-uri.c #, c-format msgid "exceeded bundle URI recursion limit (%d)" msgstr "sháraigh teorainn athshlánaithe URI beartán (%d)" -#: bundle-uri.c #, c-format msgid "failed to download bundle from URI '%s'" msgstr "theip ar an mbeartán a Ãoslódáil ó URI '%s'" -#: bundle-uri.c #, c-format msgid "file at URI '%s' is not a bundle or bundle list" msgstr "comhad ag URI nà beacán nó liosta beartán é '%s'" -#: bundle-uri.c #, c-format msgid "bundle-uri: unexpected argument: '%s'" msgstr "bundle-uri: argóint gan choinne: '%s'" -#: bundle-uri.c msgid "bundle-uri: expected flush after arguments" msgstr "bundle-uri: súil le sruth tar éis argóintÃ" -#: bundle-uri.c msgid "bundle-uri: got an empty line" msgstr "bundle-uri: got an lÃne folamh" -#: bundle-uri.c msgid "bundle-uri: line is not of the form 'key=value'" msgstr "bundle-uri: nÃl an lÃne den fhoirm 'key=value'" -#: bundle-uri.c msgid "bundle-uri: line has empty key or value" msgstr "bundle-uri: tá eochair nó luach folamh ag lÃne" -#: bundle.c #, c-format msgid "unrecognized bundle hash algorithm: %s" msgstr "algartam hash beartán gan aithint: %s" -#: bundle.c #, c-format msgid "unknown capability '%s'" msgstr "cumas anaithnid '%s'" -#: bundle.c #, c-format msgid "'%s' does not look like a v2 or v3 bundle file" msgstr "NÃl cuma '%s' cosúil le comhad beartán v2 nó v3" -#: bundle.c #, c-format msgid "unrecognized header: %s%s (%d)" msgstr "ceanntásc gan aithint: %s%s (%d)" -#: bundle.c msgid "Repository lacks these prerequisite commits:" msgstr "NÃl na tiomantas réamhriachtanais seo ag an stór:" -#: bundle.c msgid "" "some prerequisite commits exist in the object store, but are not connected " "to the repository's history" @@ -17972,7 +15158,6 @@ msgstr "" "tá roinnt gealltanais réamhriachtanais ann sa stór réada, ach nÃl siad " "ceangailte le stair an stór" -#: bundle.c #, c-format msgid "The bundle contains this ref:" msgid_plural "The bundle contains these %<PRIuMAX> refs:" @@ -17980,11 +15165,9 @@ msgstr[0] "Tá an tagairt seo sa phacáiste:" msgstr[1] "Tá na tagairtà %<PRIuMAX> seo sa phacáiste:" msgstr[2] "Tá na tagairtà %<PRIuMAX> seo sa phacáiste:" -#: bundle.c msgid "The bundle records a complete history." msgstr "Taifeadann an beartán stair iomlán." -#: bundle.c #, c-format msgid "The bundle requires this ref:" msgid_plural "The bundle requires these %<PRIuMAX> refs:" @@ -17992,907 +15175,695 @@ msgstr[0] "ÉilÃonn an pacáiste seo an tagairt:" msgstr[1] "ÉilÃonn an pacáiste seo na tagairtà %<PRIuMAX> seo:" msgstr[2] "ÉilÃonn an pacáiste seo na tagairtà %<PRIuMAX> seo:" -#: bundle.c #, c-format msgid "The bundle uses this hash algorithm: %s" msgstr "Úsáideann an beartán an algartam hash seo: %s" -#: bundle.c #, c-format msgid "The bundle uses this filter: %s" msgstr "Úsáideann an beartán an scagaire seo: %s" -#: bundle.c msgid "unable to dup bundle descriptor" -msgstr "nach féidir tuairiscà a chur ar bhearnadh" +msgstr "nà féidir tuairisceoir an phacáiste a dhúbláil" -#: bundle.c msgid "Could not spawn pack-objects" msgstr "Nà fhéadfaà rudaà pacáiste a shannadh" -#: bundle.c msgid "pack-objects died" msgstr "rudaà pacáiste fuair bás" -#: bundle.c #, c-format msgid "ref '%s' is excluded by the rev-list options" msgstr "tá ref '%s' eisiata ag na roghanna rev-list" -#: bundle.c #, c-format msgid "unsupported bundle version %d" msgstr "leagan beartán gan tacaÃocht %d" -#: bundle.c #, c-format msgid "cannot write bundle version %d with algorithm %s" msgstr "nà féidir leagan beartán %d a scrÃobh le algartam %s" -#: bundle.c msgid "Refusing to create empty bundle." msgstr "Diúltú beartán folamh a chruthú." -#: bundle.c #, c-format msgid "cannot create '%s'" msgstr "nà féidir '%s' a chruthú" -#: bundle.c msgid "index-pack died" msgstr "fuair an pacáiste innéacs" -#: cache-tree.c #, c-format msgid "directory '%s' is present in index, but not sparse" msgstr "tá eolaire '%s' i láthair in innéacs, ach nÃl sé neamhchoitianta" -#: cache-tree.c unpack-trees.c msgid "corrupted cache-tree has entries not present in index" msgstr "" "tá iontrálacha nach bhfuil i láthair san innéacs ag crann cache-crainn " "truaillte" -#: cache-tree.c #, c-format msgid "%s with flags 0x%x should not be in cache-tree" msgstr "NÃor chóir go mbeadh %s le bratacha 0x%x i gcrann cache-tree" -#: cache-tree.c #, c-format msgid "bad subtree '%.*s'" msgstr "droch-fho-chrann '%.*s'" -#: cache-tree.c #, c-format msgid "cache-tree for path %.*s does not match. Expected %s got %s" msgstr "" "nà hionann crann-taisce don chonair %.*s. BhÃothas ag súil le %s, ach fuair " "%s" -#: chunk-format.c msgid "terminating chunk id appears earlier than expected" msgstr "is cosúil le feiceáil id cúince a fhoirceannadh nÃos luaithe" -#: chunk-format.c #, c-format msgid "chunk id %<PRIx32> not %d-byte aligned" -msgstr "id chosc% <PRIx32>nach bhfuil %d-byte ailÃnithe" +msgstr "nÃl an aitheantas smután %<PRIx32> ailÃnithe le %d beart" -#: chunk-format.c #, c-format msgid "improper chunk offset(s) %<PRIx64> and %<PRIx64>" -msgstr "fritháireamh pÃosa mÃchuà (Ã)% <PRIx64>agus% <PRIx64>" +msgstr "fritháireamh(Ã) smután mÃchuà %<PRIx64> agus %<PRIx64>" -#: chunk-format.c #, c-format msgid "duplicate chunk ID %<PRIx32> found" msgstr "aimsÃodh ID smután dúblach %<PRIx32>" -#: chunk-format.c #, c-format msgid "final chunk has non-zero id %<PRIx32>" -msgstr "tá id neamh-nialasach ag an gcuid deiridh% <PRIx32>" +msgstr "tá aitheantas neamh-nialasach %<PRIx32> ag an smután deiridh" -#: chunk-format.c msgid "invalid hash version" -msgstr "leagan hash neamhbhailÃ" +msgstr "leagan hais neamhbhailÃ" -#: color.c #, c-format msgid "invalid color value: %.*s" msgstr "luach dath neamhbhailÃ: %.*s" -#: command-list.h msgid "Add file contents to the index" msgstr "Cuir ábhar an chomhaid leis an innéacs" -#: command-list.h msgid "Apply a series of patches from a mailbox" msgstr "Cuir sraith paistà i bhfeidhm ó bhosca poist" -#: command-list.h msgid "Annotate file lines with commit information" msgstr "LÃnte comhaid a anótáil le faisnéis tiomanta" -#: command-list.h msgid "Apply a patch to files and/or to the index" msgstr "Cuir paiste i bhfeidhm ar chomhaid agus/nó ar an innéacs" -#: command-list.h msgid "Import a GNU Arch repository into Git" msgstr "Iompórtáil stór GNU Arch isteach i Git" -#: command-list.h msgid "Create an archive of files from a named tree" msgstr "Cruthaigh cartlann comhaid ó chrann ainmnithe" -#: command-list.h msgid "Download missing objects in a partial clone" msgstr "Ãoslódáil rudaà atá in easnamh i gclón pá" -#: command-list.h msgid "Use binary search to find the commit that introduced a bug" msgstr "" "Úsáid cuardach dénártha chun an gealltanas a thug isteach fabht a fháil" -#: command-list.h msgid "Show what revision and author last modified each line of a file" msgstr "" "Taispeáin an t-athbhreithniú agus an t-údar a mhodhnaigh gach lÃne de chomhad" -#: command-list.h msgid "List, create, or delete branches" msgstr "Brainsà a liostáil, a chruthú nó a scriosadh" -#: command-list.h msgid "Collect information for user to file a bug report" msgstr "Bailigh faisnéis don úsáideoir chun tuarascáil fabht a chomhdú" -#: command-list.h msgid "Move objects and refs by archive" msgstr "Bogadh rudaà agus scrÃbhinnà de réir cartlann" -#: command-list.h msgid "Provide contents or details of repository objects" msgstr "Ãbhar nó sonraà rudaà stórais a sholáthar" -#: command-list.h msgid "Display gitattributes information" msgstr "Taispeáin faisnéis gitattributs" -#: command-list.h msgid "Debug gitignore / exclude files" msgstr "DÃfhabhtú gitignore/eisiamh comhaid" -#: command-list.h msgid "Show canonical names and email addresses of contacts" msgstr "Taispeáin ainmneacha canónach agus seoltaà rÃomhphoist teagmhál" -#: command-list.h msgid "Ensures that a reference name is well formed" msgstr "CinntÃonn sé go bhfuil ainm tagartha foirmithe go maith" -#: command-list.h msgid "Switch branches or restore working tree files" msgstr "Athraigh brainsà nó cuir comhaid crainn oibre ar ais" -#: command-list.h msgid "Copy files from the index to the working tree" msgstr "Cóipeáil comhaid ón innéacs go dtà an crann oibre" -#: command-list.h msgid "Find commits yet to be applied to upstream" msgstr "Faigh gealltanais nach ndéanfar cur i bhfeidhm fós ar an sruth" -#: command-list.h msgid "Apply the changes introduced by some existing commits" msgstr "" "Cuir isteach na hathruithe a thug isteach ag roinnt gealltanais atá ann" -#: command-list.h msgid "Graphical alternative to git-commit" msgstr "Rogha eile grafach seachas git-commit" -#: command-list.h msgid "Remove untracked files from the working tree" msgstr "Bain comhaid neamhrianaithe ón gcrann oibre" -#: command-list.h msgid "Clone a repository into a new directory" msgstr "Clóin stór isteach i eolaire nua" -#: command-list.h msgid "Display data in columns" msgstr "Taispeáin sonraà i gcolúin" -#: command-list.h msgid "Record changes to the repository" msgstr "Taifeadadh athruithe ar an stór" -#: command-list.h msgid "Write and verify Git commit-graph files" msgstr "ScrÃobh agus fÃoraigh comhaid choimisi-graf Git" -#: command-list.h msgid "Create a new commit object" msgstr "Cruthaigh réad tiomanta nua" -#: command-list.h msgid "Get and set repository or global options" msgstr "Faigh agus socraigh stór nó roghanna domhanda" -#: command-list.h msgid "Count unpacked number of objects and their disk consumption" msgstr "LÃon rudaà neamhphacáilte a chomhaireamh agus a dtomhaltas" -#: command-list.h msgid "Retrieve and store user credentials" msgstr "Dintiúir úsáideora a aisghabháil agus" -#: command-list.h msgid "Helper to temporarily store passwords in memory" msgstr "Cúntóir chun pasfhocail a stóráil i gcuimhne" -#: command-list.h msgid "Helper to store credentials on disk" -msgstr "Cúntóir chun dintiúir a stóráil ar dhios" +msgstr "Cúntóir chun dintiúir a stóráil ar dhiosca" -#: command-list.h msgid "Export a single commit to a CVS checkout" msgstr "Easpórtáil tiomantas amháin chuig seiceáil CVS" -#: command-list.h msgid "Salvage your data out of another SCM people love to hate" msgstr "" "Sábháil do chuid sonraà as SCM eile is breá le daoine fuath a thabhairt" -#: command-list.h msgid "A CVS server emulator for Git" msgstr "Aithritheoir freastalaà CVS do Git" -#: command-list.h msgid "A really simple server for Git repositories" msgstr "Freastalaà an-simplà do stórais Git" -#: command-list.h msgid "Give an object a human readable name based on an available ref" msgstr "Tabhair ainm inléite daonna do réad bunaithe ar thagartha atá ar fáil" -#: command-list.h msgid "Generate a zip archive of diagnostic information" msgstr "Cruthaigh cartlann zip faisnéise diagnóiseach" -#: command-list.h msgid "Show changes between commits, commit and working tree, etc" msgstr "Taispeáin athruithe idir gealltanais, tiomantas agus crann oibre, srl" -#: command-list.h msgid "Compares files in the working tree and the index" msgstr "Déanann comparáid idir comhaid sa chrann oibre agus san innéacs" -#: command-list.h msgid "Compare a tree to the working tree or index" msgstr "Déan comparáid idir crann leis an gcrann oibre nó leis an innéacs" -#: command-list.h msgid "Compare the content and mode of provided blob pairs" msgstr "Déan comparáid idir ábhar agus modh na bpéirà blob atá curtha ar fáil" -#: command-list.h msgid "Compares the content and mode of blobs found via two tree objects" msgstr "" "Déanann comparáid idir ábhar agus modh blobs a fhaightear trà dhá rud crann" -#: command-list.h msgid "Show changes using common diff tools" msgstr "Taispeáin athruithe ag úsáid uirlisà coitianta diff" -#: command-list.h msgid "Git data exporter" msgstr "Easpórtóir sonraà Git" -#: command-list.h msgid "Backend for fast Git data importers" msgstr "Backend d'allmhaireoirà sonraà tapa Git" -#: command-list.h msgid "Download objects and refs from another repository" msgstr "Ãoslódáil rudaà agus réimsà ó stór eile" -#: command-list.h msgid "Receive missing objects from another repository" msgstr "Faigh rudaà atá in easnamh ó stór eile" -#: command-list.h msgid "Rewrite branches" msgstr "Brainsà a athscrÃobh" -#: command-list.h msgid "Produce a merge commit message" msgstr "Teachtaireacht tiomanta cumaisc a chur" -#: command-list.h msgid "Output information on each ref" msgstr "Eolas aschuir ar gach tagairt" -#: command-list.h msgid "Run a Git command on a list of repositories" msgstr "Rith ordú Git ar liosta stórais" -#: command-list.h msgid "Prepare patches for e-mail submission" msgstr "Ullmhaigh paistà le haghaidh aighneachta" -#: command-list.h msgid "Verifies the connectivity and validity of the objects in the database" msgstr "FÃoraÃonn sé nascacht agus bailÃocht na rudaà sa bhunachar sonraÃ" -#: command-list.h msgid "Cleanup unnecessary files and optimize the local repository" msgstr "Glan comhaid gan ghá agus an stór áitiúil a bharrfheabhsú" -#: command-list.h msgid "Extract commit ID from an archive created using git-archive" msgstr "" "Bain ID tiomanta as cartlann a cruthaÃodh ag baint úsáide as git-archive" -#: command-list.h msgid "Print lines matching a pattern" msgstr "LÃnte priontála a mheaitseálann" -#: command-list.h msgid "A portable graphical interface to Git" msgstr "Comhéadan grafach iniompartha chuig Git" -#: command-list.h msgid "Compute object ID and optionally create an object from a file" msgstr "RÃomh ID réad agus cruthaigh réad ó chomhad go roghnach" -#: command-list.h msgid "Display help information about Git" msgstr "Taispeáin faisnéis chabhrach faoi Git" -#: command-list.h msgid "Run git hooks" msgstr "Rith crúcaà git" -#: command-list.h msgid "Server side implementation of Git over HTTP" msgstr "Cur i bhfeidhm taobh freastalaà Git thar HTTP" -#: command-list.h msgid "Download from a remote Git repository via HTTP" msgstr "Ãoslódáil ó stór iargúlta Git trà HTTP" -#: command-list.h msgid "Push objects over HTTP/DAV to another repository" msgstr "Brúigh rudaà thar HTTP/DAV chuig stór eile" -#: command-list.h msgid "Send a collection of patches from stdin to an IMAP folder" msgstr "Seol bailiúchán paistà ó stdin chuig fillteán IMAP" -#: command-list.h msgid "Build pack index file for an existing packed archive" msgstr "Tóg comhad innéacs pacáiste do chartlann pacáilte atá ann" -#: command-list.h msgid "Create an empty Git repository or reinitialize an existing one" msgstr "Cruthaigh stór Git folamh nó déan ceann atá ann cheana a athionsú" -#: command-list.h msgid "Instantly browse your working repository in gitweb" msgstr "Brabhsáil láithreach do stór oibre i gitweb" -#: command-list.h msgid "Add or parse structured information in commit messages" msgstr "Cuir nó déan faisnéis struchtúrtha i dteachtaireachtaà tiomanta" -#: command-list.h +msgid "EXPERIMENTAL: Show when files were last modified" +msgstr "" +"TURGNAMHACH: Taispeáin cathain a rinneadh na comhaid a mhodhnú go deireanach" + msgid "Show commit logs" msgstr "Taispeáin logaà tiomanta" -#: command-list.h msgid "Show information about files in the index and the working tree" msgstr "Taispeáin faisnéis faoi chomhaid san innéacs agus sa chrann oibre" -#: command-list.h msgid "List references in a remote repository" msgstr "Liostaigh tagairtà i stór iargúlta" -#: command-list.h msgid "List the contents of a tree object" msgstr "Liostaigh ábhar réad crann" -#: command-list.h msgid "Extracts patch and authorship from a single e-mail message" msgstr "Baineann paiste agus údaracht as teachtaireacht rÃomhphoist amháin" -#: command-list.h msgid "Simple UNIX mbox splitter program" msgstr "Clár scoilteora mbox UNIX simplÃ" -#: command-list.h msgid "Run tasks to optimize Git repository data" msgstr "Rith tascanna chun sonraà stór Git a bharrfheabhsú" -#: command-list.h msgid "Join two or more development histories together" msgstr "Bà le dhá stair forbartha nó nÃos mó le chéile" -#: command-list.h msgid "Find as good common ancestors as possible for a merge" msgstr "Faigh sinsear choiteann chomh maith agus is féidir le cumasc" -#: command-list.h msgid "Run a three-way file merge" msgstr "Rith cumasc comhad trà bhealach" -#: command-list.h msgid "Run a merge for files needing merging" msgstr "Reáchtáil cumaisc le haghaidh comhaid a bhfuil gá le cumasc orthu" -#: command-list.h msgid "The standard helper program to use with git-merge-index" msgstr "An clár cúntóra caighdeánach le húsáid le git-merge-index" -#: command-list.h msgid "Perform merge without touching index or working tree" msgstr "Déan cumasc gan teagmháil a dhéanamh le hInnéacs nó crann" -#: command-list.h msgid "Run merge conflict resolution tools to resolve merge conflicts" msgstr "Rith uirlisà réitigh coinbhleachtaà cumaisc chun coinbhleachtaÃ" -#: command-list.h msgid "Creates a tag object with extra validation" msgstr "CruthaÃonn sé réad clibeanna le bailÃochtú breise" -#: command-list.h msgid "Build a tree-object from ls-tree formatted text" msgstr "Tóg réad crann ó théacs formáidithe ls-tree" -#: command-list.h msgid "Write and verify multi-pack-indexes" msgstr "Innéacsanna il-phacáiste a scrÃobh agus a fhÃorú" -#: command-list.h msgid "Move or rename a file, a directory, or a symlink" msgstr "Bogadh nó athainmnigh comhad, eolaire, nó nasc comhsheasmhach" -#: command-list.h msgid "Find symbolic names for given revs" msgstr "Faigh ainmneacha siombalacha do thiomhartha tugtha" -#: command-list.h msgid "Add or inspect object notes" msgstr "Cuir nó iniúchadh nótaà réad" -#: command-list.h msgid "Import from and submit to Perforce repositories" msgstr "Iompórtáil ó stórais Perforce agus cuir isteach chuig" -#: command-list.h msgid "Create a packed archive of objects" msgstr "Cruthaigh cartlann pacáilte rudaÃ" -#: command-list.h msgid "Find redundant pack files" msgstr "Faigh comhaid pacáiste iomarcacha" -#: command-list.h msgid "Pack heads and tags for efficient repository access" msgstr "Ceannanna agus clibeanna pacála le haghaidh rochtain éifeachtach" -#: command-list.h msgid "Compute unique ID for a patch" msgstr "RÃomh ID uathúil le haghaidh paiste" -#: command-list.h msgid "Prune all unreachable objects from the object database" msgstr "" "Déan gach rud nach féidir inrochtana a ghearradh ón mbunachar sonraà réad" -#: command-list.h msgid "Remove extra objects that are already in pack files" msgstr "Bain rudaà breise atá i gcomhaid pacáiste cheana féin" -#: command-list.h msgid "Fetch from and integrate with another repository or a local branch" msgstr "Faigh ó stór eile nó brainse áitiúil agus comhtháthú leis" -#: command-list.h msgid "Update remote refs along with associated objects" msgstr "Nuashonraigh iargúlta mar aon le rudaà gaolmhara" -#: command-list.h msgid "Applies a quilt patchset onto the current branch" msgstr "Cuireann paistset cuilte i bhfeidhm ar an mbrainse reatha" -#: command-list.h msgid "Compare two commit ranges (e.g. two versions of a branch)" msgstr "Déan comparáid idir dhá raon tiomanta (e.g. dhá leagan de bhrainse)" -#: command-list.h msgid "Reads tree information into the index" msgstr "Léann faisnéis crainn isteach san innéacs" -#: command-list.h msgid "Reapply commits on top of another base tip" msgstr "Déan gealltanna a athchur i bhfeidhm ar bharr leid bonn eile" -#: command-list.h msgid "Receive what is pushed into the repository" msgstr "Faigh an méid a bhrúitear isteach sa stór" -#: command-list.h msgid "Manage reflog information" msgstr "Bainistigh faisnéis reflog" -#: command-list.h msgid "Low-level access to refs" msgstr "Rochtain ar leibhéal Ãseal ar réimsÃ" -#: command-list.h msgid "Manage set of tracked repositories" msgstr "Bainistigh sraith stórais rianaithe" -#: command-list.h msgid "Pack unpacked objects in a repository" msgstr "Pacáil rudaà neamhphacáilte i stóras" -#: command-list.h msgid "Create, list, delete refs to replace objects" msgstr "Cruthaigh, liostáil, scrios scrÃobh chun rudaà a athsholáthar" -#: command-list.h msgid "EXPERIMENTAL: Replay commits on a new base, works with bare repos too" msgstr "" "TURGNAMHACH: Tiomann athsheoladh ar bhonn nua, oibrÃonn sé le repos lom " "freisin" -#: command-list.h +msgid "Retrieve information about the repository" +msgstr "Aisghabh faisnéis faoin stórlann" + msgid "Generates a summary of pending changes" msgstr "Gineann achoimre ar athruithe ar feitheamh" -#: command-list.h msgid "Reuse recorded resolution of conflicted merges" msgstr "Réiteach taifeadta ar chumaisc coinbhleachta a athúsáid" -#: command-list.h msgid "Reset current HEAD to the specified state" msgstr "Athshocraigh HEAD reatha go dtà an stát sonraithe" -#: command-list.h msgid "Restore working tree files" msgstr "Athchóirigh comhaid crann oibre" -#: command-list.h msgid "Lists commit objects in reverse chronological order" msgstr "Tiomann liostaà rudaà in ord croineolaÃoch droim" -#: command-list.h msgid "Pick out and massage parameters" msgstr "Paraiméadair a roghnú agus massage" -#: command-list.h msgid "Revert some existing commits" msgstr "Cuir roinnt gealltanais atá ann cheana ar ais" -#: command-list.h msgid "Remove files from the working tree and from the index" msgstr "Bain comhaid ón gcrann oibre agus ón innéacs" -#: command-list.h msgid "Send a collection of patches as emails" msgstr "Seol bailiúchán paistà mar rÃomhphoist" -#: command-list.h msgid "Push objects over Git protocol to another repository" msgstr "Brúigh rudaà thar phrótacal Git chuig stór eile" -#: command-list.h msgid "Git's i18n setup code for shell scripts" msgstr "Cód socraithe i18n Git le haghaidh scripteanna blaosc" -#: command-list.h msgid "Common Git shell script setup code" msgstr "Cód socraithe script bhlaosc Git coitianta" -#: command-list.h msgid "Restricted login shell for Git-only SSH access" msgstr "Blaosc logála isteach srianta le haghaidh rochtain SSH GIT amháin" -#: command-list.h msgid "Summarize 'git log' output" msgstr "Achoimre ar aschur 'git log'" -#: command-list.h msgid "Show various types of objects" msgstr "Taispeáin cineálacha éagsúla rudaÃ" -#: command-list.h msgid "Show branches and their commits" msgstr "Taispeáin brainsà agus a ngealltanais" -#: command-list.h msgid "Show packed archive index" msgstr "Taispeáin an t-innéacs cartlainne" -#: command-list.h msgid "List references in a local repository" msgstr "Liostaigh tagairtà i stóras áitiúil" -#: command-list.h msgid "Reduce your working tree to a subset of tracked files" msgstr "Laghdaigh do chrann oibre go fo-thacar de chomhaid rianaithe" -#: command-list.h msgid "Add file contents to the staging area" msgstr "Cuir ábhar an chomhaid leis an limistéar stáitse" -#: command-list.h msgid "Stash the changes in a dirty working directory away" msgstr "Stóráil na hathruithe in eolaire oibre salach ar shiúl" -#: command-list.h msgid "Show the working tree status" msgstr "Taispeáin stádas an chrann oibre" -#: command-list.h msgid "Remove unnecessary whitespace" msgstr "Bain spás bán gan ghá" -#: command-list.h msgid "Initialize, update or inspect submodules" msgstr "Fo-mhodúil a thionscnamh, a nuashonrú nó a" -#: command-list.h msgid "Bidirectional operation between a Subversion repository and Git" msgstr "Oibriú déthreorach idir stór Subversion agus Git" -#: command-list.h msgid "Switch branches" msgstr "Athraigh brainsÃ" -#: command-list.h msgid "Read, modify and delete symbolic refs" msgstr "Léigh, modhnaigh agus scriosadh taiscéalaà siombalacha" -#: command-list.h -msgid "Create, list, delete or verify a tag object signed with GPG" -msgstr "Cruthaigh, liostáil, scrios nó fÃorú réad clibeanna sÃnithe le GPG" +msgid "Create, list, delete or verify tags" +msgstr "Cruthaigh, liostaigh, scrios nó fÃoraigh clibeanna" -#: command-list.h msgid "Creates a temporary file with a blob's contents" msgstr "CruthaÃonn sé comhad sealadach le hábhar blob" -#: command-list.h msgid "Unpack objects from a packed archive" msgstr "DÃphacáil rudaà ó chartlann pacáilte" -#: command-list.h msgid "Register file contents in the working tree to the index" msgstr "Cláraigh ábhar an chomhaid sa chrann oibre chuig an innéacs" -#: command-list.h msgid "Update the object name stored in a ref safely" msgstr "Nuashonraigh ainm an réad atá stóráilte i dtagairt go sá" -#: command-list.h msgid "Update auxiliary info file to help dumb servers" msgstr "Nuashonraigh comhad faisnéise cúnta chun cabhrú le freastalaithe" -#: command-list.h msgid "Send archive back to git-archive" msgstr "Seol cartlann ar ais chuig git-archive" -#: command-list.h msgid "Send objects packed back to git-fetch-pack" msgstr "Seol rudaà pacáilte ar ais chuig git-fetch-pack" -#: command-list.h msgid "Show a Git logical variable" msgstr "Taispeáin athróg loighciúil Git" -#: command-list.h msgid "Check the GPG signature of commits" msgstr "Seiceáil sÃniú GPG na ngealltanais" -#: command-list.h msgid "Validate packed Git archive files" msgstr "BailÃochtú comhaid cartlainne Git pacáilte" -#: command-list.h msgid "Check the GPG signature of tags" msgstr "Seiceáil sÃniú GPG na gclibeanna" -#: command-list.h msgid "Display version information about Git" msgstr "Taispeáin faisnéis leagan faoi Git" -#: command-list.h msgid "Show logs with differences each commit introduces" msgstr "Taispeáin logaà le difrÃochtaà a thugann gach tiomantas" -#: command-list.h msgid "Manage multiple working trees" msgstr "Bainistigh iliomad crainn oibre" -#: command-list.h msgid "Create a tree object from the current index" msgstr "Cruthaigh réad crann ón innéacs reatha" -#: command-list.h msgid "Defining attributes per path" msgstr "SainmhÃniú tréithe in aghaidh an" -#: command-list.h msgid "Git command-line interface and conventions" msgstr "Comhéadan agus coinbhinsiúin lÃne ordaithe Git" -#: command-list.h msgid "A Git core tutorial for developers" msgstr "Teagaisc lárnach Git d'fhorbróirÃ" -#: command-list.h msgid "Providing usernames and passwords to Git" msgstr "Ainmneacha úsáideora agus pasfhocail a sholáthar do" -#: command-list.h msgid "Git for CVS users" msgstr "Git d'úsáideoirà CVS" -#: command-list.h msgid "Tweaking diff output" msgstr "Aschur difriúil a athrú" -#: command-list.h msgid "A useful minimum set of commands for Everyday Git" msgstr "Sraith Ãosta úsáideach orduithe do Everyday Git" -#: command-list.h msgid "Frequently asked questions about using Git" msgstr "Ceisteanna coitianta faoi úsáid Git" -#: command-list.h msgid "The bundle file format" msgstr "An formáid comhaid beartán" -#: command-list.h msgid "Chunk-based file formats" msgstr "Formáidà comhaid bunaithe ar bhunús" -#: command-list.h msgid "Git commit-graph format" -msgstr "Formáid comh-graph Git" +msgstr "Git commit-graph format" -#: command-list.h msgid "Git index format" -msgstr "Formáid innéacs Git" +msgstr "Git Formáid innéacs" -#: command-list.h msgid "Git pack format" msgstr "Formáid pacáiste Git" -#: command-list.h msgid "Git cryptographic signature formats" msgstr "Formáidà sÃnithe cripteagrafach Git" -#: command-list.h msgid "A Git Glossary" msgstr "Gloclóir Git" -#: command-list.h msgid "Hooks used by Git" msgstr "Crúcaà a úsáideann Git" -#: command-list.h msgid "Specifies intentionally untracked files to ignore" msgstr "SonraÃonn sé comhaid neamhrianaithe de ghnó le neamhaird" -#: command-list.h msgid "The Git repository browser" msgstr "Brabhsálaà stór Git" -#: command-list.h msgid "Map author/committer names and/or E-Mail addresses" msgstr "Léarscáil ainmneacha údar/coistà agus/nó seoltaà rÃ" -#: command-list.h msgid "Defining submodule properties" msgstr "AirÃonna fomhodúil a shainiú" -#: command-list.h msgid "Git namespaces" msgstr "Spásanna ainmneacha Git" -#: command-list.h msgid "Protocol v0 and v1 capabilities" msgstr "Cumais Prótacal v0 agus v1" -#: command-list.h msgid "Things common to various protocols" msgstr "Rudaà coitianta le prótacail éagsúla" -#: command-list.h msgid "Git HTTP-based protocols" msgstr "Prótacail Git HTTP bunaithe" -#: command-list.h msgid "How packs are transferred over-the-wire" msgstr "Conas a aistrÃtear pacáistà thar an sreang" -#: command-list.h msgid "Git Wire Protocol, Version 2" msgstr "Prótacal Wire Git, Leagan 2" -#: command-list.h msgid "Helper programs to interact with remote repositories" msgstr "Cláir chúntóirà chun idirghnÃomhú le stórálaÃ" -#: command-list.h msgid "Git Repository Layout" msgstr "Leagan Amach Stórála Git" -#: command-list.h msgid "Specifying revisions and ranges for Git" msgstr "Athbhreithnithe agus raonta a shonrú do Git" -#: command-list.h msgid "Mounting one repository inside another" msgstr "Stóra amháin a chur isteach taobh istigh de cheann" -#: command-list.h msgid "A tutorial introduction to Git" msgstr "Réamhrá teagaisc ar Git" -#: command-list.h msgid "A tutorial introduction to Git: part two" msgstr "Réamhrá teagaisc ar Git: cuid a dara" -#: command-list.h msgid "Git web interface (web frontend to Git repositories)" msgstr "Comhéadan gréasáin Git (tosaigh gréasáin chuig stórais Git)" -#: command-list.h msgid "An overview of recommended workflows with Git" msgstr "Forbhreathnú ar shreafaà oibre a mholtar le Git" -#: command-list.h msgid "A tool for managing large Git repositories" msgstr "Uirlis chun stórtha móra Git a bhainistiú" -#: commit-graph.c msgid "commit-graph file is too small" msgstr "tá comhad coimit-graph ró-bheag" -#: commit-graph.c msgid "commit-graph oid fanout chunk is wrong size" msgstr "tá an méid mÃcheart ar an smután fanout oid commit-graph" -#: commit-graph.c msgid "commit-graph fanout values out of order" msgstr "luachanna fanout choimisi-graph as ord" -#: commit-graph.c msgid "commit-graph OID lookup chunk is the wrong size" msgstr "tá an méid mÃcheart ar an smután cuardaigh OID commit-graph" -#: commit-graph.c msgid "commit-graph commit data chunk is wrong size" msgstr "tá méid mÃcheart ar an smután sonraà commit commit-graph" -#: commit-graph.c msgid "commit-graph generations chunk is wrong size" msgstr "is méid mÃcheart é an pÃosa glúine ghlúin chomhghraif" -#: commit-graph.c msgid "commit-graph changed-path index chunk is too small" msgstr "tá pÃosa innéacs cosáin athraithe coimisithe ró-bheag" -#: commit-graph.c #, c-format msgid "" "ignoring too-small changed-path chunk (%<PRIuMAX> < %<PRIuMAX>) in commit-" @@ -18901,41 +15872,33 @@ msgstr "" "ag neamhaird a dhéanamh den smután róbheag den chonair athraithe (%<PRIuMAX> " "< %<PRIuMAX>) i gcomhad commit-graph" -#: commit-graph.c #, c-format msgid "commit-graph signature %X does not match signature %X" msgstr "nà mheaitseálann sÃniú gráf coimiteach %X sÃniú %X" -#: commit-graph.c #, c-format msgid "commit-graph version %X does not match version %X" msgstr "nà hionann leagan %X den commit-graph agus leagan %X" -#: commit-graph.c #, c-format msgid "commit-graph hash version %X does not match version %X" msgstr "nà hionann leagan %X den hais commit-graph agus leagan %X" -#: commit-graph.c #, c-format msgid "commit-graph file is too small to hold %u chunks" msgstr "tá comhad comh-graph ró-bheag chun codanna %u a choinneáil" -#: commit-graph.c msgid "commit-graph required OID fanout chunk missing or corrupted" msgstr "teastaÃonn gráf coimisiúnaithe OID ar iarraidh nó truaillithe" -#: commit-graph.c msgid "commit-graph required OID lookup chunk missing or corrupted" msgstr "teastaÃonn pÃosa cuardaigh OID atá ar iarraidh nó truaillithe" -#: commit-graph.c msgid "commit-graph required commit data chunk missing or corrupted" msgstr "" "gráf choimisiúnaithe riachtanach a thabhairt do chuid sonraà atá ar iarraidh " "nó" -#: commit-graph.c #, c-format msgid "" "disabling Bloom filters for commit-graph layer '%s' due to incompatible " @@ -18944,86 +15907,66 @@ msgstr "" "scagairà Bloom a dhÃchumasú le haghaidh ciseal coimit-graf '%s' mar gheall " "ar shuÃomhanna neamh-chomho" -#: commit-graph.c msgid "commit-graph has no base graphs chunk" msgstr "nÃl aon phÃosa graif bunghraif ag commit-graph" -#: commit-graph.c msgid "commit-graph base graphs chunk is too small" msgstr "tá an pÃosa graif bonn coimisi-graf ró-bheag" -#: commit-graph.c msgid "commit-graph chain does not match" msgstr "nà mheaitseálann slabhra graf coimisiúnaithe" -#: commit-graph.c #, c-format msgid "commit count in base graph too high: %<PRIuMAX>" msgstr "lÃon tiomanta i mbonngraf ró-ard:%<PRIuMAX>" -#: commit-graph.c msgid "commit-graph chain file too small" msgstr "comhad slabhra commit-graph ró-bheag" -#: commit-graph.c #, c-format msgid "invalid commit-graph chain: line '%s' not a hash" msgstr "slabhra coimit-graf neamhbhailÃ: nà hash é lÃne '%s'" -#: commit-graph.c msgid "unable to find all commit-graph files" -msgstr "nach féidir gach comhad gráf coimisiúnaithe a fháil" +msgstr "nà féidir gach comhad commit-graph a aimsiú" -#: commit-graph.c msgid "invalid commit position. commit-graph is likely corrupt" msgstr "post tiomanta neamhbhailÃ. Is dócha go bhfuil graf coimite truaillithe" -#: commit-graph.c #, c-format msgid "could not find commit %s" msgstr "nà raibh sé in ann teacht ar thiomantas %s" -#: commit-graph.c msgid "commit-graph requires overflow generation data but has none" msgstr "teastaÃonn sonraà giniúna ró-shreabhadh ach nÃl aon cheann acu" -#: commit-graph.c msgid "commit-graph overflow generation data is too small" msgstr "tá sonraà giniúna ró-shreabha tiomnaithe-graif róbheag" -#: commit-graph.c msgid "commit-graph extra-edges pointer out of bounds" msgstr "léirÃonn imill shrea-ghraif choimisiúin amach as teorainneacha" -#: commit-graph.c msgid "Loading known commits in commit graph" msgstr "Gealltanna aitheanta a luchtú i ngraf tiomanta" -#: commit-graph.c msgid "Expanding reachable commits in commit graph" msgstr "Gealltanais inrochtana a leathnú sa ghraf tiomanta" -#: commit-graph.c msgid "Clearing commit marks in commit graph" msgstr "Marcanna tiomanta a ghlanadh sa ghraf tiom" -#: commit-graph.c msgid "Computing commit graph topological levels" msgstr "Tiomann rÃomhaireacht leibhéil topaic" -#: commit-graph.c msgid "Computing commit graph generation numbers" msgstr "Tiomann an rÃomhaireacht uimhreacha" -#: commit-graph.c msgid "Computing commit changed paths Bloom filters" msgstr "Déanann rÃomhaireacht cosáin athraithe a" -#: commit-graph.c msgid "Collecting referenced commits" msgstr "Gealltanna tagartha a bhailiú" -#: commit-graph.c #, c-format msgid "Finding commits for commit graph in %<PRIuMAX> pack" msgid_plural "Finding commits for commit graph in %<PRIuMAX> packs" @@ -19031,38 +15974,30 @@ msgstr[0] "Ag aimsiú tiomantais don ghraf tiomantais sa phacáiste %<PRIuMAX>" msgstr[1] "Ag aimsiú tiomantais don ghraf tiomantais i bpacáistà %<PRIuMAX>" msgstr[2] "Ag aimsiú tiomantais don ghraf tiomantais i bpacáistà %<PRIuMAX>" -#: commit-graph.c #, c-format msgid "error adding pack %s" msgstr "earráid ag cur pacáiste %s" -#: commit-graph.c #, c-format msgid "error opening index for %s" msgstr "innéacs oscailte earráide do %s" -#: commit-graph.c msgid "Finding commits for commit graph among packed objects" msgstr "Tiomantas a aimsiú maidir le graf tiomanta i measc rudaà pacá" -#: commit-graph.c msgid "Finding extra edges in commit graph" msgstr "Imill bhreise a aimsiú i ngraf tiomanta" -#: commit-graph.c msgid "failed to write correct number of base graph ids" msgstr "theip orthu lÃon ceart na n-idà graif bonn a scrÃobh" -#: commit-graph.c msgid "unable to create temporary graph layer" -msgstr "in ann ciseal graf sealadach a chruthú" +msgstr "nà féidir ciseal graif sealadach a chruthú" -#: commit-graph.c midx-write.c #, c-format msgid "unable to adjust shared permissions for '%s'" -msgstr "nach féidir ceadanna roinnte a choigeartú do '%s'" +msgstr "nà féidir ceadanna comhroinnte a choigeartú do '%s'" -#: commit-graph.c #, c-format msgid "Writing out commit graph in %d pass" msgid_plural "Writing out commit graph in %d passes" @@ -19070,42 +16005,33 @@ msgstr[0] "Ag scrÃobh amach graf tiomantais i %d pas" msgstr[1] "Ag scrÃobh amach graf tiomantais i %d pas" msgstr[2] "Ag scrÃobh amach graf tiomantais i %d pas" -#: commit-graph.c msgid "unable to open commit-graph chain file" -msgstr "nach féidir comhad slabhra coimis-graf a oscailt" +msgstr "nà féidir comhad slabhra commit-graph a oscailt" -#: commit-graph.c msgid "failed to rename base commit-graph file" msgstr "theip ar an gcomhad gráf bunchoiste a athainmniú" -#: commit-graph.c msgid "failed to rename temporary commit-graph file" msgstr "theip ar chomhad gráf choiste sealadach a athainmniú" -#: commit-graph.c #, c-format msgid "cannot merge graphs with %<PRIuMAX>, %<PRIuMAX> commits" msgstr "nà féidir graif a chumasc le %<PRIuMAX>, %<PRIuMAX> tiomantais" -#: commit-graph.c #, c-format msgid "cannot merge graph %s, too many commits: %<PRIuMAX>" msgstr "nà féidir graf %s a chumasc, an iomarca tiomantais: %<PRIuMAX>" -#: commit-graph.c msgid "Scanning merged commits" msgstr "Tiomanta cumaisc ag scanadh" -#: commit-graph.c msgid "Merging commit-graph" msgstr "Graf coiste a chumasc" -#: commit-graph.c msgid "attempting to write a commit-graph, but 'core.commitGraph' is disabled" msgstr "" "ag iarraidh graf coimite a scrÃobh, ach tá 'core.commitGraph' dÃchumasaithe" -#: commit-graph.c #, c-format msgid "" "attempting to write a commit-graph, but 'commitGraph.changedPathsVersion' " @@ -19114,73 +16040,60 @@ msgstr "" "ag iarraidh commit-graph a scrÃobh, ach tá 'commitGraph.changedPathsVersion' " "(%d) nà thacaÃtear leis" -#: commit-graph.c msgid "too many commits to write graph" msgstr "an iomarca gealltanais graf a scrÃobh" -#: commit-graph.c msgid "the commit-graph file has incorrect checksum and is likely corrupt" msgstr "" "tá seicsum mÃcheart ag an gcomhad graf coimite agus is dócha go bhfuil sé " "truaillithe" -#: commit-graph.c #, c-format msgid "commit-graph has incorrect OID order: %s then %s" msgstr "tá ordú OID mÃcheart ag commit-graph: %s ansin %s" -#: commit-graph.c #, c-format msgid "commit-graph has incorrect fanout value: fanout[%d] = %u != %u" msgstr "tá luach fanout mÃcheart ag commit-graph: fanout [%d] = %u! = %u" -#: commit-graph.c #, c-format msgid "failed to parse commit %s from commit-graph" msgstr "theip ar thiomantas %s a pharsáil ó ghraif choimisiúnaithe" -#: commit-graph.c #, c-format msgid "failed to parse commit %s from object database for commit-graph" msgstr "" "theip ar thiomantas %s a pharsáil ó bhunachar sonraà réad le haghaidh graf " "coimite" -#: commit-graph.c #, c-format msgid "root tree OID for commit %s in commit-graph is %s != %s" msgstr "" "crann fréimhe Is é OID do thiomantas %s sa ghraf tiomantais ná %s != %s" -#: commit-graph.c #, c-format msgid "commit-graph parent list for commit %s is too long" msgstr "tá liosta tuismitheoirà comh-graph do thiomantas %s rófhada" -#: commit-graph.c #, c-format msgid "commit-graph parent for %s is %s != %s" msgstr "is é an tuismitheoir comh-graph do %s ná %s! = %s" -#: commit-graph.c #, c-format msgid "commit-graph parent list for commit %s terminates early" msgstr "" "foirceannann liosta tuismitheora commit-graph le haghaidh commit %s go luath" -#: commit-graph.c #, c-format msgid "commit-graph generation for commit %s is %<PRIuMAX> < %<PRIuMAX>" msgstr "" "is é giniúint commit-graph le haghaidh commit %s %<PRIuMAX> < %<PRIuMAX>" -#: commit-graph.c #, c-format msgid "commit date for commit %s in commit-graph is %<PRIuMAX> != %<PRIuMAX>" msgstr "" "is é dáta tiomantais don tiomantas %s i commit-graph %<PRIuMAX> != %<PRIuMAX>" -#: commit-graph.c #, c-format msgid "" "commit-graph has both zero and non-zero generations (e.g., commits '%s' and " @@ -19189,21 +16102,17 @@ msgstr "" "tá glúine nialasach agus neamh-nialasach ag comh-graph (e.g., geallann sé " "'%s' agus '%s')" -#: commit-graph.c msgid "Verifying commits in commit graph" msgstr "Gealltanna a fhÃorú i ngraf tiomanta" -#: commit-reach.c sequencer.c #, c-format msgid "could not parse commit %s" msgstr "nà fhéadfaà a pharsáil a dhéanamh ar thiomantas %s" -#: commit.c #, c-format msgid "%s %s is not a commit!" msgstr "Nà gealltanas é %s %s!" -#: commit.c msgid "" "Support for <GIT_DIR>/info/grafts is deprecated\n" "and will be removed in a future Git version.\n" @@ -19223,32 +16132,26 @@ msgstr "" "Cas an teachtaireacht seo as trà rith\n" "“git config socraigh advice.graftFileDeprecated bréagachâ€" -#: commit.c #, c-format msgid "commit %s exists in commit-graph but not in the object database" msgstr "tá comhad %s ann sa choimit-graph ach nÃl sa bhunachar sonraà réad" -#: commit.c #, c-format msgid "Commit %s has an untrusted GPG signature, allegedly by %s." msgstr "Tá sÃniú GPG neamhiontaofa ag Commit %s, a lÃomhnaÃtear ag %s." -#: commit.c #, c-format msgid "Commit %s has a bad GPG signature allegedly by %s." msgstr "Tá droch-shÃniú GPG ag Commit %s a lÃomhnaÃtear ag %s." -#: commit.c #, c-format msgid "Commit %s does not have a GPG signature." msgstr "NÃl sÃniú GPG ag Teacht %s." -#: commit.c #, c-format msgid "Commit %s has a good GPG signature by %s\n" msgstr "Tá sÃniú maith GPG ag Teacht %s le %s\n" -#: commit.c msgid "" "Warning: commit message did not conform to UTF-8.\n" "You may want to amend it after fixing the message, or set the config\n" @@ -19259,260 +16162,203 @@ msgstr "" "an cumraÃocht a shocrú\n" "athróg i18N.CommitEncoding don ionchódú a úsáideann do thionscadal.\n" -#: compat/compiler.h msgid "no compiler information available\n" msgstr "nÃl aon fhaisnéis tiomsaitheora ar fáil\n" -#: compat/compiler.h msgid "no libc information available\n" msgstr "nÃl aon fhaisnéis libc ar fáil\n" -#: compat/disk.h #, c-format msgid "could not determine free disk size for '%s'" msgstr "nà fhéadfaà méid diosca saor in aisce a chinneadh do '%s'" -#: compat/disk.h #, c-format msgid "could not get info for '%s'" msgstr "nà fhéadfaà faisnéis a fháil do '%s'" -#: compat/fsmonitor/fsm-health-win32.c #, c-format msgid "[GLE %ld] health thread could not open '%ls'" msgstr "[GLE %ld] nà fhéadfadh snáithe sláinte '%ls' a oscailt" -#: compat/fsmonitor/fsm-health-win32.c #, c-format msgid "[GLE %ld] health thread getting BHFI for '%ls'" msgstr "[GLE %ld] snáithe sláinte ag fáil BHFI do '%ls'" -#: compat/fsmonitor/fsm-health-win32.c compat/fsmonitor/fsm-listen-win32.c #, c-format msgid "could not convert to wide characters: '%s'" msgstr "nà raibh sé in ann tiontú go carachtair leathan: '%s'" -#: compat/fsmonitor/fsm-health-win32.c #, c-format msgid "BHFI changed '%ls'" msgstr "Athraigh BHFI '%ls'" -#: compat/fsmonitor/fsm-health-win32.c #, c-format msgid "unhandled case in 'has_worktree_moved': %d" msgstr "cás neamh-láimhseáilte i 'has_worktree_moved': %d" -#: compat/fsmonitor/fsm-health-win32.c #, c-format msgid "health thread wait failed [GLE %ld]" msgstr "theip ar fanacht snáithe sláinte [GLE %ld]" -#: compat/fsmonitor/fsm-ipc-darwin.c #, c-format msgid "Invalid path: %s" -msgstr "Conair neamhbhailÃ: %s" +msgstr "Cosán neamhbhailÃ: %s" -#: compat/fsmonitor/fsm-listen-darwin.c msgid "Unable to create FSEventStream." msgstr "Nà féidir FSeventStream a chruthú." -#: compat/fsmonitor/fsm-listen-darwin.c msgid "Failed to start the FSEventStream" msgstr "Theip ar an FSevenStream a thosú" -#: compat/fsmonitor/fsm-listen-win32.c #, c-format msgid "[GLE %ld] could not convert path to UTF-8: '%.*ls'" msgstr "[GLE %ld] nÃorbh fhéidir an cosán a thiontú go UTF-8: '%.*ls'" -#: compat/fsmonitor/fsm-listen-win32.c #, c-format msgid "[GLE %ld] could not watch '%s'" msgstr "Nà raibh [GLE %ld] in ann féachaint ar '%s'" -#: compat/fsmonitor/fsm-listen-win32.c #, c-format msgid "[GLE %ld] could not get longname of '%s'" msgstr "Nà raibh [GLE %ld] in ann ainm fadainm '%s' a fháil" -#: compat/fsmonitor/fsm-listen-win32.c #, c-format msgid "ReadDirectoryChangedW failed on '%s' [GLE %ld]" msgstr "Theip ar ReadDirectoryChangedW ar '%s' [GLE %ld]" -#: compat/fsmonitor/fsm-listen-win32.c #, c-format msgid "GetOverlappedResult failed on '%s' [GLE %ld]" msgstr "Theip ar getOverlappedResult ar '%s' [GLE %ld]" -#: compat/fsmonitor/fsm-listen-win32.c #, c-format msgid "could not read directory changes [GLE %ld]" msgstr "nà fhéadfaà athruithe eolaire a léamh [GLE %ld]" -#: compat/fsmonitor/fsm-path-utils-darwin.c #, c-format msgid "opendir('%s') failed" msgstr "theip ar opendir ('%s')" -#: compat/fsmonitor/fsm-path-utils-darwin.c #, c-format msgid "lstat('%s') failed" msgstr "theip ar lstat ('%s')" -#: compat/fsmonitor/fsm-path-utils-darwin.c #, c-format msgid "strbuf_readlink('%s') failed" msgstr "theip ar strbuf_readlink ('%s')" -#: compat/fsmonitor/fsm-path-utils-darwin.c #, c-format msgid "closedir('%s') failed" msgstr "theip ar closedir ('%s')" -#: compat/fsmonitor/fsm-path-utils-win32.c #, c-format msgid "[GLE %ld] unable to open for read '%ls'" msgstr "[GLE %ld] nach féidir é a oscailt le haghaidh léamh '%ls'" -#: compat/fsmonitor/fsm-path-utils-win32.c #, c-format msgid "[GLE %ld] unable to get protocol information for '%ls'" msgstr "[GLE %ld] in ann faisnéis phrótacail a fháil do '%ls'" -#: compat/mingw.c #, c-format msgid "failed to copy SID (%ld)" msgstr "theip ar SID (%ld) a chóipeáil" -#: compat/mingw.c #, c-format msgid "failed to get owner for '%s' (%ld)" msgstr "theip ar úinéir a fháil do '%s' (%ld)" -#: compat/obstack.c msgid "memory exhausted" msgstr "cuimhne Ãdithe" -#: compat/regex/regcomp.c msgid "Success" msgstr "Rath" -#: compat/regex/regcomp.c msgid "No match" msgstr "Gan aon mheaitseáil" -#: compat/regex/regcomp.c msgid "Invalid regular expression" msgstr "Léiriú rialta nebhailÃ" -#: compat/regex/regcomp.c msgid "Invalid collation character" msgstr "Carachtar comparáide neamhbhailÃ" -#: compat/regex/regcomp.c msgid "Invalid character class name" msgstr "Ainm ranga carachtar neamhbhailÃ" -#: compat/regex/regcomp.c msgid "Trailing backslash" msgstr "Cúlbhraith rianaithe" -#: compat/regex/regcomp.c msgid "Invalid back reference" msgstr "Tagairt cúil neamhbhailÃ" -#: compat/regex/regcomp.c msgid "Unmatched [ or [^" msgstr "Gan chomhoiriúnú [nó [^" -#: compat/regex/regcomp.c msgid "Unmatched ( or \\(" msgstr "Gan chomhoiriúnú (nó\\ (" -#: compat/regex/regcomp.c msgid "Unmatched \\{" msgstr "Gan comhoiriúnú\\ {" -#: compat/regex/regcomp.c msgid "Invalid content of \\{\\}" -msgstr "Ãbhar neamhbhailà de\\ {\\}" +msgstr "Ãbhar neamhbhailà de \\{\\}" -#: compat/regex/regcomp.c msgid "Invalid range end" msgstr "Deireadh raon neamhbhailÃ" -#: compat/regex/regcomp.c msgid "Memory exhausted" msgstr "Cuimhne Ãdithe" -#: compat/regex/regcomp.c msgid "Invalid preceding regular expression" msgstr "Léiriú rialta neamhbhailÃ" -#: compat/regex/regcomp.c msgid "Premature end of regular expression" msgstr "Deireadh roimh am an léirithe rialta" -#: compat/regex/regcomp.c msgid "Regular expression too big" msgstr "Léiriú rialta ró-mhór" -#: compat/regex/regcomp.c msgid "Unmatched ) or \\)" msgstr "Gan chomhoiriúnú) nó\\)" -#: compat/regex/regcomp.c msgid "No previous regular expression" msgstr "Gan aon léiriú rialta roimhe seo" -#: compat/simple-ipc/ipc-unix-socket.c compat/simple-ipc/ipc-win32.c msgid "could not send IPC command" msgstr "nà fhéadfaà ordú IPC a sheoladh" -#: compat/simple-ipc/ipc-unix-socket.c compat/simple-ipc/ipc-win32.c msgid "could not read IPC response" msgstr "nà raibh sé in ann freagra IPC a léamh" -#: compat/simple-ipc/ipc-unix-socket.c #, c-format msgid "could not start accept_thread '%s'" msgstr "nà fhéadfaà tosú accept_thread '%s'" -#: compat/simple-ipc/ipc-unix-socket.c #, c-format msgid "could not start worker[0] for '%s'" msgstr "nà fhéadfaà oibrà [0] a thosú le haghaidh '%s'" -#: compat/simple-ipc/ipc-win32.c #, c-format msgid "ConnectNamedPipe failed for '%s' (%lu)" msgstr "Theip ar ConnectNamedPipe le haghaidh '%s' (%lu)" -#: compat/simple-ipc/ipc-win32.c #, c-format msgid "could not create fd from pipe for '%s'" msgstr "nà fhéadfaà fd a chruthú ó phÃopa do '%s'" -#: compat/simple-ipc/ipc-win32.c #, c-format msgid "could not start thread[0] for '%s'" msgstr "nà fhéadfaà snáithe [0] a thosú le haghaidh '%s'" -#: compat/simple-ipc/ipc-win32.c #, c-format msgid "wait for hEvent failed for '%s'" msgstr "fanacht go dtà Theip ar feadh '%s'" -#: compat/terminal.c msgid "cannot resume in the background, please use 'fg' to resume" msgstr "nà féidir atosú sa chúlra, bain úsáid as 'fg' le do thoil chun atosú" -#: compat/terminal.c msgid "cannot restore terminal settings" msgstr "nà féidir le socruithe teirminéil" -#: config.c #, c-format msgid "" "exceeded maximum include depth (%d) while including\n" @@ -19527,20 +16373,16 @@ msgstr "" " %s\n" "D'fhéadfadh sé seo a bheith mar gheall ar áireamh ciorclach." -#: config.c #, c-format msgid "could not expand include path '%s'" msgstr "nà fhéadfaà leathnú san áireamh cosán '%s'" -#: config.c msgid "relative config includes must come from files" msgstr "folaÃonn cumraÃocht choibhneasta caithfidh teacht ó chomh" -#: config.c msgid "relative config include conditionals must come from files" msgstr "nà mór coinnÃollacha a theacht ó chomhaid i gcumraÃocht choibhneasta" -#: config.c msgid "" "remote URLs cannot be configured in file directly or indirectly included by " "includeIf.hasconfig:remote.*.url" @@ -19548,348 +16390,266 @@ msgstr "" "nà féidir URLanna iargúlta a chumrú i gcomhad san áireamh go dÃreach nó go " "hindÃreach ag includeIf.hasconfig:remote.*.url" -#: config.c #, c-format msgid "invalid config format: %s" msgstr "formáid cumraÃochta neamhbhailÃ: %s" -#: config.c #, c-format msgid "missing environment variable name for configuration '%.*s'" msgstr "ainm athróg comhshaoil atá in easnamh do chumraÃocht '%.*s'" -#: config.c #, c-format msgid "missing environment variable '%s' for configuration '%.*s'" msgstr "athróg comhshaoil in easnamh '%s' le haghaidh cumraÃocht '%.*s'" -#: config.c #, c-format msgid "key does not contain a section: %s" msgstr "nÃl rannán ag eochair: %s" -#: config.c #, c-format msgid "key does not contain variable name: %s" msgstr "nÃl ainm athraitheach sa eochair: %s" -#: config.c sequencer.c #, c-format msgid "invalid key: %s" msgstr "eochair neamhbhailÃ: %s" -#: config.c #, c-format msgid "invalid key (newline): %s" msgstr "eochair neamhbhailà (lÃne nua): %s" -#: config.c msgid "empty config key" msgstr "eochair cumraÃochta folamh" -#: config.c #, c-format msgid "bogus config parameter: %s" msgstr "paraiméadar cumraÃochta bréagach: %s" -#: config.c #, c-format msgid "bogus format in %s" msgstr "formáid bhréagach i %s" -#: config.c #, c-format msgid "bogus count in %s" msgstr "comhaireamh bréagach i %s" -#: config.c #, c-format msgid "too many entries in %s" msgstr "an iomarca iontrálacha i %s" -#: config.c #, c-format msgid "missing config key %s" msgstr "eochair chumraithe %s in easnamh" -#: config.c #, c-format msgid "missing config value %s" msgstr "luach cumraÃochta %s ar iarraidh" -#: config.c #, c-format msgid "bad config line %d in blob %s" msgstr "droch-lÃne cumraÃochta %d i mblob %s" -#: config.c #, c-format msgid "bad config line %d in file %s" msgstr "droch-lÃne cumraÃochta %d i gcomhad %s" -#: config.c #, c-format msgid "bad config line %d in standard input" msgstr "droch-lÃne cumraÃochta %d i ionchur caighdeánach" -#: config.c #, c-format msgid "bad config line %d in submodule-blob %s" msgstr "droch-lÃne cumraÃochta %d i bhfo-modul-blob %s" -#: config.c #, c-format msgid "bad config line %d in command line %s" msgstr "droch-lÃne cumraÃochta %d i lÃne ordaithe %s" -#: config.c #, c-format msgid "bad config line %d in %s" msgstr "droch-lÃne cumraÃochta %d i %s" -#: config.c msgid "out of range" msgstr "lasmuigh den raon" -#: config.c msgid "invalid unit" msgstr "aonad neamhbhailÃ" -#: config.c #, c-format msgid "bad numeric config value '%s' for '%s': %s" msgstr "droch-luach cumraÃochta uimhriúil '%s' do '%s': %s" -#: config.c #, c-format msgid "bad numeric config value '%s' for '%s' in blob %s: %s" msgstr "droch-luach cumraÃochta uimhriúil '%s' do '%s' i mblob %s: %s" -#: config.c #, c-format msgid "bad numeric config value '%s' for '%s' in file %s: %s" msgstr "droch-luach cumraÃochta uimhriúil '%s' do '%s' i gcomhad %s: %s" -#: config.c #, c-format msgid "bad numeric config value '%s' for '%s' in standard input: %s" msgstr "" "droch-luach cumraÃochta uimhriúil '%s' do '%s' in ionchur caighdeánach: %s" -#: config.c #, c-format msgid "bad numeric config value '%s' for '%s' in submodule-blob %s: %s" msgstr "droch-luach cumraÃochta uimhriúil '%s' do '%s' i bhfo-mhodúl %s: %s" -#: config.c #, c-format msgid "bad numeric config value '%s' for '%s' in command line %s: %s" msgstr "droch-luach cumraÃochta uimhriúil '%s' do '%s' i lÃne ordaithe %s: %s" -#: config.c #, c-format msgid "bad numeric config value '%s' for '%s' in %s: %s" msgstr "droch-luach cumraÃochta uimhriúil '%s' do '%s' i %s: %s" -#: config.c -#, c-format -msgid "invalid value for variable %s" -msgstr "luach neamhbhailà don athróg %s" - -#: config.c -#, c-format -msgid "ignoring unknown core.fsync component '%s'" -msgstr "neamhaird a dhéanamh ar chomhpháirt core.fsync anaithnid '%s'" - -#: config.c #, c-format msgid "bad boolean config value '%s' for '%s'" msgstr "droch-luach cumraÃochta boolean '%s' do '%s'" -#: config.c #, c-format msgid "failed to expand user dir in: '%s'" msgstr "theip ar dir an úsáideora a leathnú i: '%s'" -#: config.c #, c-format msgid "'%s' for '%s' is not a valid timestamp" msgstr "Nà stampa ama bailà é '%s' do '%s'" -#: config.c #, c-format -msgid "abbrev length out of range: %d" -msgstr "fad a ghiorrú lasmuigh den raon: %d" +msgid "unable to load config blob object '%s'" +msgstr "nà féidir an réad blob cumraÃochta '%s' a luchtú" -#: config.c #, c-format -msgid "bad zlib compression level %d" -msgstr "droch-leibhéal comhbhrúite zlib %d" +msgid "reference '%s' does not point to a blob" +msgstr "nà thugann tagairt '%s' in iúl do bhlob" -#: config.c #, c-format -msgid "%s cannot contain newline" -msgstr "Nà féidir le lÃne nua a bheith ag %s" +msgid "unable to resolve config blob '%s'" +msgstr "nà féidir bloba cumraÃochta '%s' a réiteach" -#: config.c -#, c-format -msgid "%s must have at least one character" -msgstr "Nà mór carachtar amháin ar a laghad a bheith ag %s" +msgid "unable to parse command-line config" +msgstr "nà féidir cumraÃocht lÃne ordaithe a pharsáil" -#: config.c #, c-format -msgid "ignoring unknown core.fsyncMethod value '%s'" -msgstr "neamhaird a dhéanamh ar luach core.fsyncMethod anaithnid '%s'" - -#: config.c -msgid "core.fsyncObjectFiles is deprecated; use core.fsync instead" +msgid "" +"\n" +"To use the default comment string (#) please run\n" +"\n" +"%s" msgstr "" -"tá core.fsyncObjectFiles dÃscothaithe; bain úsáid as core.fsync ina ionad" - -#: config.c -#, c-format -msgid "invalid mode for object creation: %s" -msgstr "modh neamhbhailà chun réad a chruthú: %s" +"\n" +"Chun an teaghrán tráchta réamhshocraithe (#) a úsáid, rith le do thoil\n" +"\n" +"%s" -#: config.c -#, c-format -msgid "malformed value for %s" -msgstr "luach mÃfhoirmithe do %s" +msgid "<comment string>" +msgstr "<comment string>" -#: config.c #, c-format -msgid "malformed value for %s: %s" -msgstr "luach mÃfhoirmithe do %s: %s" - -#: config.c -msgid "must be one of nothing, matching, simple, upstream or current" +msgid "" +"\n" +"To set a custom comment string please run\n" +"\n" +"%s\n" +"where '%s' is the string you wish to use.\n" msgstr "" -"caithfidh sé a bheith ar cheann de rud ar bith, meaitseálach, simplÃ, suas " -"srutha nó reatha" - -#: config.c -#, c-format -msgid "unable to load config blob object '%s'" -msgstr "nach féidir réad blob cumraithe '%s' a luchtú" +"\n" +"Chun teaghrán tráchta saincheaptha a shocrú, rith\n" +"\n" +"%s\n" +"áit a seasann '%s' don teaghrán is mian leat a úsáid.\n" -#: config.c #, c-format -msgid "reference '%s' does not point to a blob" -msgstr "nà thugann tagairt '%s' in iúl do bhlob" +msgid "Support for '%s=auto' has been removed in Git 3.0" +msgstr "Baineadh tacaÃocht do '%s=auto' i Git 3.0" -#: config.c #, c-format -msgid "unable to resolve config blob '%s'" -msgstr "in ann clob config '%s' a réiteach" +msgid "Support for '%s=auto' is deprecated and will be removed in Git 3.0" +msgstr "Tá tacaÃocht do '%s=auto' imithe i léig agus bainfear à i Git 3.0" -#: config.c -msgid "unable to parse command-line config" -msgstr "nach féidir cumraÃocht lÃne ordaithe a pháirseáil" - -#: config.c msgid "unknown error occurred while reading the configuration files" msgstr "tharla earráid anaithnid agus na comhaid cumraÃochta á léamh" -#: config.c #, c-format msgid "Invalid %s: '%s'" msgstr "%s neamhbhailÃ: '%s'" -#: config.c #, c-format msgid "splitIndex.maxPercentChange value '%d' should be between 0 and 100" msgstr "splitIndex.maxPercentChange value '%d' bheith idir 0 agus 100" -#: config.c #, c-format msgid "unable to parse '%s' from command-line config" msgstr "nà féidir '%s' a pháirseáil ó chumraÃocht lÃne ordaithe" -#: config.c #, c-format msgid "bad config variable '%s' in file '%s' at line %d" msgstr "droch-athróg cumraithe '%s' sa chomhad '%s' ag lÃne %d" -#: config.c #, c-format msgid "invalid section name '%s'" msgstr "ainm rannán neamhbhailà '%s'" -#: config.c #, c-format msgid "%s has multiple values" msgstr "Tá luachanna iolracha ag %s" -#: config.c #, c-format msgid "failed to write new configuration file %s" msgstr "theip ar chomhad cumraÃochta nua %s a scrÃobh" -#: config.c #, c-format msgid "no multi-line comment allowed: '%s'" msgstr "nÃl aon trácht illÃne ceadaithe: '%s'" -#: config.c #, c-format msgid "could not lock config file %s" msgstr "nà fhéadfaà comhad cumraÃochta %s a ghlasáil" -#: config.c #, c-format msgid "opening %s" msgstr "oscailt %s" -#: config.c #, c-format msgid "invalid config file %s" msgstr "comhad cumraithe neamhbhailà %s" -#: config.c #, c-format msgid "fstat on %s failed" msgstr "theip ar fstat ar %s" -#: config.c #, c-format msgid "unable to mmap '%s'%s" msgstr "nà féidir le '%s'%s a mmapáil" -#: config.c #, c-format msgid "chmod on %s failed" msgstr "theip ar chmod ar %s" -#: config.c #, c-format msgid "could not write config file %s" msgstr "nà fhéadfaà comhad cumraithe %s a scrÃobh" -#: config.c #, c-format msgid "could not set '%s' to '%s'" msgstr "nà fhéadfaà '%s' a shocrú go '%s'" -#: config.c #, c-format msgid "invalid section name: %s" msgstr "ainm rannán neamhbhailÃ: %s" -#: config.c #, c-format msgid "refusing to work with overly long line in '%s' on line %<PRIuMAX>" msgstr "diúltú oibriú le lÃne rófhada i '%s' ar lÃne%<PRIuMAX>" -#: config.c #, c-format msgid "missing value for '%s'" msgstr "luach ar iarraidh do '%s'" -#: connect.c msgid "the remote end hung up upon initial contact" msgstr "crochadh an deireadh iargúlta ar an teagmháil tosaigh" -#: connect.c msgid "" "Could not read from remote repository.\n" "\n" @@ -19901,95 +16661,75 @@ msgstr "" "Déan cinnte go bhfuil na cearta rochtana cearta agat\n" "agus tá an stór ann." -#: connect.c #, c-format msgid "server doesn't support '%s'" msgstr "nà thacaÃonn freastalaà le '%s'" -#: connect.c #, c-format msgid "server doesn't support feature '%s'" msgstr "nà thacaÃonn freastalaà le gné '%s'" -#: connect.c msgid "expected flush after capabilities" msgstr "súil le sruth tar éis cumais" -#: connect.c #, c-format msgid "ignoring capabilities after first line '%s'" msgstr "neamhaird a dhéanamh ar chumais tar éis an chéad lÃne '%s'" -#: connect.c msgid "protocol error: unexpected capabilities^{}" msgstr "earráid prótacal: cumais gan choinne ^ {}" -#: connect.c #, c-format msgid "protocol error: expected shallow sha-1, got '%s'" msgstr "earráid prótacal: táthar ag súil le sha-1 éadrom, fuair '%s'" -#: connect.c msgid "repository on the other end cannot be shallow" msgstr "nà féidir stór ar an gceann eile a bheith éadrom" -#: connect.c msgid "invalid packet" -msgstr "pacáiste neamhbhail" +msgstr "paicéad neamhbhailÃ" -#: connect.c #, c-format msgid "protocol error: unexpected '%s'" msgstr "earráid prótacal: '%s' gan choinne" -#: connect.c #, c-format msgid "unknown object format '%s' specified by server" msgstr "formáid réad anaithnid '%s' arna shonrú ag freastalaÃ" -#: connect.c #, c-format msgid "error on bundle-uri response line %d: %s" msgstr "earráid ar lÃne freagartha cumhachta %d: %s" -#: connect.c msgid "expected flush after bundle-uri listing" msgstr "súil le sruth tar éis liostú bundle-uri" -#: connect.c msgid "expected response end packet after ref listing" msgstr "pacáiste deiridh freagartha a bhfuiltear ag súil leis" -#: connect.c #, c-format msgid "invalid ls-refs response: %s" msgstr "freagra neamhbhailà ls-refs: %s" -#: connect.c msgid "expected flush after ref listing" msgstr "súil le sruth tar éis liostú tagartha" -#: connect.c #, c-format msgid "protocol '%s' is not supported" msgstr "nà thacaÃtear le prótacal '%s'" -#: connect.c msgid "unable to set SO_KEEPALIVE on socket" -msgstr "in ann SO_KEEPALIVE a shocrú ar an soicéad" +msgstr "nà féidir SO_KEEPALIVE a shocrú ar an soicéad" -#: connect.c #, c-format msgid "Looking up %s ... " msgstr "Ag féachaint suas %s... " -#: connect.c #, c-format msgid "unable to look up %s (port %s) (%s)" -msgstr "nach féidir a lorg suas %s (port %s) (%s)" +msgstr "nà féidir %s a chuardach (port %s) (%s)" #. TRANSLATORS: this is the end of "Looking up %s ... " -#: connect.c #, c-format msgid "" "done.\n" @@ -19998,7 +16738,6 @@ msgstr "" "déanta.\n" "Ag nascadh le %s (port %s)... " -#: connect.c #, c-format msgid "" "unable to connect to %s:\n" @@ -20008,89 +16747,70 @@ msgstr "" "%s" #. TRANSLATORS: this is the end of "Connecting to %s (port %s) ... " -#: connect.c msgid "done." msgstr "déanta." -#: connect.c #, c-format msgid "unable to look up %s (%s)" -msgstr "nach féidir a lorg suas %s (%s)" +msgstr "nà féidir %s (%s) a chuardach" -#: connect.c #, c-format msgid "unknown port %s" msgstr "port anaithnid %s" -#: connect.c #, c-format msgid "strange hostname '%s' blocked" msgstr "ainm óstach aisteach '%s' blocáilte" -#: connect.c #, c-format msgid "strange port '%s' blocked" msgstr "cosc ar chalafort aisteach '%s'" -#: connect.c #, c-format msgid "cannot start proxy %s" msgstr "nà féidir le seachfhreastalaà %s" -#: connect.c msgid "no path specified; see 'git help pull' for valid url syntax" msgstr "" "nÃl aon chosán sonraithe; féach 'git help pull' le haghaidh comhréireachta " "bailà url" -#: connect.c msgid "newline is forbidden in git:// hosts and repo paths" msgstr "tá cosc ​​ar lÃne nua in óstaigh git:// agus cosáin stórais" -#: connect.c msgid "ssh variant 'simple' does not support -4" msgstr "nà thacaÃonn leagan ssh 'simplÃ' le -4" -#: connect.c msgid "ssh variant 'simple' does not support -6" msgstr "nà thacaÃonn leagan ssh 'simplÃ' le -6" -#: connect.c msgid "ssh variant 'simple' does not support setting port" msgstr "nà thacaÃonn leagan ssh 'simplÃ' le port socrú" -#: connect.c #, c-format msgid "strange pathname '%s' blocked" msgstr "cosc ar ainm cosán aisteach '%s'" -#: connect.c msgid "unable to fork" -msgstr "in ann a fhorc" +msgstr "nà féidir forc a dhéanamh" -#: connected.c msgid "Could not run 'git rev-list'" msgstr "Nà fhéadfaà 'git rev-list' a reáchtáil" -#: connected.c msgid "failed write to rev-list" msgstr "theip ar scrÃobh chuig rev-list" -#: connected.c msgid "failed to close rev-list's stdin" msgstr "theip orthu stdin rev-list a dhúnadh" -#: convert.c #, c-format msgid "illegal crlf_action %d" msgstr "crlf_action mÃdhleathach %d" -#: convert.c #, c-format msgid "CRLF would be replaced by LF in %s" msgstr "Bheadh LF in ionad CRLF i %s" -#: convert.c #, c-format msgid "" "in the working copy of '%s', CRLF will be replaced by LF the next time Git " @@ -20099,12 +16819,10 @@ msgstr "" "sa chóip oibre de '%s', cuirfear LF in ionad CRLF an chéad uair eile a " "théann Git leis" -#: convert.c #, c-format msgid "LF would be replaced by CRLF in %s" msgstr "Bheadh CRLF in ionad LF i %s" -#: convert.c #, c-format msgid "" "in the working copy of '%s', LF will be replaced by CRLF the next time Git " @@ -20113,12 +16831,10 @@ msgstr "" "sa chóip oibre de '%s', cuirfear CRLF in ionad LF an chéad uair eile a " "théann Git leis" -#: convert.c #, c-format msgid "BOM is prohibited in '%s' if encoded as %s" msgstr "Tá cosc ar BOM i '%s' má tá sé ionchódaithe mar %s" -#: convert.c #, c-format msgid "" "The file '%s' contains a byte order mark (BOM). Please use UTF-%.*s as " @@ -20127,12 +16843,10 @@ msgstr "" "Tá marc ordaithe beart (BOM) sa chomhad '%s'. Bain úsáid as UTF-%.*s mar " "ionchódú crann oibre le do thoil." -#: convert.c #, c-format msgid "BOM is required in '%s' if encoded as %s" msgstr "Tá BOM ag teastáil i '%s' má tá sé ionchódaithe mar %s" -#: convert.c #, c-format msgid "" "The file '%s' is missing a byte order mark (BOM). Please use UTF-%sBE or UTF-" @@ -20141,50 +16855,40 @@ msgstr "" "Tá marc ordaithe beart (BOM) ar iarraidh sa chomhad '%s'. Bain úsáid as UTF-" "%sBE nó UTF-%sLE (ag brath ar ord na mbeart) mar ionchódú crann oibre." -#: convert.c #, c-format msgid "failed to encode '%s' from %s to %s" msgstr "theip ar '%s' a ionchódú ó %s go %s" -#: convert.c #, c-format msgid "encoding '%s' from %s to %s and back is not the same" msgstr "ionchódú '%s' ó %s go %s agus nÃl sé mar an gcéanna ar ais" -#: convert.c #, c-format msgid "cannot fork to run external filter '%s'" msgstr "nà féidir forc chun scagaire seachtrach '%s' a reáchtáil" -#: convert.c #, c-format msgid "cannot feed the input to external filter '%s'" msgstr "nà féidir leis an ionchur a bheathú chuig scagaire seachtrach '%s'" -#: convert.c #, c-format msgid "external filter '%s' failed %d" msgstr "theip ar scagaire seachtrach '%s' %d" -#: convert.c #, c-format msgid "read from external filter '%s' failed" msgstr "theip ar léamh ó scagaire seachtrach '%s'" -#: convert.c #, c-format msgid "external filter '%s' failed" msgstr "theip ar scagaire seachtrach '%s'" -#: convert.c msgid "unexpected filter type" msgstr "cineál scagaire gan choinne" -#: convert.c msgid "path name too long for external filter" msgstr "ainm cosáin rófhada le haghaidh scagaire seachtrach" -#: convert.c #, c-format msgid "" "external filter '%s' is not available anymore although not all paths have " @@ -20193,68 +16897,54 @@ msgstr "" "nÃl an scagaire seachtrach '%s' ar fáil a thuilleadh cé nach bhfuil na " "cosáin uile scagtha" -#: convert.c msgid "true/false are no valid working-tree-encodings" msgstr "nÃl aon ionchódaithe bailà crainn oibre fÃor-bhréagach" -#: convert.c #, c-format msgid "%s: clean filter '%s' failed" msgstr "%s: theip ar scagaire glan '%s'" -#: convert.c #, c-format msgid "%s: smudge filter %s failed" msgstr "%s: theip ar scagaire smudge %s" -#: credential.c #, c-format msgid "skipping credential lookup for key: credential.%s" -msgstr "cuardach creidiúnaithe a scipeáil le haghaidh eochair: creidiúnas. %s" +msgstr "ag scipeáil cuardach dintiúir don eochair: dintiúr.%s" -#: credential.c msgid "refusing to work with credential missing host field" msgstr "diúltú oibriú le réimse óstach creidiúnaithe atá ar" -#: credential.c msgid "refusing to work with credential missing protocol field" msgstr "diúltú oibriú le réimse prótacal ar iarraidh creidiú" -#: credential.c #, c-format msgid "url contains a newline in its %s component: %s" msgstr "tá lÃne nua ina chomhpháirt %s ag url: %s" -#: credential.c #, c-format msgid "url has no scheme: %s" msgstr "nÃl aon scéim ag url: %s" -#: credential.c #, c-format msgid "credential url cannot be parsed: %s" msgstr "nà féidir url creidiúnaithe a pháirseáil: %s" -#: daemon.c #, c-format msgid "invalid timeout '%s', expecting a non-negative integer" msgstr "ama neamhbhailà '%s', ag súil le sláimhir neamh-dhiúltach" -#: daemon.c #, c-format msgid "invalid init-timeout '%s', expecting a non-negative integer" msgstr "ama init-time '%s' neamhbhailÃ, ag súil le sláimhir neamh-dhiúltach" -#: daemon.c #, c-format msgid "invalid max-connections '%s', expecting an integer" msgstr "naisc uasta neamhbhailà '%s', ag súil le sláimhir" -#: date.c msgid "in the future" msgstr "sa todhchaÃ" -#: date.c #, c-format msgid "%<PRIuMAX> second ago" msgid_plural "%<PRIuMAX> seconds ago" @@ -20262,7 +16952,6 @@ msgstr[0] "%<PRIuMAX> soicind ó shin" msgstr[1] "%<PRIuMAX> soicind ó shin" msgstr[2] "%<PRIuMAX> soicind ó shin" -#: date.c #, c-format msgid "%<PRIuMAX> minute ago" msgid_plural "%<PRIuMAX> minutes ago" @@ -20270,7 +16959,6 @@ msgstr[0] "%<PRIuMAX> nóiméad ó shin" msgstr[1] "%<PRIuMAX> nóiméad ó shin" msgstr[2] "%<PRIuMAX> nóiméad ó shin" -#: date.c #, c-format msgid "%<PRIuMAX> hour ago" msgid_plural "%<PRIuMAX> hours ago" @@ -20278,7 +16966,6 @@ msgstr[0] "%<PRIuMAX> uair an chloig ó shin" msgstr[1] "%<PRIuMAX> uair an chloig ó shin" msgstr[2] "%<PRIuMAX> uair an chloig ó shin" -#: date.c #, c-format msgid "%<PRIuMAX> day ago" msgid_plural "%<PRIuMAX> days ago" @@ -20286,7 +16973,6 @@ msgstr[0] "%<PRIuMAX> lá ó shin" msgstr[1] "%<PRIuMAX> lá ó shin" msgstr[2] "%<PRIuMAX> lá ó shin" -#: date.c #, c-format msgid "%<PRIuMAX> week ago" msgid_plural "%<PRIuMAX> weeks ago" @@ -20294,7 +16980,6 @@ msgstr[0] "%<PRIuMAX> seachtain ó shin" msgstr[1] "%<PRIuMAX> seachtain ó shin" msgstr[2] "%<PRIuMAX> seachtain ó shin" -#: date.c #, c-format msgid "%<PRIuMAX> month ago" msgid_plural "%<PRIuMAX> months ago" @@ -20302,7 +16987,6 @@ msgstr[0] "%<PRIuMAX> mà ó shin" msgstr[1] "%<PRIuMAX> mà ó shin" msgstr[2] "%<PRIuMAX> mà ó shin" -#: date.c #, c-format msgid "%<PRIuMAX> year" msgid_plural "%<PRIuMAX> years" @@ -20311,7 +16995,6 @@ msgstr[1] "%<PRIuMAX> bliain" msgstr[2] "%<PRIuMAX> bliain" #. TRANSLATORS: "%s" is "<n> years" -#: date.c #, c-format msgid "%s, %<PRIuMAX> month ago" msgid_plural "%s, %<PRIuMAX> months ago" @@ -20319,7 +17002,6 @@ msgstr[0] "%s, %<PRIuMAX> mà ó shin" msgstr[1] "%s, %<PRIuMAX> mà ó shin" msgstr[2] "%s, %<PRIuMAX> mà ó shin" -#: date.c #, c-format msgid "%<PRIuMAX> year ago" msgid_plural "%<PRIuMAX> years ago" @@ -20327,92 +17009,78 @@ msgstr[0] "%<PRIuMAX> bliain ó shin" msgstr[1] "%<PRIuMAX> bliain ó shin" msgstr[2] "%<PRIuMAX> bliain ó shin" -#: delta-islands.c msgid "Propagating island marks" msgstr "Marcanna oileáin a iomadú" -#: delta-islands.c #, c-format msgid "bad tree object %s" msgstr "réad droch-chrann %s" -#: delta-islands.c #, c-format msgid "failed to load island regex for '%s': %s" msgstr "theip ar an oileán regex a luchtú do '%s': %s" -#: delta-islands.c #, c-format msgid "island regex from config has too many capture groups (max=%d)" msgstr "tá an iomarca grúpaà gabhála ag an oileán regex ó config (max = %d)" -#: delta-islands.c #, c-format msgid "Marked %d islands, done.\n" msgstr "Oileáin %d marcáilte, déanta.\n" -#: diagnose.c #, c-format msgid "invalid --%s value '%s'" msgstr "neamhbhailà --%s luach '%s'" -#: diagnose.c #, c-format msgid "could not archive missing directory '%s'" msgstr "nà fhéadfaà eolaire '%s' in easnamh a chartlannú" -#: diagnose.c dir.c #, c-format msgid "could not open directory '%s'" msgstr "nà raibh in ann eolaire '%s' a oscailt" -#: diagnose.c #, c-format msgid "skipping '%s', which is neither file nor directory" msgstr "ag scipeáil '%s', nach comhad ná eolaire" -#: diagnose.c msgid "could not duplicate stdout" msgstr "nà fhéadfaà stdout a dhúbailt" -#: diagnose.c #, c-format msgid "could not add directory '%s' to archiver" msgstr "nà fhéadfaà eolaire '%s' a chur leis an gcartlann" -#: diagnose.c msgid "failed to write archive" msgstr "theip ar chartlann a scrÃobh" -#: diff-lib.c +msgid "max-depth is not supported for worktree diffs" +msgstr "nà thacaÃtear le doimhneacht uasta le haghaidh difrÃochtaà crann oibre" + +msgid "max-depth is not supported for index diffs" +msgstr "nà thacaÃtear le doimhneacht uasta le haghaidh difrÃochtaà innéacs" + msgid "--merge-base does not work with ranges" msgstr "nà oibrÃonn --merge-base le raonta" -#: diff-lib.c msgid "unable to get HEAD" -msgstr "in ann HEAD a fháil" +msgstr "nà féidir HEAD a faigh" -#: diff-lib.c msgid "no merge base found" msgstr "nÃl aon bhonn cumaisc le fáil" -#: diff-lib.c msgid "multiple merge bases found" msgstr "fuarthas bonn cumaisc iolr" -#: diff-no-index.c msgid "cannot compare stdin to a directory" msgstr "nà féidir stdin a chur i gcomparáid le eolaire" -#: diff-no-index.c msgid "cannot compare a named pipe to a directory" msgstr "nà féidir pÃopa ainmnithe a chur i gcomparáid le eolaire" -#: diff-no-index.c -msgid "git diff --no-index [<options>] <path> <path>" -msgstr "git diff --no-index [<options>] <path> <path>" +msgid "git diff --no-index [<options>] <path> <path> [<pathspec>...]" +msgstr "git diff --no-index [<options>] <path> <path> [<pathspec>...]" -#: diff-no-index.c msgid "" "Not a git repository. Use --no-index to compare two paths outside a working " "tree" @@ -20420,17 +17088,21 @@ msgstr "" "Nà stór git. Úsáid --no-index chun dhá chosán a chur i gcomparáid lasmuigh " "de chrann oibre" -#: diff.c +msgid "" +"Limiting comparison with pathspecs is only supported if both paths are " +"directories." +msgstr "" +"Nà thacaÃtear le comparáid theorannú le speictream cosáin ach amháin má tá " +"an dá chonair ina n-eolairÃ." + #, c-format msgid " Failed to parse dirstat cut-off percentage '%s'\n" msgstr " Theip ar chéatadán scoir dirstat '%s' a pharsáil\n" -#: diff.c #, c-format msgid " Unknown dirstat parameter '%s'\n" msgstr " Paraiméadar dirstat anaithnid '%s'\n" -#: diff.c msgid "" "color moved setting must be one of 'no', 'default', 'blocks', 'zebra', " "'dimmed-zebra', 'plain'" @@ -20438,7 +17110,6 @@ msgstr "" "caithfidh socrú dath a bhogadh a bheith ar cheann de 'nÃl', " "'réamhshocraithe', 'bloic', 'zebra', 'dimmed-zebra', 'simplÃ'" -#: diff.c #, c-format msgid "" "unknown color-moved-ws mode '%s', possible values are 'ignore-space-change', " @@ -20448,7 +17119,6 @@ msgstr "" "'neamhaird-spas-athrú', 'neamhaird a dhéanamh ar spás-at-eol', 'neamhaird a " "dhéanamh ar uile-spás', 'ligead-indentation-change'" -#: diff.c msgid "" "color-moved-ws: allow-indentation-change cannot be combined with other " "whitespace modes" @@ -20456,17 +17126,14 @@ msgstr "" "dath-moved-ws: nà féidir athrú ligead-ionchur a chomhcheangal le modhanna " "spás bán eile" -#: diff.c #, c-format msgid "Unknown value for 'diff.submodule' config variable: '%s'" msgstr "Luach anaithnid d'athróg cumraithe 'diff.submodule': '%s'" -#: diff.c merge-ort.c transport.c #, c-format msgid "unknown value for config '%s': %s" msgstr "luach anaithnid do chumraÃocht '%s': %s" -#: diff.c #, c-format msgid "" "Found errors in 'diff.dirstat' config variable:\n" @@ -20475,33 +17142,27 @@ msgstr "" "Earráidà aimsithe in athróg config 'diff.dirstat':\n" "%s" -#: diff.c #, c-format msgid "external diff died, stopping at %s" msgstr "fuair diff seachtrach bás, ag stopadh ag %s" -#: diff.c msgid "--follow requires exactly one pathspec" msgstr "TeastaÃonn --follow go dÃreach cosán amháin" -#: diff.c #, c-format msgid "pathspec magic not supported by --follow: %s" msgstr "draÃocht pathspec nach dtacaÃonn --follow: %s" -#: diff.c parse-options.c #, c-format msgid "options '%s', '%s', '%s', and '%s' cannot be used together" msgstr "nà féidir roghanna '%s', '%s', '%s', agus '%s' a úsáid le chéile" -#: diff.c #, c-format msgid "options '%s' and '%s' cannot be used together, use '%s' with '%s'" msgstr "" "nà féidir roghanna '%s' agus '%s' a úsáid le chéile, bain úsáid as '%s' le " "'%s'" -#: diff.c #, c-format msgid "" "options '%s' and '%s' cannot be used together, use '%s' with '%s' and '%s'" @@ -20509,17 +17170,14 @@ msgstr "" "nà féidir roghanna '%s' agus '%s' a úsáid le chéile, bain úsáid as '%s' le " "'%s' agus '%s'" -#: diff.c #, c-format msgid "invalid --stat value: %s" msgstr "luach --stat neamhbhailÃ: %s" -#: diff.c parse-options.c #, c-format msgid "%s expects a numerical value" msgstr "Tá %s ag súil le luach uimhriúil" -#: diff.c #, c-format msgid "" "Failed to parse --dirstat/-X option parameter:\n" @@ -20528,195 +17186,151 @@ msgstr "" "Theip ar pharaiméadar rogha --dirstat/-X a pháirseáil:\n" "%s" -#: diff.c #, c-format msgid "unknown change class '%c' in --diff-filter=%s" msgstr "aicme athraithe anaithnid '%c' i --diff-filter=%s" -#: diff.c #, c-format msgid "unknown value after ws-error-highlight=%.*s" msgstr "luach anaithnid tar éis ws-error-highlight =%.*s" -#: diff.c #, c-format msgid "unable to resolve '%s'" -msgstr "nach féidir '%s' a réiteach" +msgstr "nà féidir '%s' a réiteach" -#: diff.c #, c-format msgid "%s expects <n>/<m> form" msgstr "Tá %s ag súil le<n>/fo <m>irm" -#: diff.c #, c-format msgid "%s expects a character, got '%s'" msgstr "Tá %s ag súil le carachtar, fuair '%s'" -#: diff.c #, c-format msgid "bad --color-moved argument: %s" msgstr "argóint lochtach --color-moved: %s" -#: diff.c #, c-format msgid "invalid mode '%s' in --color-moved-ws" msgstr "modh neamhbhailà '%s' i --color-moved-ws" -#: diff.c #, c-format msgid "invalid argument to %s" msgstr "argóint neamhbhailà chuig %s" -#: diff.c #, c-format msgid "invalid regex given to -I: '%s'" msgstr "regex neamhbhailà a thugtar do -I: '%s'" -#: diff.c msgid "-G requires a non-empty argument" msgstr "ÉilÃonn -G argóint neamh-folamh" -#: diff.c msgid "-S requires a non-empty argument" msgstr "ÉilÃonn -S argóint neamh-folamh" -#: diff.c #, c-format msgid "failed to parse --submodule option parameter: '%s'" msgstr "theip ar pharaiméadar rogha --submodule a pháirseáil: '%s'" -#: diff.c #, c-format msgid "bad --word-diff argument: %s" msgstr "argóint olc --word-diff: %s" -#: diff.c msgid "Diff output format options" msgstr "Roghanna formáid aschuir diff" -#: diff.c msgid "generate patch" msgstr "paiste a ghiniúint" -#: diff.c msgid "<n>" msgstr "<n>" -#: diff.c msgid "generate diffs with <n> lines context" msgstr "difrÃochtaà a ghiniúint le comhthéacs <n>lÃn" -#: diff.c msgid "generate the diff in raw format" msgstr "giniúint an diff i bhformáid amh" -#: diff.c msgid "synonym for '-p --raw'" msgstr "comhchiallach do '-p --raw'" -#: diff.c msgid "synonym for '-p --stat'" msgstr "comhchiallach do '-p --stat'" -#: diff.c msgid "machine friendly --stat" msgstr "cairdiúil le meaisÃn --stat" -#: diff.c msgid "output only the last line of --stat" msgstr "aschur ach an lÃne dheireanach de --stat" -#: diff.c msgid "<param1>,<param2>..." msgstr "<param1>,<param2>..." -#: diff.c msgid "" "output the distribution of relative amount of changes for each sub-directory" msgstr "aschur dáileadh méid coibhneasta na n-athruithe do gach fo-eolaire" -#: diff.c msgid "synonym for --dirstat=cumulative" msgstr "comhchiallach do --dirstat=cumulative" -#: diff.c msgid "synonym for --dirstat=files,<param1>,<param2>..." msgstr "comhchiallaigh le haghaidh --dirstat=files,<param1>,<param2>..." -#: diff.c msgid "warn if changes introduce conflict markers or whitespace errors" msgstr "" "rabhadh má thugann athruithe marcóirà coinbhleachta nó earráidà spás bán " "isteach" -#: diff.c msgid "condensed summary such as creations, renames and mode changes" msgstr "" "achoimre chomhdhlúite mar chruthúcháin, athainmneacha agus athruithe mó" -#: diff.c msgid "show only names of changed files" msgstr "taispeáint ach ainmneacha comhaid athraithe" -#: diff.c msgid "show only names and status of changed files" msgstr "taispeáint ach ainmneacha agus stádas na gcomhaid athraithe" -#: diff.c msgid "<width>[,<name-width>[,<count>]]" msgstr "<width>[, <name-width>[,<count>]]" -#: diff.c msgid "generate diffstat" msgstr "diffstat a ghiniúint" -#: diff.c msgid "<width>" msgstr "<width>" -#: diff.c msgid "generate diffstat with a given width" msgstr "diffstat a ghiniúint le leithead ar leith" -#: diff.c msgid "generate diffstat with a given name width" msgstr "diffstat a ghiniúint le leithead ainm ar leith" -#: diff.c msgid "generate diffstat with a given graph width" msgstr "diffstat a ghiniúint le leithead graf ar leith" -#: diff.c msgid "<count>" msgstr "<count>" -#: diff.c msgid "generate diffstat with limited lines" msgstr "diffstat a ghiniúint le lÃnte teoranta" -#: diff.c msgid "generate compact summary in diffstat" msgstr "achoimre dlúth a ghiniúint i diffstat" -#: diff.c msgid "output a binary diff that can be applied" msgstr "aschur diff dénártha is féidir a chur i bhfeidhm" -#: diff.c msgid "show full pre- and post-image object names on the \"index\" lines" msgstr "" "taispeáint ainmneacha réad réad réamh-Ãomhá iomlána ar na lÃnte “innéacsâ€" -#: diff.c msgid "show colored diff" msgstr "taispeáin éagsúlacht daite" -#: diff.c msgid "<kind>" msgstr "<kind>" -#: diff.c msgid "" "highlight whitespace errors in the 'context', 'old' or 'new' lines in the " "diff" @@ -20724,7 +17338,6 @@ msgstr "" "aird a tharraingt ar earráidà spás bán sna lÃnte 'comhthéacs', 'sean' nó " "'nua' sa diff" -#: diff.c msgid "" "do not munge pathnames and use NULs as output field terminators in --raw or " "--numstat" @@ -20732,93 +17345,71 @@ msgstr "" "ná cuir ainmneacha cosáin agus bain úsáid as NULanna mar chrÃochnóirà réimse " "aschuir i --raw nó --numstat" -#: diff.c msgid "<prefix>" msgstr "<prefix>" -#: diff.c msgid "show the given source prefix instead of \"a/\"" msgstr "taispeáint an réimÃr foinse a thugtar in ionad “a/â€" -#: diff.c msgid "show the given destination prefix instead of \"b/\"" msgstr "taispeáin an réimÃr ceann scrÃbe tugtha in ionad “b/â€" -#: diff.c msgid "prepend an additional prefix to every line of output" msgstr "réimÃr bhreise a chur ar fáil do gach lÃne aschuir" -#: diff.c msgid "do not show any source or destination prefix" msgstr "ná taispeáin aon réimÃr foinse nó ceann scrÃbe" -#: diff.c msgid "use default prefixes a/ and b/" msgstr "bain úsáid as réamhshocraithe a/ agus b/" -#: diff.c msgid "show context between diff hunks up to the specified number of lines" msgstr "" "comhthéacs a thaispeáint idir diff hunks suas go dtà an lÃon sonraithe lÃnte" -#: diff.c msgid "<char>" msgstr "<char>" -#: diff.c msgid "specify the character to indicate a new line instead of '+'" msgstr "sonraigh an carachtar chun lÃne nua a léiriú in ionad '+'" -#: diff.c msgid "specify the character to indicate an old line instead of '-'" msgstr "sonraigh an carachtar chun sean-lÃne a chur in iúl in ionad '-'" -#: diff.c msgid "specify the character to indicate a context instead of ' '" msgstr "sonraigh an carachtar chun comhthéacs in ionad '' a chur in iúl" -#: diff.c msgid "Diff rename options" msgstr "Roghanna athainmnithe Diff" -#: diff.c msgid "<n>[/<m>]" msgstr "<n>[/<m>]" -#: diff.c msgid "break complete rewrite changes into pairs of delete and create" msgstr "" "athruithe iomlána athscrÃobh a bhriseadh i bpéirà scrios agus cruthaigh" -#: diff.c msgid "detect renames" msgstr "athainmneacha a bhrath" -#: diff.c msgid "omit the preimage for deletes" msgstr "fág an réamhÃomhá le haghaidh scriosadh" -#: diff.c msgid "detect copies" msgstr "cóipà a bhrath" -#: diff.c msgid "use unmodified files as source to find copies" msgstr "úsáid comhaid neamh-mhodhnaithe mar fhoinse chun cóipeanna a fháil" -#: diff.c msgid "disable rename detection" msgstr "dÃchumasaigh braite athainmnithe" -#: diff.c msgid "use empty blobs as rename source" msgstr "bain úsáid as blobs folamh mar fhoinse athainmnithe" -#: diff.c msgid "continue listing the history of a file beyond renames" msgstr "leanúint ar aghaidh ag liostáil stair chomhaid thar athainmneacha" -#: diff.c msgid "" "prevent rename/copy detection if the number of rename/copy targets exceeds " "given limit" @@ -20826,226 +17417,182 @@ msgstr "" "cosc a chur ar athainmniú/braite cóipeála má sháraÃonn lÃon na spriocanna " "athainmniúcháin/cóipeála" -#: diff.c msgid "Diff algorithm options" msgstr "Roghanna algartam Diff" -#: diff.c msgid "produce the smallest possible diff" msgstr "an difrÃocht is lú is féidir a tháirgeadh" -#: diff.c msgid "ignore whitespace when comparing lines" msgstr "neamhaird a dhéanamh ar spás bán agus tú ag comparáid" -#: diff.c msgid "ignore changes in amount of whitespace" msgstr "neamhaird a dhéanamh ar athruithe i méid an spás bán" -#: diff.c msgid "ignore changes in whitespace at EOL" msgstr "neamhaird a dhéanamh ar athruithe i spás bán ag EOL" -#: diff.c msgid "ignore carrier-return at the end of line" msgstr "neamhaird a dhéanamh ar thuairisceán iompróra ag deireadh na lÃne" -#: diff.c msgid "ignore changes whose lines are all blank" msgstr "neamhaird a dhéanamh ar athruithe atá a lÃnte bán" -#: diff.c msgid "<regex>" msgstr "<regex>" -#: diff.c msgid "ignore changes whose all lines match <regex>" msgstr "neamhaird a dhéanamh ar athruithe a mheaitseann <regex>" -#: diff.c msgid "heuristic to shift diff hunk boundaries for easy reading" -msgstr "heuristic chun teorainneacha éagsúla a aistriú le haghaidh léamh éasca" +msgstr "" +"heorastach chun teorainneacha éagsúla a aistriú le haghaidh léitheoireachta " +"éasca" -#: diff.c msgid "generate diff using the \"patience diff\" algorithm" msgstr "diff a ghiniúint ag baint úsáide as an algartam “diff foighneâ€" -#: diff.c msgid "generate diff using the \"histogram diff\" algorithm" msgstr "diff a ghiniúint ag baint úsáide as an algartam “diff histogramâ€" -#: diff.c msgid "<text>" msgstr "<text>" -#: diff.c msgid "generate diff using the \"anchored diff\" algorithm" msgstr "diff a ghiniúint ag baint úsáide as an algartam “diff ancáraitheâ€" -#: diff.c msgid "<mode>" msgstr "<mode>" -#: diff.c msgid "show word diff, using <mode> to delimit changed words" msgstr "" "taispeáint diff focal, ag baint úsáide as focail <mode>athraithe a theorannú" -#: diff.c msgid "use <regex> to decide what a word is" msgstr "bain úsáid <regex>as chun cinneadh a dhéanamh cad é focal" -#: diff.c msgid "equivalent to --word-diff=color --word-diff-regex=<regex>" msgstr "coibhéiseach le --word-diff=color --word-diff-regex=<regex>" -#: diff.c msgid "moved lines of code are colored differently" msgstr "tá lÃnte cóid bogadh daite difriúil" -#: diff.c msgid "how white spaces are ignored in --color-moved" msgstr "conas a dhéantar neamhaird de spásanna bána i --color-moved" -#: diff.c msgid "Other diff options" msgstr "Roghanna diff eile" -#: diff.c msgid "when run from subdir, exclude changes outside and show relative paths" msgstr "" "nuair a bheidh á rith ó subdir, eisiamh athruithe lasmuigh agus taispeáin " "coibhneasta" -#: diff.c msgid "treat all files as text" msgstr "déileáil le gach comhad mar théacs" -#: diff.c msgid "swap two inputs, reverse the diff" msgstr "dhá ionchur a mhalartú, an diff a aisiompú" -#: diff.c msgid "exit with 1 if there were differences, 0 otherwise" msgstr "imeacht le 1 má bhà difrÃochtaà ann, 0 ar shlà eile" -#: diff.c msgid "disable all output of the program" msgstr "dÃchumasú gach aschur an chláir" -#: diff.c msgid "allow an external diff helper to be executed" msgstr "ligean do chúntóir diff seachtrach a fhorghnÃomhú" -#: diff.c msgid "run external text conversion filters when comparing binary files" msgstr "reáchtáil scagairà tiontaithe téacs seachtracha agus comhaid" -#: diff.c msgid "<when>" msgstr "<when>" -#: diff.c msgid "ignore changes to submodules in the diff generation" msgstr "neamhaird a dhéanamh ar athruithe ar fho-mhodúil sa ghiniúint diff" -#: diff.c msgid "<format>" msgstr "<format>" -#: diff.c msgid "specify how differences in submodules are shown" msgstr "sonraigh conas a thaispeántar na difrÃochtaà i bhfo-" -#: diff.c msgid "hide 'git add -N' entries from the index" msgstr "folaigh iontrálacha 'git add -N' ón innéacs" -#: diff.c msgid "treat 'git add -N' entries as real in the index" msgstr "déileáil le hiontrálacha 'git add -N' mar atá fÃor san innéacs" -#: diff.c msgid "<string>" msgstr "<string>" -#: diff.c msgid "" "look for differences that change the number of occurrences of the specified " "string" msgstr "" "cuardaigh difrÃochtaà a athraÃonn lÃon na n-imeachtaà sa sreang sonraithe" -#: diff.c msgid "" "look for differences that change the number of occurrences of the specified " "regex" msgstr "" "cuardaigh difrÃochtaà a athraÃonn lÃon na n-imeachtaà sa regex sonraithe" -#: diff.c msgid "show all changes in the changeset with -S or -G" msgstr "taispeáint na hathruithe go léir sa tacar athraithe le -S nó -G" -#: diff.c msgid "treat <string> in -S as extended POSIX regular expression" msgstr "caitheamh <string>le -S mar léiriú rialta POSIX leathnaithe" -#: diff.c msgid "control the order in which files appear in the output" msgstr "rialú an t-ord ina bhfuil comhaid le feiceáil san aschur" -#: diff.c msgid "<path>" msgstr "<path>" -#: diff.c msgid "show the change in the specified path first" msgstr "taispeáin an t-athrú ar an gcosán sonraithe ar dtús" -#: diff.c msgid "skip the output to the specified path" msgstr "scipeáil an t-aschur chuig an gcosán sonraithe" -#: diff.c msgid "<object-id>" msgstr "<object-id>" -#: diff.c msgid "" "look for differences that change the number of occurrences of the specified " "object" msgstr "cuardaigh difrÃochtaà a athraÃonn lÃon na n-earraà den réad sonraithe" -#: diff.c msgid "[(A|C|D|M|R|T|U|X|B)...[*]]" msgstr "[(A|C|D|M|R|T|U|X|B)... [*]]" -#: diff.c msgid "select files by diff type" msgstr "roghnaigh comhaid de réir cineál diff" -#: diff.c +msgid "<depth>" +msgstr "<depth>" + +msgid "maximum tree depth to recurse" +msgstr "uasmhéid doimhneacht crainn le hathfhillteach" + msgid "<file>" msgstr "<file>" -#: diff.c msgid "output to a specific file" msgstr "aschur chuig comhad ar leith" -#: diff.c msgid "exhaustive rename detection was skipped due to too many files." msgstr "" "scipeánadh braite athainmnithe uileghabhálach mar gheall ar an iomarca " "comhaid." -#: diff.c msgid "only found copies from modified paths due to too many files." msgstr "" "nà bhfuarthas ach cóipeanna ó chosáin modhnaithe mar gheall ar an iomarca " "comhaid." -#: diff.c #, c-format msgid "" "you may want to set your %s variable to at least %d and retry the command." @@ -21053,61 +17600,49 @@ msgstr "" "b'fhéidir gur mhaith leat d'athróg %s a shocrú go %d ar a laghad agus " "iarracht a dhéanamh arÃs ar an ordú." -#: diffcore-order.c #, c-format msgid "failed to read orderfile '%s'" msgstr "theip ar chomhad ordaithe '%s' a léamh" -#: diffcore-rename.c msgid "Performing inexact rename detection" msgstr "Braite athainmnithe mÃchruinn a dhéanamh" -#: diffcore-rotate.c #, c-format msgid "No such path '%s' in the diff" msgstr "NÃl aon chosán den sórt sin '%s' sa diff" -#: dir.c #, c-format msgid "pathspec '%s' did not match any file(s) known to git" msgstr "nÃor mheaitseáil pathspec '%s' aon chomhad (Ã) ar eolas ag git" -#: dir.c #, c-format msgid "unrecognized pattern: '%s'" msgstr "patrún gan aithint: '%s'" -#: dir.c #, c-format msgid "unrecognized negative pattern: '%s'" msgstr "patrún diúltach gan aithint: '%s'" -#: dir.c #, c-format msgid "your sparse-checkout file may have issues: pattern '%s' is repeated" msgstr "" "d'fhéadfadh fadhbanna a bheith ag do chomhad seiceála neamhchoitianta: " "déantar patrún '%s' arÃs eile" -#: dir.c msgid "disabling cone pattern matching" msgstr "meaitseáil patrún cón a dhÃchumas" -#: dir.c #, c-format msgid "cannot use %s as an exclude file" msgstr "nà féidir %s a úsáid mar chomhad eisiata" -#: dir.c msgid "failed to get kernel name and information" msgstr "theip ar ainm eithne agus faisnéis a fháil" -#: dir.c msgid "untracked cache is disabled on this system or location" msgstr "" "tá taisce neamhrianaithe dÃchumasaithe ar an gcóras nó ar an suÃomh seo" -#: dir.c msgid "" "No directory name could be guessed.\n" "Please specify a directory on the command line" @@ -21115,56 +17650,94 @@ msgstr "" "Nà fhéadfaà aon ainm eolaire a thuairim.\n" "Sonraigh eolaire ar an lÃne ordaithe le do thoil" -#: dir.c #, c-format msgid "index file corrupt in repo %s" msgstr "comhad innéacs truaillithe i repo %s" -#: dir.c #, c-format msgid "could not create directories for %s" msgstr "nà fhéadfaà eolairà a chruthú do %s" -#: dir.c #, c-format msgid "could not migrate git directory from '%s' to '%s'" msgstr "nà fhéadfaà eolaire git a aistriú ó '%s' go '%s'" -#: editor.c #, c-format msgid "hint: Waiting for your editor to close the file...%c" msgstr "leid: Ag fanacht go ndúnfaidh d'eagarthóir an comhad... %c" -#: editor.c sequencer.c wrapper.c #, c-format msgid "could not write to '%s'" msgstr "nà fhéadfaà scrÃobh chuig '%s'" -#: editor.c #, c-format msgid "could not edit '%s'" msgstr "nà fhéadfaà '%s' a chur in eagar" -#: entry.c msgid "Filtering content" msgstr "Ãbhar scagadh" -#: entry.c #, c-format msgid "could not stat file '%s'" msgstr "nà fhéadfaà an comhad '%s' a statú" -#: environment.c #, c-format msgid "bad git namespace path \"%s\"" msgstr "cosán spás ainmneacha git go dona “%sâ€" -#: exec-cmd.c +#, c-format +msgid "invalid value for variable %s" +msgstr "luach neamhbhailà don athróg %s" + +#, c-format +msgid "ignoring unknown core.fsync component '%s'" +msgstr "neamhaird a dhéanamh ar chomhpháirt core.fsync anaithnid '%s'" + +#, c-format +msgid "abbrev length out of range: %d" +msgstr "fad a ghiorrú lasmuigh den raon: %d" + +#, c-format +msgid "bad zlib compression level %d" +msgstr "droch-leibhéal comhbhrúite zlib %d" + +#, c-format +msgid "%s cannot contain newline" +msgstr "Nà féidir le lÃne nua a bheith ag %s" + +#, c-format +msgid "%s must have at least one character" +msgstr "Nà mór carachtar amháin ar a laghad a bheith ag %s" + +#, c-format +msgid "ignoring unknown core.fsyncMethod value '%s'" +msgstr "neamhaird a dhéanamh ar luach core.fsyncMethod anaithnid '%s'" + +msgid "core.fsyncObjectFiles is deprecated; use core.fsync instead" +msgstr "" +"tá core.fsyncObjectFiles dÃscothaithe; bain úsáid as core.fsync ina ionad" + +#, c-format +msgid "invalid mode for object creation: %s" +msgstr "modh neamhbhailà chun réad a chruthú: %s" + +#, c-format +msgid "malformed value for %s" +msgstr "luach mÃfhoirmithe do %s" + +#, c-format +msgid "malformed value for %s: %s" +msgstr "luach mÃfhoirmithe do %s: %s" + +msgid "must be one of nothing, matching, simple, upstream or current" +msgstr "" +"caithfidh sé a bheith ar cheann de rud ar bith, meaitseálach, simplÃ, suas " +"srutha nó reatha" + #, c-format msgid "too many args to run %s" msgstr "an iomarca args chun %s a rith" -#: fetch-pack.c #, c-format msgid "" "You are attempting to fetch %s, which is in the commit graph file but not in " @@ -21180,193 +17753,147 @@ msgstr "" "easnamh a athghabháil, bain úsáid as 'git fetch --refetch' leis an réad atá " "ar iarraidh." -#: fetch-pack.c msgid "git fetch-pack: expected shallow list" msgstr "git fetch-pack: liosta éadomhain a bhfuiltear ag súil leis" -#: fetch-pack.c msgid "git fetch-pack: expected a flush packet after shallow list" msgstr "" "git fetch-pack: bhÃothas ag súil le paicéad sruthán tar éis liosta éadrom" -#: fetch-pack.c msgid "git fetch-pack: expected ACK/NAK, got a flush packet" msgstr "git fetch-pack: ag súil le ACK/NAK, fuair sé paicéad sruthán" -#: fetch-pack.c #, c-format msgid "git fetch-pack: expected ACK/NAK, got '%s'" msgstr "git fetch-pack: ag súil le ACK/NAK, fuair '%s'" -#: fetch-pack.c msgid "unable to write to remote" -msgstr "in ann scrÃobh chuig iargúlta" +msgstr "nà féidir scrÃobh chuig an gcianrialtán" -#: fetch-pack.c msgid "Server supports filter" msgstr "TacaÃonn freastalaà le sc" -#: fetch-pack.c #, c-format msgid "invalid shallow line: %s" msgstr "lÃne éadomhain neamhbhailÃ: %s" -#: fetch-pack.c #, c-format msgid "invalid unshallow line: %s" msgstr "lÃne neamhéadrom neamhbhailÃ: %s" -#: fetch-pack.c -#, c-format -msgid "object not found: %s" -msgstr "nÃor aimsÃodh réad: %s" - -#: fetch-pack.c #, c-format msgid "error in object: %s" msgstr "earráid i réad: %s" -#: fetch-pack.c #, c-format msgid "no shallow found: %s" msgstr "nÃl aon éadrom aimsithe: %s" -#: fetch-pack.c #, c-format msgid "expected shallow/unshallow, got %s" msgstr "bhÃothas ag súil leis Ãol/neamhéadrom, fuair %s" -#: fetch-pack.c #, c-format msgid "got %s %d %s" msgstr "fuair %s %d %s" -#: fetch-pack.c #, c-format msgid "invalid commit %s" msgstr "tiomantas neamhbhailà %s" -#: fetch-pack.c msgid "giving up" msgstr "tabhairt suas" -#: fetch-pack.c progress.h msgid "done" msgstr "déanta" -#: fetch-pack.c #, c-format msgid "got %s (%d) %s" msgstr "fuair %s (%d) %s" -#: fetch-pack.c #, c-format msgid "Marking %s as complete" msgstr "Mharcáil %s mar iomlán" -#: fetch-pack.c #, c-format msgid "already have %s (%s)" msgstr "tá %s ann cheana féin (%s)" -#: fetch-pack.c msgid "fetch-pack: unable to fork off sideband demultiplexer" msgstr "pacáiste tarchuir: nà féidir le démultiplexer banna taobh a fhorc" -#: fetch-pack.c msgid "protocol error: bad pack header" msgstr "earráid prótacal: ceanntásc an phacá" -#: fetch-pack.c #, c-format msgid "fetch-pack: unable to fork off %s" msgstr "fetch-pack: nà féidir %s a fhorc" -#: fetch-pack.c msgid "fetch-pack: invalid index-pack output" msgstr "fetch-pack: aschur pacáiste innéacs-neamhbhailÃ" -#: fetch-pack.c #, c-format msgid "%s failed" msgstr "Theip ar %s" -#: fetch-pack.c msgid "error in sideband demultiplexer" msgstr "earráid i demultiplexer taobhbanna" -#: fetch-pack.c #, c-format msgid "Server version is %.*s" msgstr "Is é leagan freastalaà %.*s" -#: fetch-pack.c #, c-format msgid "Server supports %s" msgstr "TacaÃonn freastalaà le %s" -#: fetch-pack.c msgid "Server does not support shallow clients" msgstr "Nà thacaÃonn freastalaà le cliaint éadrom" -#: fetch-pack.c msgid "Server does not support --shallow-since" msgstr "Nà thacaÃonn freastalaà le --shallow-since" -#: fetch-pack.c msgid "Server does not support --shallow-exclude" msgstr "Nà thacaÃonn freastalaà le --shallow-exclude" -#: fetch-pack.c msgid "Server does not support --deepen" msgstr "Nà thacaÃonn freastalaà le --deepen" -#: fetch-pack.c msgid "Server does not support this repository's object format" msgstr "Nà thacaÃonn freastalaà le formáid réad an stór seo" -#: fetch-pack.c msgid "no common commits" msgstr "gan aon gealltanais choiteann" -#: fetch-pack.c msgid "git fetch-pack: fetch failed." msgstr "git fetch-pack: theip ar fáil." -#: fetch-pack.c #, c-format msgid "mismatched algorithms: client %s; server %s" msgstr "halgartaim mÃchomhoiriúnach: cliant %s; freastalaà %s" -#: fetch-pack.c #, c-format msgid "the server does not support algorithm '%s'" msgstr "nà thacaÃonn an freastalaà algartam '%s'" -#: fetch-pack.c msgid "Server does not support shallow requests" msgstr "Nà thacaÃonn an freastalaà le hiarratais" -#: fetch-pack.c msgid "unable to write request to remote" -msgstr "in ann iarratas a scrÃobh chuig iargúlta" +msgstr "nà féidir iarratas a scrÃobh chuig an iargúlta" -#: fetch-pack.c #, c-format msgid "expected '%s', received '%s'" msgstr "bhÃothas ag súil le '%s', fuarthas '%s'" -#: fetch-pack.c #, c-format msgid "expected '%s'" msgstr "ag súil le '%s'" -#: fetch-pack.c #, c-format msgid "unexpected acknowledgment line: '%s'" msgstr "lÃne admhaithe gan choinne: '%s'" -#: fetch-pack.c #, c-format msgid "error processing acks: %d" msgstr "earráidà próiseála earráide: %d" @@ -21374,7 +17901,6 @@ msgstr "earráidà próiseála earráide: %d" #. TRANSLATORS: The parameter will be 'ready', a protocol #. keyword. #. -#: fetch-pack.c #, c-format msgid "expected packfile to be sent after '%s'" msgstr "táthar ag súil go seolfar pacáid tar éis '%s'" @@ -21382,94 +17908,75 @@ msgstr "táthar ag súil go seolfar pacáid tar éis '%s'" #. TRANSLATORS: The parameter will be 'ready', a protocol #. keyword. #. -#: fetch-pack.c #, c-format msgid "expected no other sections to be sent after no '%s'" msgstr "" "bhÃothas ag súil nach gcuirfear aon chuid eile a sheoladh tar éis gan '%s'" -#: fetch-pack.c #, c-format msgid "error processing shallow info: %d" msgstr "earráid ag próiseáil faisnéis éadrom: %d" -#: fetch-pack.c #, c-format msgid "expected wanted-ref, got '%s'" msgstr "bhÃothas ag súil leis an tagairt a theastaigh, fuair '%s'" -#: fetch-pack.c #, c-format msgid "unexpected wanted-ref: '%s'" msgstr "gan choinne wanted-ref: '%s'" -#: fetch-pack.c #, c-format msgid "error processing wanted refs: %d" msgstr "próiseáil earráidà a theastaÃonn referens: %d" -#: fetch-pack.c msgid "git fetch-pack: expected response end packet" msgstr "git fetch-pack: paicéad deiridh freagartha ag súil leis" -#: fetch-pack.c msgid "no matching remote head" msgstr "gan ceann iargúlta meaitseála" -#: fetch-pack.c msgid "unexpected 'ready' from remote" msgstr "gan choinne 'réidh' ó iargúlta" -#: fetch-pack.c #, c-format msgid "no such remote ref %s" msgstr "aon tagairt iargúlta den sórt sin %s" -#: fetch-pack.c #, c-format msgid "Server does not allow request for unadvertised object %s" msgstr "Nà cheadaÃonn freastalaà iarraidh ar réad neamhfhógraithe %s" -#: fsmonitor-ipc.c #, c-format msgid "fsmonitor_ipc__send_query: invalid path '%s'" msgstr "fsmonitor_ipc__send_query: cosán neamhbhailà '%s'" -#: fsmonitor-ipc.c #, c-format msgid "fsmonitor_ipc__send_query: unspecified error on '%s'" msgstr "fsmonitor_ipc__send_query: earráid neamhshonraithe ar '%s'" -#: fsmonitor-ipc.c msgid "fsmonitor--daemon is not running" msgstr "nÃl fsmonitor--daemon ag rith" -#: fsmonitor-ipc.c #, c-format msgid "could not send '%s' command to fsmonitor--daemon" msgstr "nà fhéadfaà ordú '%s' a sheoladh chuig fsmonitor--daemon" -#: fsmonitor-settings.c #, c-format msgid "bare repository '%s' is incompatible with fsmonitor" msgstr "nÃl stór lom '%s' neamhoiriúnach le fsmonitor" -#: fsmonitor-settings.c #, c-format msgid "repository '%s' is incompatible with fsmonitor due to errors" msgstr "tá stór '%s' neamh-chomhoiriúnach le fsmonitor de bharr earráidÃ" -#: fsmonitor-settings.c #, c-format msgid "remote repository '%s' is incompatible with fsmonitor" msgstr "nÃl stór iargúlta '%s' neamhoiriúnach le fsmonitor" -#: fsmonitor-settings.c #, c-format msgid "virtual repository '%s' is incompatible with fsmonitor" msgstr "nÃl stór fÃorúil '%s' neamhoiriúnach le fsmonitor" -#: fsmonitor-settings.c #, c-format msgid "" "socket directory '%s' is incompatible with fsmonitor due to lack of Unix " @@ -21478,7 +17985,6 @@ msgstr "" "tá eolaire soicéad '%s' neamhoiriúnach le fsmonitor mar gheall ar easpa " "tacaÃochta soicéid Unix" -#: git.c msgid "" "git [-v | --version] [-h | --help] [-C <path>] [-c <name>=<value>]\n" " [--exec-path[=<path>]] [--html-path] [--man-path] [--info-path]\n" @@ -21498,7 +18004,6 @@ msgstr "" "env=<name>=<envvar>]\n" " <command> [<args>]" -#: git.c msgid "" "'git help -a' and 'git help -g' list available subcommands and some\n" "concept guides. See 'git help <command>' or 'git help <concept>'\n" @@ -21511,47 +18016,38 @@ msgstr "" "léamh faoi fho-ordú nó coincheap ar leith.\n" "Féach 'git help git' le haghaidh forbhreathnú ar an gcóras." -#: git.c help.c #, c-format msgid "unsupported command listing type '%s'" msgstr "cineál liostaithe ordaithe gan tacaÃocht '%s'" -#: git.c #, c-format msgid "no directory given for '%s' option\n" msgstr "nÃl aon eolaire tugtha do rogha '%s'\n" -#: git.c #, c-format msgid "no namespace given for --namespace\n" msgstr "aon spás ainmneacha a thugtar do --namespace\n" -#: git.c #, c-format msgid "-c expects a configuration string\n" msgstr "-c ag súil le teaghrán cumraÃochta\n" -#: git.c #, c-format msgid "no config key given for --config-env\n" msgstr "nÃl aon eochair chumraithe tugtha do --config-env\n" -#: git.c #, c-format msgid "no attribute source given for --attr-source\n" msgstr "nÃor tugadh foinse tréith do --attr-source\n" -#: git.c #, c-format msgid "unknown option: %s\n" msgstr "rogha anaithnid: %s\n" -#: git.c #, c-format msgid "while expanding alias '%s': '%s'" msgstr "agus ainm '%s' á leathnú: '%s'" -#: git.c #, c-format msgid "" "alias '%s' changes environment variables.\n" @@ -21560,39 +18056,31 @@ msgstr "" "athraÃonn alias '%s' athróga comhshaoil.\n" "Is féidir leat úsáid a bhaint as '!git' san alias chun é seo a dhéanamh" -#: git.c #, c-format msgid "empty alias for %s" msgstr "alias folamh do %s" -#: git.c #, c-format msgid "recursive alias: %s" msgstr "ainm athfhillteach: %s" -#: git.c +#, c-format +msgid "alias loop detected: expansion of '%s' does not terminate:%s" +msgstr "aimsÃodh lúb alias: nà chuirtear deireadh le leathnú '%s': %s" + msgid "write failure on standard output" msgstr "teip scrÃobh ar aschur caighdeánach" -#: git.c msgid "unknown write failure on standard output" msgstr "teip scrÃbhneoireachta anaithnid ar aschur" -#: git.c msgid "close failed on standard output" msgstr "theip ar dhún ar aschur caighdeánach" -#: git.c -#, c-format -msgid "alias loop detected: expansion of '%s' does not terminate:%s" -msgstr "aimsÃodh lúb alias: nà chuirtear deireadh le leathnú '%s': %s" - -#: git.c #, c-format msgid "cannot handle %s as a builtin" msgstr "nà féidir %s a láimhseáil mar thógáil" -#: git.c #, c-format msgid "" "usage: %s\n" @@ -21601,26 +18089,21 @@ msgstr "" "úsáid: %s\n" "\n" -#: git.c #, c-format msgid "expansion of alias '%s' failed; '%s' is not a git command\n" msgstr "theip ar leathnú an leasainm '%s'; nà ordú git é '%s'\n" -#: git.c #, c-format msgid "failed to run command '%s': %s\n" msgstr "theip ort an t-ordú '%s' a reáchtáil: %s\n" -#: gpg-interface.c msgid "could not create temporary file" msgstr "nà fhéadfaà comhad sealadach a chruthú" -#: gpg-interface.c #, c-format msgid "failed writing detached signature to '%s'" msgstr "theip ar shÃniú scoite a scrÃobh chuig '%s'" -#: gpg-interface.c msgid "" "gpg.ssh.allowedSignersFile needs to be configured and exist for ssh " "signature verification" @@ -21628,7 +18111,6 @@ msgstr "" "nà mór gpg.ssh.allowedSignersFile a chumrú agus a bheith ann le haghaidh " "fÃorú sÃnithe ssh" -#: gpg-interface.c msgid "" "ssh-keygen -Y find-principals/verify is needed for ssh signature " "verification (available in openssh version 8.2p1+)" @@ -21636,39 +18118,40 @@ msgstr "" "tá gá le ssh-keygen -Y aimsithe/fÃorú le haghaidh fÃorú sÃnithe ssh (ar fáil " "i leagan openssh 8.2p1 +)" -#: gpg-interface.c #, c-format msgid "ssh signing revocation file configured but not found: %s" msgstr "comhad cúlghairm sÃnithe ssh cumraithe ach nÃor aimsÃodh: %s" -#: gpg-interface.c #, c-format msgid "bad/incompatible signature '%s'" msgstr "sÃniú droch-/neamhchomhoiriúnach '%s'" -#: gpg-interface.c #, c-format msgid "failed to get the ssh fingerprint for key '%s'" msgstr "theip ar mhéarloirg ssh a fháil don eochair '%s'" -#: gpg-interface.c +#, c-format +msgid "failed to get the ssh fingerprint for key %s" +msgstr "theip ar an méarloirg ssh a fháil don eochair %s" + msgid "" "either user.signingkey or gpg.ssh.defaultKeyCommand needs to be configured" msgstr "is gá user.signingkey nó gpg.ssh.defaultKeyCommand a chumrú" -#: gpg-interface.c +#, c-format +msgid "malformed build-time gpg.ssh.defaultKeyCommand: %s" +msgstr "am tógála mÃfhoirmithe gpg.ssh.defaultKeyCommand: %s" + #, c-format msgid "gpg.ssh.defaultKeyCommand succeeded but returned no keys: %s %s" msgstr "" "d’éirigh le gpg.ssh.defaultKeyCommand ach nÃor tugadh aon eochracha ar ais: " "%s %s" -#: gpg-interface.c #, c-format msgid "gpg.ssh.defaultKeyCommand failed: %s %s" msgstr "theip ar gpg.ssh.defaultKeyCommand: %s %s" -#: gpg-interface.c #, c-format msgid "" "gpg failed to sign the data:\n" @@ -21677,21 +18160,17 @@ msgstr "" "theip ar gpg na sonraà a shÃniú:\n" "%s" -#: gpg-interface.c msgid "user.signingKey needs to be set for ssh signing" msgstr "nà mór user.signingKey a shocrú le haghaidh sÃniú ssh" -#: gpg-interface.c #, c-format msgid "failed writing ssh signing key to '%s'" msgstr "theip ar an eochair sÃnithe ssh a scrÃobh chuig '%s'" -#: gpg-interface.c #, c-format msgid "failed writing ssh signing key buffer to '%s'" msgstr "theip ar scrÃobh ssh a shÃniú maolán eochair chuig '%s'" -#: gpg-interface.c msgid "" "ssh-keygen -Y sign is needed for ssh signing (available in openssh version " "8.2p1+)" @@ -21699,17 +18178,14 @@ msgstr "" "ssh-keygen -Y comhartha ag teastáil le haghaidh sÃniú ssh (ar fáil i leagan " "openssh 8.2p1+)" -#: gpg-interface.c #, c-format msgid "failed reading ssh signing data buffer from '%s'" msgstr "theip ar mhaolán sonraà sÃnithe ssh a léamh ó '%s'" -#: graph.c #, c-format msgid "ignored invalid color '%.*s' in log.graphColors" msgstr "neamhaird ar dhath neamhbhailà '%.*s' i log.graphColors" -#: grep.c msgid "" "given pattern contains NULL byte (via -f <file>). This is only supported " "with -P under PCRE v2" @@ -21717,117 +18193,90 @@ msgstr "" "tá byte NULL (trà -f<file>) i bpatrún tugtha. Nà thacaÃtear leis seo ach le " "-P faoi PCRE v2" -#: grep.c #, c-format msgid "'%s': unable to read %s" msgstr "'%s': nà féidir %s a léamh" -#: grep.c #, c-format msgid "'%s': short read" msgstr "'%s': léamh gearr" -#: help.c msgid "start a working area (see also: git help tutorial)" msgstr "tús a chur le limistéar oibre (féach freisin: teagaisc cabhrach git)" -#: help.c msgid "work on the current change (see also: git help everyday)" msgstr "obair ar an athrú reatha (féach freisin: git help gach lá)" -#: help.c msgid "examine the history and state (see also: git help revisions)" msgstr "" "scrúdú a dhéanamh ar an stair agus an stát (féach freisin: athbhreithnithe " "cabhrach git)" -#: help.c msgid "grow, mark and tweak your common history" msgstr "do stair choiteann a fhás, a mharcáil agus a athrú" -#: help.c msgid "collaborate (see also: git help workflows)" msgstr "comhoibriú (féach freisin: sreafaà oibre cabhrach git)" -#: help.c msgid "Main Porcelain Commands" msgstr "PrÃomh-Orduithe Poirce" -#: help.c msgid "Ancillary Commands / Manipulators" msgstr "Orduithe Coimhdeachta/IonramhálaÃ" -#: help.c msgid "Ancillary Commands / Interrogators" msgstr "Orduithe Coimhdeacha/CeisteoirÃ" -#: help.c msgid "Interacting with Others" msgstr "IdirghnÃomhú le daoine eile" -#: help.c msgid "Low-level Commands / Manipulators" msgstr "Orduithe Ãsealleibhéil/Ionramhálaithe" -#: help.c msgid "Low-level Commands / Interrogators" msgstr "Orduithe Ãsealleibhéil/ceisteoirÃ" -#: help.c msgid "Low-level Commands / Syncing Repositories" msgstr "Orduithe Leibhéal Ãseal/Stóráin Sioncrónaithe" -#: help.c msgid "Low-level Commands / Internal Helpers" msgstr "Orduithe Leibhéal Ãseal/Cúntóirà Inmheánacha" -#: help.c msgid "User-facing repository, command and file interfaces" msgstr "Comhéadain stór, ordaithe agus comhad atá os comhair úsáideora" -#: help.c msgid "Developer-facing file formats, protocols and other interfaces" msgstr "" "Formáidà comhaid, prótacail agus comhéadain eile atá os comhair an fhorbróra" -#: help.c #, c-format msgid "available git commands in '%s'" msgstr "orduithe git atá ar fáil i '%s'" -#: help.c msgid "git commands available from elsewhere on your $PATH" -msgstr "orduithe git ar fáil ó áiteanna eile ar do $PATH" +msgstr "git orduithe atá ar fáil ó áit eile ar do $PATH" -#: help.c msgid "These are common Git commands used in various situations:" msgstr "Seo orduithe coitianta Git a úsáidtear i gcásanna éagsúla:" -#: help.c msgid "The Git concept guides are:" msgstr "Is iad na treoracha coincheap Git:" -#: help.c msgid "User-facing repository, command and file interfaces:" msgstr "Stóráil, ordaithe agus comhéadain comhad atá os comhair úsáideora:" -#: help.c msgid "File formats, protocols and other developer interfaces:" msgstr "Formáidà comhaid, prótacail agus comhéadain forbróra eile:" -#: help.c msgid "External commands" msgstr "Orduithe seachtracha" -#: help.c msgid "Command aliases" msgstr "Ainmneacha ordaithe" -#: help.c msgid "See 'git help <command>' to read about a specific subcommand" msgstr "Féach 'git help <command>'chun léamh faoi fho-ordú ar leith" -#: help.c #, c-format msgid "" "'%s' appears to be a git command, but we were not\n" @@ -21836,39 +18285,32 @@ msgstr "" "Is cosúil gur ordú git é '%s', ach nà raibh muid\n" "in ann é a fhorghnÃomhú. B'fhéidir go bhfuil git-%s briste?" -#: help.c #, c-format msgid "git: '%s' is not a git command. See 'git --help'." msgstr "git: Nà ordú git é '%s'. Féach 'git --help'." -#: help.c msgid "Uh oh. Your system reports no Git commands at all." msgstr "" "Ó, a Dhia. Nà thuairiscÃonn do chóras aon orduithe Git ar chor ar bith." -#: help.c #, c-format msgid "WARNING: You called a Git command named '%s', which does not exist." msgstr "RABHADH: Ghlaoigh tú ordú Git darb ainm '%s', nach bhfuil ann." -#: help.c #, c-format msgid "Continuing under the assumption that you meant '%s'." msgstr "Ag leanúint faoin toimhde gur chiallaigh tú '%s'." -#: help.c #, c-format msgid "Run '%s' instead [y/N]? " msgstr "Rith '%s' ina ionad sin [y/N]? " -#: help.c #, c-format msgid "Continuing in %0.1f seconds, assuming that you meant '%s'." msgstr "" "Ag leanúint ar aghaidh i %0.1f soicind, ag glacadh leis gur chiallaigh tú " "'%s'." -#: help.c msgid "" "\n" "The most similar command is" @@ -21885,16 +18327,13 @@ msgstr[2] "" "\n" "Is iad na horduithe is cosúla ná" -#: help.c msgid "git version [--build-options]" -msgstr "leagan git [--build-options]" +msgstr "git version [--build-options]" -#: help.c #, c-format msgid "%s: %s - %s" msgstr "%s: %s - %s" -#: help.c msgid "" "\n" "Did you mean this?" @@ -21911,7 +18350,6 @@ msgstr[2] "" "\n" "An raibh ceann acu seo i gceist agat?" -#: hook.c #, c-format msgid "" "The '%s' hook was ignored because it's not set as executable.\n" @@ -21922,78 +18360,68 @@ msgstr "" "Is féidir leat an rabhadh seo a dhÃchumasú le `git config set " "advice.ignoredHook false `." -#: http-fetch.c msgid "not a git repository" -msgstr "nà stór git" +msgstr "nà stór git é" -#: http-fetch.c #, c-format msgid "argument to --packfile must be a valid hash (got '%s')" msgstr "" "caithfidh argóint chuig --packfile a bheith ina hash bailà (fuair '%s')" -#: http.c #, c-format msgid "negative value for http.postBuffer; defaulting to %d" msgstr "luach diúltach do http.postBuffer; réamhshocraithe go %d" -#: http.c msgid "Delegation control is not supported with cURL < 7.22.0" msgstr "Nà thacaÃtear le cURL <7.22.0 le rialú tarscaireachta" -#: http.c msgid "Unknown value for http.proactiveauth" msgstr "Luach anaithnid do http.proactiveauth" -#: http.c parse.c #, c-format msgid "failed to parse %s" msgstr "theip ar %s a pharsáil" -#: http.c #, c-format msgid "Unsupported SSL backend '%s'. Supported SSL backends:" msgstr "'%s' cúltaca SSL gan tacaÃocht. Cúltaca SSL tacaithe:" -#: http.c #, c-format msgid "Could not set SSL backend to '%s': cURL was built without SSL backends" msgstr "NÃor féidir cúltaca SSL a shocrú go '%s': Tógadh cURL gan cúltaca SSL" -#: http.c #, c-format msgid "Could not set SSL backend to '%s': already set" msgstr "NÃorbh fhéidir cúltaca SSL a shocrú go '%s': socraithe cheana féin" -#: http.c msgid "refusing to read cookies from http.cookiefile '-'" msgstr "diúltú fianáin a léamh ó http.cookiefile '-'" -#: http.c msgid "ignoring http.savecookies for empty http.cookiefile" msgstr "" "neamhaird a dhéanamh ar http.savecookies le haghaidh http.cookiefile folamh" -#: http.c #, c-format msgid "" "unable to update url base from redirection:\n" " asked for: %s\n" " redirect: %s" msgstr "" -"in ann bonn url a nuashonrú ó atreorú:\n" -" iarrtha ar: %s\n" -" atreorú: %s" +"nà féidir bunachar url a nuashonrú ón atreorú:\n" +" iarrtha: %s\n" +" atreorú: %s" + +#, c-format +msgid "" +"number too large to represent as curl_off_t on this platform: %<PRIuMAX>" +msgstr "uimhir ró-mhór le léiriú mar curl_off_t ar an ardán seo: %<PRIuMAX>" -#: ident.c msgid "Author identity unknown\n" msgstr "Céannacht an údair anaithnid\n" -#: ident.c msgid "Committer identity unknown\n" msgstr "Céannacht an chomórtais anaithnid\n" -#: ident.c msgid "" "\n" "*** Please tell me who you are.\n" @@ -22018,103 +18446,107 @@ msgstr "" "chun féiniúlacht réamhshocraithe do chuntais a shocrú.\n" "Fág --global chun an aitheantas a shocrú sa stór seo amháin.\n" -#: ident.c msgid "no email was given and auto-detection is disabled" msgstr "nÃor tugadh aon rÃomhphost agus tá brath uathoibrÃoch faoi" -#: ident.c #, c-format msgid "unable to auto-detect email address (got '%s')" -msgstr "in ann seoladh rÃomhphoist a bhrath go huathoibrÃoch (fuair '%s')" +msgstr "" +"nà féidir seoladh rÃomhphoist a bhrath go huathoibrÃoch (fuarthas '%s')" -#: ident.c msgid "no name was given and auto-detection is disabled" msgstr "nà tugadh aon ainm agus tá brath uathoibrÃoch faoi dhÃchum" -#: ident.c #, c-format msgid "unable to auto-detect name (got '%s')" msgstr "nà féidir ainm a bhrath go huathoibrÃoch (fuair '%s')" -#: ident.c #, c-format msgid "empty ident name (for <%s>) not allowed" msgstr "ainm ident folamh (le haghaidh <%s>) nach gceadaÃtear" -#: ident.c #, c-format msgid "name consists only of disallowed characters: %s" msgstr "nà chuimsÃonn ainm ach carachtair neamh-cheadaithe: %s" -#: list-objects-filter-options.c +msgid "git imap-send [-v] [-q] [--[no-]curl] [(--folder|-f) <folder>] < <mbox>" +msgstr "" +"git imap-send [-v] [-q] [--[no-]curl] [(--folder|-f) <folder>] < <mbox>" + +msgid "no IMAP host specified" +msgstr "nÃor sonraÃodh aon óstach IMAP" + +msgid "" +"set the IMAP host with 'git config imap.host <host>'.\n" +"(e.g., 'git config imap.host imaps://imap.example.com')" +msgstr "" +"socraigh an t-óstach IMAP le 'git config imap.host <host>'. \n" +"(e.g., 'git config imap.host imaps://imap.example.com')" + +msgid "no IMAP folder specified" +msgstr "nÃor sonraÃodh fillteán IMAP" + +msgid "" +"set the target folder with 'git config imap.folder <folder>'.\n" +"(e.g., 'git config imap.folder Drafts')" +msgstr "" +"socraigh an fillteán sprice le 'git config imap.folder <folder>'. \n" +"(e.g., 'git config imap.folder DréachtaÃ')" + msgid "expected 'tree:<depth>'" msgstr "<depth>'crann ag súil leis: '" -#: list-objects-filter-options.c msgid "sparse:path filters support has been dropped" msgstr "neamhchoitianta: tá tacaÃocht scagairà cosáin titim" -#: list-objects-filter-options.c #, c-format msgid "'%s' for 'object:type=<type>' is not a valid object type" msgstr "<type>Nà cineál réad bailà é '%s' le haghaidh 'object:type='" -#: list-objects-filter-options.c #, c-format msgid "invalid filter-spec '%s'" msgstr "scagaire neamhbhailà '%s'" -#: list-objects-filter-options.c #, c-format msgid "must escape char in sub-filter-spec: '%c'" msgstr "nà mór don char a éalú i sub-filter-spec: '%c'" -#: list-objects-filter-options.c msgid "expected something after combine:" msgstr "ag súil le rud éigin tar éis an chomhcheangail:" -#: list-objects-filter-options.c msgid "multiple filter-specs cannot be combined" msgstr "nà féidir ilshonraÃochtaà scagaire a chomhcheangal" -#: list-objects-filter-options.c msgid "unable to upgrade repository format to support partial clone" -msgstr "in ann formáid stórais a uasghrádú chun tacú le clón páirteach" +msgstr "" +"nà féidir formáid an stórais a uasghrádú chun tacú le clónáil pháirteach" -#: list-objects-filter-options.h msgid "args" msgstr "args" -#: list-objects-filter-options.h msgid "object filtering" msgstr "scagadh réad" -#: list-objects-filter.c #, c-format msgid "unable to access sparse blob in '%s'" -msgstr "nà féidir rochtain a fháil ar bhlob neamhchoitianta i '%s'" +msgstr "nà féidir rochtain a fháil ar an blob tana i '%s'" -#: list-objects-filter.c #, c-format msgid "unable to parse sparse filter data in %s" -msgstr "nach féidir sonraà scagaire neamhchoitianta a pháirseáil i %s" +msgstr "nà féidir sonraà scagaire tanaà a pharsáil i %s" -#: list-objects.c #, c-format msgid "entry '%s' in tree %s has tree mode, but is not a tree" msgstr "tá modh crann ag iontráil '%s' i gcrann %s, ach nà crann Ã" -#: list-objects.c #, c-format msgid "entry '%s' in tree %s has blob mode, but is not a blob" msgstr "tá modh blob ag iontráil '%s' i gcrann %s, ach nà blob Ã" -#: list-objects.c #, c-format msgid "unable to load root tree for commit %s" -msgstr "nach féidir crann fréimhe a luchtú le haghaidh tiomanta %s" +msgstr "nà féidir crann fréimhe a luchtú le haghaidh an tiomnaidh %s" -#: lockfile.c #, c-format msgid "" "Unable to create '%s.lock': %s.\n" @@ -22134,96 +18566,77 @@ msgstr "" "d'fhéadfadh go mbeadh sé titim sa stór seo nÃos luaithe:\n" "bain an comhad de láimh chun leanúint ar aghaidh." -#: lockfile.c #, c-format msgid "Unable to create '%s.lock': %s" msgstr "Nà féidir '%s.lock' a chruthú: %s" -#: log-tree.c msgid "unable to create temporary object directory" -msgstr "in ann eolaire réad sealadach a chruthú" +msgstr "nà féidir eolaire réada sealadach a chruthú" -#: loose.c #, c-format msgid "could not write loose object index %s" msgstr "nà fhéadfaà innéacs réad scaoilte %s a scrÃ" -#: loose.c #, c-format msgid "failed to write loose object index %s" msgstr "theip ar innéacs réad scaoilte %s a scrÃobh" -#: ls-refs.c #, c-format msgid "unexpected line: '%s'" msgstr "lÃne gan choinne: '%s'" -#: ls-refs.c msgid "expected flush after ls-refs arguments" msgstr "súil le sruth tar éis argóintà ls-refs" -#: mailinfo.c msgid "quoted CRLF detected" msgstr "braithÃodh CRLF a luaitear" -#: mem-pool.c strbuf.c wrapper.c #, c-format msgid "unable to format message: %s" -msgstr "nach féidir teachtaireacht a fhormáidiú: %s" +msgstr "nà féidir teachtaireacht a fhormáidiú: %s" -#: merge-ll.c #, c-format msgid "invalid marker-size '%s', expecting an integer" msgstr "méid marcóra neamhbhailà '%s', ag súil le sláimhir" -#: merge-ort-wrappers.c #, c-format msgid "Could not parse object '%s'" msgstr "Nà fhéadfaà réad '%s' a pháirseáil" -#: merge-ort.c #, c-format msgid "Failed to merge submodule %s (not checked out)" msgstr "Theip ar fho-mhodúl %s a chumasc (nÃor seiceáiltear amach)" -#: merge-ort.c #, c-format msgid "Failed to merge submodule %s (no merge base)" msgstr "Theip ar fho-mhodúl %s a chumasc (gan aon bhonn cumaisc)" -#: merge-ort.c #, c-format msgid "Failed to merge submodule %s (commits not present)" msgstr "Theip ar fho-mhodúl %s a chumasc (nÃl gealltanas ann)" -#: merge-ort.c #, c-format msgid "error: failed to merge submodule %s (repository corrupt)" msgstr "earráid: theip ar fho-mhodúl %s a chumasc (stór truaillithe)" -#: merge-ort.c #, c-format msgid "Failed to merge submodule %s (commits don't follow merge-base)" msgstr "Theip ar fho-mhodúl %s a chumasc (nà leanann gealltanna cumaisc bonn)" -#: merge-ort.c #, c-format msgid "Note: Fast-forwarding submodule %s to %s" msgstr "Nóta: Fo-mhodúl %s a chur ar aghaidh go tapa chuig %s" -#: merge-ort.c #, c-format msgid "Failed to merge submodule %s" msgstr "Theip ar fho-mhodúl %s a chumasc" -#: merge-ort.c #, c-format msgid "" "Failed to merge submodule %s, but a possible merge resolution exists: %s" msgstr "" "Theip ar fho-mhodúl %s a chumasc, ach tá réiteach cumaisc féideartha ann: %s" -#: merge-ort.c #, c-format msgid "" "Failed to merge submodule %s, but multiple possible merges exist:\n" @@ -22232,22 +18645,18 @@ msgstr "" "Theip ar fho-mhodúl %s a chumasc, ach tá go leor cumaisc féideartha ann:\n" "%s" -#: merge-ort.c #, c-format msgid "error: failed to execute internal merge for %s" msgstr "earráid: theip ar chumasc inmheánach a chur i gcrÃch le haghaidh %s" -#: merge-ort.c #, c-format msgid "error: unable to add %s to database" msgstr "earráid: nà féidir %s a chur leis an mbunachar sonraÃ" -#: merge-ort.c #, c-format msgid "Auto-merging %s" msgstr "Cumaisc uathoibrÃoch %s" -#: merge-ort.c #, c-format msgid "" "CONFLICT (implicit dir rename): Existing file/dir at %s in the way of " @@ -22256,7 +18665,6 @@ msgstr "" "COIMHLINT (athainmniú intuigthe dir): Comhad/dir atá ann cheana ag %s i " "mbealach athainmniú eolaire intuigthe ag cur na cosáin seo a leanas ann: %s." -#: merge-ort.c #, c-format msgid "" "CONFLICT (implicit dir rename): Cannot map more than one path to %s; " @@ -22266,7 +18674,6 @@ msgstr "" "chuig %s; rinne athainmneacha eolaire intuigthe iarracht na cosáin seo a " "chur ann: %s" -#: merge-ort.c #, c-format msgid "" "CONFLICT (directory rename split): Unclear where to rename %s to; it was " @@ -22277,7 +18684,6 @@ msgstr "" "athainmniú; athainmnÃodh é go eolairà éagsúla eile, gan aon cheann scrÃbe a " "fháil tromlach na gcomhaid." -#: merge-ort.c #, c-format msgid "" "WARNING: Avoiding applying %s -> %s rename to %s, because %s itself was " @@ -22286,7 +18692,6 @@ msgstr "" "RABHADH: Seachaint %s a chur i bhfeidhm -> %s a athainmniú go %s, toisc gur " "athainmnÃodh %s féin." -#: merge-ort.c #, c-format msgid "" "Path updated: %s added in %s inside a directory that was renamed in %s; " @@ -22295,7 +18700,6 @@ msgstr "" "Conair nuashonraithe: Cuireadh %s isteach i %s taobh istigh de eolaire a " "athainmnÃodh i %s; ag bogadh é go %s." -#: merge-ort.c #, c-format msgid "" "Path updated: %s renamed to %s in %s, inside a directory that was renamed in " @@ -22304,7 +18708,6 @@ msgstr "" "Conair nuashonraithe: AthainmnÃodh %s go %s i %s, taobh istigh de eolaire a " "athainmnÃodh i %s; é ag bogadh go %s." -#: merge-ort.c #, c-format msgid "" "CONFLICT (file location): %s added in %s inside a directory that was renamed " @@ -22314,7 +18717,6 @@ msgstr "" "a athainmnÃodh i %s, rud a thugann le tuiscint gur cheart é a aistriú go %s " "b'fhéidir." -#: merge-ort.c #, c-format msgid "" "CONFLICT (file location): %s renamed to %s in %s, inside a directory that " @@ -22324,14 +18726,12 @@ msgstr "" "eolaire a athainmnÃodh i %s, ag moladh gur cheart é a aistriú go %s " "b'fhéidir." -#: merge-ort.c #, c-format msgid "CONFLICT (rename/rename): %s renamed to %s in %s and to %s in %s." msgstr "" "COIMHLINT (athainmniú/athainmniú): AthainmnÃodh %s go %s i %s agus go %s i " "%s." -#: merge-ort.c #, c-format msgid "" "CONFLICT (rename involved in collision): rename of %s -> %s has content " @@ -22342,24 +18742,20 @@ msgstr "" "coinbhleachtaà ábhair ag %s AGUS imbhuaileann sé le cosán eile; d'fhéadfadh " "marcóirà coinbhleachta neadaithe a bheith mar thoradh air seo." -#: merge-ort.c #, c-format msgid "CONFLICT (rename/delete): %s renamed to %s in %s, but deleted in %s." msgstr "" "COIMHLINT (athainmniú/scrios): AthainmnÃodh %s go %s i %s, ach scriosadh é i " "%s." -#: merge-ort.c #, c-format msgid "error: cannot read object %s" msgstr "earráid: nà féidir réad %s a léamh" -#: merge-ort.c #, c-format msgid "error: object %s is not a blob" msgstr "earráid: nà blob é réad %s" -#: merge-ort.c #, c-format msgid "" "CONFLICT (file/directory): directory in the way of %s from %s; moving it to " @@ -22368,7 +18764,6 @@ msgstr "" "CONFLICT (comhad/eolaire): eolaire ar bhealach %s ó %s; é a bhogadh go %s " "ina ionad." -#: merge-ort.c #, c-format msgid "" "CONFLICT (distinct types): %s had different types on each side; renamed both " @@ -22378,7 +18773,6 @@ msgstr "" "taobh; athainmnÃodh an dá cheann ionas gur féidir gach ceann a thaifeadadh " "áit éigin." -#: merge-ort.c #, c-format msgid "" "CONFLICT (distinct types): %s had different types on each side; renamed one " @@ -22388,24 +18782,19 @@ msgstr "" "taobh; athainmnÃodh ceann acu ionas gur féidir gach ceann a thaifeadadh áit " "éigin." -#: merge-ort.c msgid "content" msgstr "ábhar" -#: merge-ort.c msgid "add/add" msgstr "cuirte/cuir leis" -#: merge-ort.c msgid "submodule" msgstr "fo-mhodúl" -#: merge-ort.c #, c-format msgid "CONFLICT (%s): Merge conflict in %s" msgstr "COIMHLINT (%s): Cumaisc coinbhleacht i %s" -#: merge-ort.c #, c-format msgid "" "CONFLICT (modify/delete): %s deleted in %s and modified in %s. Version %s " @@ -22420,7 +18809,6 @@ msgstr "" #. commit that needs to be merged. For example: #. - go to submodule (mysubmodule), and either merge commit abc1234" #. -#: merge-ort.c #, c-format msgid "" " - go to submodule (%s), and either merge commit %s\n" @@ -22430,7 +18818,6 @@ msgstr "" " nó nuashonraigh chuig tiomantas atá ann cheana féin a bhfuil na " "hathruithe sin cumasctha aige.\n" -#: merge-ort.c #, c-format msgid "" "Recursive merging with submodules currently only supports trivial cases.\n" @@ -22459,336 +18846,267 @@ 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 #, c-format msgid "collecting merge info failed for trees %s, %s, %s" msgstr "theip ar fhaisnéis chumaisc a bhailiú do chrainn %s, %s, %s" -#: merge.c msgid "failed to read the cache" msgstr "theip ar an taisce a léamh" -#: midx-write.c #, c-format msgid "failed to add packfile '%s'" msgstr "theip ar chomhad pacáiste '%s' a chur leis" -#: midx-write.c #, c-format msgid "failed to open pack-index '%s'" msgstr "theip ar innéacs pacáiste '%s' a oscailt" -#: midx-write.c #, c-format msgid "failed to locate object %d in packfile" msgstr "theip ar réad %d a aimsiú i packfile" -#: midx-write.c msgid "cannot store reverse index file" msgstr "nà féidir comhad innéacs droim a stóráil" -#: midx-write.c #, c-format msgid "could not parse line: %s" msgstr "nà fhéadfaà lÃne a pháirseáil: %s" -#: midx-write.c #, c-format msgid "malformed line: %s" msgstr "lÃne mhÃfhoirmithe: %s" -#: midx-write.c msgid "could not load pack" msgstr "nà fhéadfaà pacáiste a luchtú" -#: midx-write.c -#, c-format -msgid "could not open index for %s" -msgstr "nà raibh in ann innéacs a oscailt do %s" - -#: midx-write.c #, c-format msgid "unable to link '%s' to '%s'" msgstr "nà féidir '%s' a nascadh le '%s'" -#: midx-write.c midx.c #, c-format msgid "failed to clear multi-pack-index at %s" msgstr "theip ar innéacs il-phacáiste a ghlanadh ag %s" -#: midx-write.c msgid "ignoring existing multi-pack-index; checksum mismatch" msgstr "" "neamhaird a dhéanamh ar innéacs il-phacáiste atá ann cheana; mÃmheaitseáil" -#: midx-write.c #, c-format msgid "could not load reverse index for MIDX %s" msgstr "nà fhéadfaà innéacs droim a luchtú do MIDX %s" -#: midx-write.c msgid "Adding packfiles to multi-pack-index" msgstr "Comhaid pacáiste a chur le hinnéacs il-phacáiste" -#: midx-write.c #, c-format msgid "unknown preferred pack: '%s'" msgstr "pacáiste roghnaithe anaithnid: '%s'" -#: midx-write.c +#, c-format +msgid "failed to open preferred pack %s" +msgstr "theip ar an pacáiste is fearr leat %s a oscailt" + #, c-format msgid "cannot select preferred pack %s with no objects" msgstr "nà féidir pacáiste roghnaithe %s a roghnú gan aon rudaÃ" -#: midx-write.c #, c-format msgid "did not see pack-file %s to drop" msgstr "nÃor chonaic sé pacáist-chomhad %s le scaoileadh" -#: midx-write.c #, c-format msgid "preferred pack '%s' is expired" msgstr "tá an pacáiste roghnaithe '%s' in éag" -#: midx-write.c msgid "no pack files to index." msgstr "gan aon phacáiste comhaid le hinnéacs." -#: midx-write.c msgid "refusing to write multi-pack .bitmap without any objects" msgstr "diúltú a scrÃobh il-pacáiste.bitmap gan aon rudaÃ" -#: midx-write.c msgid "unable to create temporary MIDX layer" -msgstr "in ann ciseal MIDX sealadach a chruthú" +msgstr "nà féidir ciseal MIDX sealadach a chruthú" -#: midx-write.c msgid "could not write multi-pack bitmap" msgstr "nà fhéadfaà bitmap il-phacáiste a scrÃobh" -#: midx-write.c +msgid "too many multi-pack-indexes" +msgstr "an iomarca innéacsanna ilphacáiste" + msgid "unable to open multi-pack-index chain file" -msgstr "in ann comhad slabhra in-innéacs il-phacáiste a oscailt" +msgstr "nà féidir comhad slabhra innéacs ilphacáiste a oscailt" -#: midx-write.c msgid "unable to rename new multi-pack-index layer" -msgstr "in ann ciseal innéacs ilphacáiste nua a athainmniú" +msgstr "nà féidir an ciseal innéacs ilphacáiste nua a athainmniú" -#: midx-write.c msgid "could not write multi-pack-index" msgstr "nà fhéadfaà innéacs il-phacáiste a scrÃobh" -#: midx-write.c msgid "cannot expire packs from an incremental multi-pack-index" msgstr "" "nà féidir le pacáistà a chur in éag ó innéacs ilphacáiste incriminteach" -#: midx-write.c msgid "Counting referenced objects" msgstr "Rud tagartha a chomhaireamh" -#: midx-write.c msgid "Finding and deleting unreferenced packfiles" msgstr "Comhaid pacáiste gan tagairt a aimsiú agus a scriosadh" -#: midx-write.c msgid "cannot repack an incremental multi-pack-index" msgstr "nà féidir le hinnéacs ilphacáiste incriminteach a athphacáil" -#: midx-write.c msgid "could not start pack-objects" msgstr "nà fhéadfaà pacáiste-rudaà a thosú" -#: midx-write.c msgid "could not finish pack-objects" msgstr "nà raibh sé in ann pacáistà a chrÃochnú" -#: midx.c msgid "multi-pack-index OID fanout is of the wrong size" msgstr "tá fanout OID ilphacáiste den mhéid mÃcheart" -#: midx.c #, c-format msgid "" "oid fanout out of order: fanout[%d] = %<PRIx32> > %<PRIx32> = fanout[%d]" -msgstr "fanout oid as ord: fanout [%d] =% <PRIx32>>% <PRIx32>= fanout [%d]" +msgstr "oid fanout as ord: fanout[%d] = %<PRIx32> > %<PRIx32> = fanout[%d]" -#: midx.c msgid "multi-pack-index OID lookup chunk is the wrong size" msgstr "tá an méid mÃcheart ar an smután cuardaigh OID innéacs ilphacáiste" -#: midx.c msgid "multi-pack-index object offset chunk is the wrong size" msgstr "" "tá an méid mÃcheart ar an smután fritháireamh réada innéacs ilphacáiste" -#: midx.c #, c-format msgid "multi-pack-index file %s is too small" msgstr "tá comhad in-innéacs ilphacáiste %s ró-bheag" -#: midx.c #, c-format msgid "multi-pack-index signature 0x%08x does not match signature 0x%08x" msgstr "nà mheaitseálann sÃniú innéacs il-phacáiste 0x%08x sÃniú 0x%08x" -#: midx.c #, c-format msgid "multi-pack-index version %d not recognized" msgstr "nà aithnÃtear leagan innéacs il-phacáiste %d" -#: midx.c #, c-format msgid "multi-pack-index hash version %u does not match version %u" msgstr "nà hionann leagan %u den hais innéacs ilphacáiste agus leagan %u" -#: midx.c msgid "multi-pack-index required pack-name chunk missing or corrupted" msgstr "" "innéacs il-phacáiste teastaÃonn pÃosa ainm pacáiste ar iarraidh nó " "truaillithe" -#: midx.c msgid "multi-pack-index required OID fanout chunk missing or corrupted" msgstr "" "teastaÃonn innéacs il-phacáiste le pÃosa fanout OID atá ar iarraidh nó " "truaillithe" -#: midx.c msgid "multi-pack-index required OID lookup chunk missing or corrupted" msgstr "" "teastaÃonn innéacs ilphacáiste cuardaigh OID atá ar iarraidh nó truaillithe" -#: midx.c msgid "multi-pack-index required object offsets chunk missing or corrupted" msgstr "" "smután fritháireamh réada riachtanach innéacs ilphacáiste ar iarraidh nó " "truaillithe" -#: midx.c msgid "multi-pack-index pack-name chunk is too short" msgstr "tá pÃosa ainm pacáiste innéacs il-phacáiste ró-ghearr" -#: midx.c #, c-format msgid "multi-pack-index pack names out of order: '%s' before '%s'" msgstr "ainmneacha pacáiste in-innéacs il-phacáiste as ord: '%s' roimh '%s'" -#: midx.c msgid "multi-pack-index chain file too small" msgstr "comhad slabhra in-innéacs il-phacáiste ró-bheag" -#: midx.c #, c-format msgid "pack count in base MIDX too high: %<PRIuMAX>" msgstr "lÃon pacáiste i mbonn MIDX ró-ard:%<PRIuMAX>" -#: midx.c #, c-format msgid "object count in base MIDX too high: %<PRIuMAX>" msgstr "lÃon rudaà i mbonn MIDX ró-ard:%<PRIuMAX>" -#: midx.c #, c-format msgid "invalid multi-pack-index chain: line '%s' not a hash" -msgstr "slabhra innéacs il-phacáiste neamhbhailÃ: nà hash é lÃne '%s'" +msgstr "slabhra innéacs il-phacáiste neamhbhailÃ: nà hais é lÃne '%s'" -#: midx.c msgid "unable to find all multi-pack index files" -msgstr "in ann gach comhad innéacs il-phacáiste a fháil" +msgstr "nà féidir gach comhad innéacs ilphacáiste a aimsiú" -#: midx.c msgid "invalid MIDX object position, MIDX is likely corrupt" msgstr "suÃomh réad MIDX neamhbhailÃ, is dócha go bhfuil MIDX truaillithe" -#: midx.c #, c-format msgid "bad pack-int-id: %u (%u total packs)" msgstr "bad pack-int-id: %u (pacáistà iomlána %u)" -#: midx.c msgid "MIDX does not contain the BTMP chunk" msgstr "NÃl an pÃosa BTMP i MIDX" -#: midx.c #, c-format msgid "could not load bitmapped pack %<PRIu32>" -msgstr "nà fhéadfaà pacáiste bitmapped a luchtú% <PRIu32>" +msgstr "nà fhéadfaà pacáiste bitmapped a luchtú %<PRIu32>" -#: midx.c msgid "multi-pack-index stores a 64-bit offset, but off_t is too small" msgstr "" "stórálann innéacs il-phacáiste fritháireamh 64-giotán, ach tá off_t ró-bheag" -#: midx.c msgid "multi-pack-index large offset out of bounds" msgstr "innéacs il-phacáiste fhritháireamh mór as teorainneacha" -#: midx.c msgid "multi-pack-index file exists, but failed to parse" msgstr "tá comhad in-innéacs il-phacáiste ann, ach theip air a pháirseáil" -#: midx.c msgid "incorrect checksum" msgstr "seiceáil mÃcheart" -#: midx.c msgid "Looking for referenced packfiles" msgstr "Ag lorg comhaid pacáiste tagartha" -#: midx.c msgid "the midx contains no oid" msgstr "nÃl aon oid sa midx" -#: midx.c msgid "Verifying OID order in multi-pack-index" msgstr "Ordú OID a fhÃorú in innéacs il-phacáiste" -#: midx.c #, c-format msgid "oid lookup out of order: oid[%d] = %s >= %s = oid[%d]" msgstr "cuardach oid as ord: oid [%d] = %s >= %s = oid [%d]" -#: midx.c msgid "Sorting objects by packfile" msgstr "Rudaà a shórtáil de réir pacáiste" -#: midx.c msgid "Verifying object offsets" msgstr "Athshraith réada a fhÃorú" -#: midx.c #, c-format msgid "failed to load pack entry for oid[%d] = %s" msgstr "theip ar iontráil pacáiste a luchtú do oid [%d] = %s" -#: midx.c #, c-format msgid "failed to load pack-index for packfile %s" msgstr "theip ar innéacs pacáiste a luchtú do phacáiste %s" -#: midx.c #, c-format msgid "incorrect object offset for oid[%d] = %s: %<PRIx64> != %<PRIx64>" msgstr "" "fritháireamh réada mÃcheart le haghaidh oid[%d] = %s: %<PRIx64> != %<PRIx64>" -#: name-hash.c #, c-format msgid "unable to create lazy_dir thread: %s" -msgstr "nach féidir snáithe lazy_dir a chruthú: %s" +msgstr "nà féidir snáithe lazy_dir a chruthú: %s" -#: name-hash.c #, c-format msgid "unable to create lazy_name thread: %s" -msgstr "nach féidir snáithe lazy_name a chruthú: %s" +msgstr "nà féidir snáithe lazy_name a chruthú: %s" -#: name-hash.c #, c-format msgid "unable to join lazy_name thread: %s" msgstr "nà féidir teacht le snáithe lazy_name: %s" -#: notes-merge.c #, c-format msgid "" "You have not concluded your previous notes merge (%s exists).\n" @@ -22800,21 +19118,17 @@ msgstr "" "abort' chun an cumasc roimhe seo a cheangail/deireadh a chur leis sula " "dtosaÃonn tú le cumasc nótaà nua." -#: notes-merge.c #, c-format msgid "You have not concluded your notes merge (%s exists)." msgstr "NÃor chrÃochnaigh tú do chuid nótaà a chumasc (%s ann)." -#: notes-utils.c msgid "Cannot commit uninitialized/unreferenced notes tree" msgstr "Nà féidir crann nótaà neamhthionsaithe/gan tagairt a dhéanamh" -#: notes-utils.c #, c-format msgid "Bad notes.rewriteMode value: '%s'" msgstr "Luach lochtach notes.rewriteMode: '%s'" -#: notes-utils.c #, c-format msgid "Refusing to rewrite notes in %s (outside of refs/notes/)" msgstr "Diúltú nótaà a athscrÃobh i %s (lasmuigh de refs/notes/)" @@ -22823,230 +19137,183 @@ msgstr "Diúltú nótaà a athscrÃobh i %s (lasmuigh de refs/notes/)" #. the environment variable, the second %s is #. its value. #. -#: notes-utils.c #, c-format msgid "Bad %s value: '%s'" msgstr "Droch-luach %s: '%s'" -#: object-file-convert.c msgid "failed to decode tree entry" msgstr "theip ar iontráil crann a dhÃchódú" -#: object-file-convert.c #, c-format msgid "failed to map tree entry for %s" msgstr "theip ar iontráil crann a mhapáil do %s" -#: object-file-convert.c #, c-format msgid "bad %s in commit" msgstr "droch %s i dtiomantas" -#: object-file-convert.c #, c-format msgid "unable to map %s %s in commit object" -msgstr "nach féidir %s %s a mhapáil i réad tiomanta" +msgstr "nà féidir %s %s a mhapáil sa réad commit" -#: object-file-convert.c #, c-format msgid "Failed to convert object from %s to %s" msgstr "Theip ar réad a thiontú ó %s go %s" -#: object-file.c #, c-format msgid "object file %s is empty" msgstr "tá comhad réad %s folamh" -#: object-file.c #, c-format msgid "corrupt loose object '%s'" msgstr "réad scaoilte truaillithe '%s'" -#: object-file.c #, c-format msgid "garbage at end of loose object '%s'" msgstr "truflais ag deireadh réad scaoilte '%s'" -#: object-file.c #, c-format msgid "unable to open loose object %s" -msgstr "nach féidir réad scaoilte %s a oscailt" +msgstr "nà féidir réad scaoilte %s a oscailt" -#: object-file.c #, c-format msgid "unable to parse %s header" -msgstr "nach féidir ceannteideal %s a pháirseáil" +msgstr "nà féidir ceanntásc %s a pharsáil" -#: object-file.c msgid "invalid object type" msgstr "cineál réad neamhbhailÃ" -#: object-file.c #, c-format msgid "unable to unpack %s header" msgstr "nà féidir ceannteideal %s a dhÃphacáil" -#: object-file.c #, c-format msgid "header for %s too long, exceeds %d bytes" -msgstr "ceannteideal do %s rófhada, nÃos mó ná %d bytes" +msgstr "ceannteideal do %s rófhada, nÃos mó ná %d bearta" -#: object-file.c #, c-format msgid "loose object %s (stored in %s) is corrupt" msgstr "tá réad scaoilte %s (stóráilte i %s) truaillithe" -#: object-file.c #, c-format msgid "unable to open %s" msgstr "nà féidir %s a oscailt" -#: object-file.c #, c-format msgid "files '%s' and '%s' differ in contents" msgstr "tá difrÃocht idir comhaid '%s' agus '%s' in ábhar" -#: object-file.c -#, c-format -msgid "unable to write file %s" -msgstr "nach féidir comhad %s a scrÃobh" - -#: object-file.c #, c-format msgid "unable to write repeatedly vanishing file %s" -msgstr "in ann comhad %s atá ag imeacht arÃs agus arÃs eile a scrÃobh" +msgstr "nà féidir comhad %s atá ag imeacht arÃs agus arÃs eile a scrÃobh" -#: object-file.c #, c-format msgid "unable to set permission to '%s'" -msgstr "nach féidir cead a shocrú do '%s'" +msgstr "nà féidir cead a shocrú go '%s'" + +msgid "core.fsyncMethod = batch is unsupported on this platform" +msgstr "core.fsyncMethod = nà thacaÃtear leis an bhaisc ar an ardán seo" -#: object-file.c msgid "error when closing loose object file" msgstr "earráid agus comhad réad scaoilte á ndú" -#: object-file.c #, c-format msgid "insufficient permission for adding an object to repository database %s" msgstr "cead neamhleor chun réad a chur le bunachar sonraà stórais %s" -#: object-file.c msgid "unable to create temporary file" -msgstr "in ann comhad sealadach a chruthú" +msgstr "nà féidir comhad sealadach a chruthú" -#: object-file.c msgid "unable to write loose object file" -msgstr "in ann comhad réad scaoilte a scrÃobh" +msgstr "nà féidir comhad réada scaoilte a scrÃobh" -#: object-file.c #, c-format msgid "unable to deflate new object %s (%d)" -msgstr "nach féidir réad nua %s a dhÃoslagadh (%d)" +msgstr "nà féidir an réad nua %s (%d) a dhÃbhoilsciú." -#: object-file.c #, c-format msgid "deflateEnd on object %s failed (%d)" msgstr "theip ar deflateEnd ar réad %s (%d)" -#: object-file.c #, c-format msgid "confused by unstable object source data for %s" msgstr "mearbhall de bharr sonraà foinse réada éagobhsaà do %s" -#: object-file.c #, c-format msgid "write stream object %ld != %<PRIuMAX>" msgstr "scrÃobh réad srutha %ld! =%<PRIuMAX>" -#: object-file.c #, c-format msgid "unable to stream deflate new object (%d)" -msgstr "nach féidir réad nua a dhÃscaoileadh a shruthlú (%d)" +msgstr "nà féidir sruthú dÃbhoilsciú réad nua (%d)" -#: object-file.c #, c-format msgid "deflateEnd on stream object failed (%d)" msgstr "theip ar réad srutha DeflateEnd (%d)" -#: object-file.c #, c-format msgid "unable to create directory %s" -msgstr "nach féidir eolaire %s a chruthú" +msgstr "nà féidir eolaire %s a chruthú" -#: object-file.c #, c-format msgid "cannot read object for %s" msgstr "nà féidir réad a léamh do %s" -#: object-file.c #, c-format msgid "cannot map object %s to %s" msgstr "nà féidir réad %s a mhapáil go %s" -#: object-file.c #, c-format msgid "object fails fsck: %s" msgstr "teipeann ar réad fsck: %s" -#: object-file.c msgid "refusing to create malformed object" msgstr "diúltú réad mÃfhoirmithe a chruthú" -#: object-file.c #, c-format msgid "read error while indexing %s" msgstr "earráid léite agus %s á innéacsú" -#: object-file.c #, c-format msgid "short read while indexing %s" msgstr "léamh gearr agus %s á innéacsú" -#: object-file.c #, c-format msgid "%s: failed to insert into database" msgstr "%s: theip ort a chur isteach sa bhunachar sonraÃ" -#: object-file.c #, c-format msgid "%s: unsupported file type" msgstr "%s: cineál comhaid gan tacaÃocht" -#: object-file.c #, c-format msgid "hash mismatch for %s (expected %s)" msgstr "neamhoiriúnú hash do %s (súil leis %s)" -#: object-file.c #, c-format msgid "unable to mmap %s" -msgstr "nach féidir %s a mmapáil" +msgstr "nà féidir %s a mhapáil" -#: object-file.c #, c-format msgid "unable to unpack header of %s" -msgstr "nach féidir ceanntásc %s a dhÃphacáil" +msgstr "nà féidir ceanntásc %s a dhÃphacáil" -#: object-file.c #, c-format msgid "unable to parse header of %s" -msgstr "nach féidir ceannteideal %s a pháirseáil" +msgstr "nà féidir ceanntásc %s a pharsáil" -#: object-file.c #, c-format msgid "unable to parse type from header '%s' of %s" msgstr "nà féidir cineál a pharsáil ó cheanntásc '%s' de %s" -#: object-file.c #, c-format msgid "unable to unpack contents of %s" -msgstr "nach féidir ábhar %s a dhÃphacáil" +msgstr "nà féidir ábhar %s a dhÃphacáil" #. TRANSLATORS: This is a line of ambiguous object #. output shown when we cannot look up or parse the #. object in question. E.g. "deadbeef [bad object]". #. -#: object-name.c #, c-format msgid "%s [bad object]" msgstr "%s [droch-réad]" @@ -23056,7 +19323,6 @@ msgstr "%s [droch-réad]" #. * #. "deadbeef commit 2021-01-01 - Some Commit Message" #. -#: object-name.c #, c-format msgid "%s commit %s - %s" msgstr "Déanann %s tiomanta %s - %s" @@ -23072,7 +19338,6 @@ msgstr "Déanann %s tiomanta %s - %s" #. The third argument is the "tag" string #. from object.c. #. -#: object-name.c #, c-format msgid "%s tag %s - %s" msgstr "Clib %s %s - %s" @@ -23083,7 +19348,6 @@ msgstr "Clib %s %s - %s" #. * #. "deadbeef [bad tag, could not parse it]" #. -#: object-name.c #, c-format msgid "%s [bad tag, could not parse it]" msgstr "%s [droch-chlib, nà fhéadfaà é a pháirseáil]" @@ -23091,7 +19355,6 @@ msgstr "%s [droch-chlib, nà fhéadfaà é a pháirseáil]" #. TRANSLATORS: This is a line of ambiguous <type> #. object output. E.g. "deadbeef tree". #. -#: object-name.c #, c-format msgid "%s tree" msgstr "%s crann" @@ -23099,12 +19362,10 @@ msgstr "%s crann" #. TRANSLATORS: This is a line of ambiguous <type> #. object output. E.g. "deadbeef blob". #. -#: object-name.c #, c-format msgid "%s blob" msgstr "%s blob" -#: object-name.c #, c-format msgid "short object ID %s is ambiguous" msgstr "tá ID réad gairid %s débhrÃoch" @@ -23113,7 +19374,6 @@ msgstr "tá ID réad gairid %s débhrÃoch" #. objects composed in show_ambiguous_object(). See #. its "TRANSLATORS" comments for details. #. -#: object-name.c #, c-format msgid "" "The candidates are:\n" @@ -23122,7 +19382,6 @@ msgstr "" "Is iad na hiarrthóirÃ:\n" "%s" -#: object-name.c 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" @@ -23147,22 +19406,18 @@ msgstr "" "teachtaireacht seo as\n" "ag rith \"git config set advice.objectNameWarning false\"" -#: object-name.c #, c-format msgid "log for '%.*s' only goes back to %s" msgstr "nà théann logáil le haghaidh '%.*s' ach ar ais go %s" -#: object-name.c #, c-format msgid "log for '%.*s' only has %d entries" msgstr "nÃl ach iontráil i logáil le haghaidh '%.*s' ach %d ceann" -#: object-name.c #, c-format msgid "path '%s' exists on disk, but not in '%.*s'" msgstr "tá cosán '%s' ann ar an diosca, ach nà i '%.*s'" -#: object-name.c #, c-format msgid "" "path '%s' exists, but not '%s'\n" @@ -23171,12 +19426,10 @@ msgstr "" "tá an cosán '%s' ann, ach nÃl '%s' ann\n" "leid: An raibh tú i gceist agat '%.*s:%s' aka '%.*s:./%s'?" -#: object-name.c #, c-format msgid "path '%s' does not exist in '%.*s'" msgstr "nÃl cosán '%s' ann i '%.*s'" -#: object-name.c #, c-format msgid "" "path '%s' is in the index, but not at stage %d\n" @@ -23185,7 +19438,6 @@ msgstr "" "tá cosán '%s' san innéacs, ach nà ag céim %d\n" "leid: An raibh i gceist agat ': %d: %s'?" -#: object-name.c #, c-format msgid "" "path '%s' is in the index, but not '%s'\n" @@ -23194,517 +19446,432 @@ msgstr "" "tá an conair '%s' san innéacs, ach nà '%s'\n" "leideanna: an é ':%d:%s' a bhà i gceist agat, nó ':%d:./%s'?" -#: object-name.c #, c-format msgid "path '%s' exists on disk, but not in the index" msgstr "tá cosán '%s' ann ar an diosca, ach nà san innéacs" -#: object-name.c #, c-format msgid "path '%s' does not exist (neither on disk nor in the index)" msgstr "nÃl cosán '%s' ann (nà ar an diosca ná san innéacs)" -#: object-name.c msgid "relative path syntax can't be used outside working tree" msgstr "" "nà féidir comhréir cosáin choibhneasta a úsáid lasmuigh de chrann oibre" -#: object-name.c #, c-format msgid "<object>:<path> required, only <object> '%s' given" msgstr "<object>: ri <path>achtanach, nà <object>thugtar ach '%s'" -#: object-name.c #, c-format msgid "invalid object name '%.*s'." msgstr "ainm réada neamhbhailà '%.*s'." -#: object-store.c +#, c-format +msgid "invalid object type \"%s\"" +msgstr "cineál réad neamhbhailà “%sâ€" + +#, c-format +msgid "object %s is a %s, not a %s" +msgstr "is %s é réad %s, nà %s" + +#, c-format +msgid "object %s has unknown type id %d" +msgstr "réad %s tá cineál ID anaithnid %d aige" + +#, c-format +msgid "unable to parse object: %s" +msgstr "nà féidir an réad a pharsáil: %s" + +#, c-format +msgid "hash mismatch %s" +msgstr "neamhoiriúnú hash %s" + #, c-format msgid "object directory %s does not exist; check .git/objects/info/alternates" msgstr "nÃl an eolaire réada %s ann; seiceáil .git/objects/info/alternates" -#: object-store.c #, c-format msgid "unable to normalize alternate object path: %s" -msgstr "nach féidir cosán réad malartach a normalú: %s" +msgstr "nà féidir cosán réada malartach a normalú: %s" -#: object-store.c #, c-format msgid "%s: ignoring alternate object stores, nesting too deep" msgstr "%s: neamhaird a dhéanamh ar stórais rudaà malartacha, neadú ró-" -#: object-store.c msgid "unable to fdopen alternates lockfile" -msgstr "in ann comhad glasála malartacha a fdopen" +msgstr "nà féidir comhad glasála malartacha fdopen a úsáid" -#: object-store.c msgid "unable to read alternates file" -msgstr "in ann comhad malartach a léamh" +msgstr "nà féidir comhad malartach a léamh" -#: object-store.c msgid "unable to move new alternates file into place" -msgstr "in ann comhad malartacha nua a bhogadh isteach" +msgstr "nà féidir comhad malartach nua a bhogadh ina áit" -#: object-store.c #, c-format msgid "path '%s' does not exist" msgstr "nÃl cosán '%s' ann" -#: object-store.c #, c-format msgid "reference repository '%s' as a linked checkout is not supported yet." msgstr "nà thacaÃtear le stór tagartha '%s' mar sheiceáil nasctha go fóill." -#: object-store.c #, c-format msgid "reference repository '%s' is not a local repository." msgstr "nà stór áitiúil é stór tagartha '%s'." -#: object-store.c #, c-format msgid "reference repository '%s' is shallow" msgstr "tá stóras tagartha '%s' éadomhain" -#: object-store.c #, c-format msgid "reference repository '%s' is grafted" msgstr "tá stór tagartha '%s' grapháilte" -#: object-store.c #, c-format msgid "could not find object directory matching %s" msgstr "nà fhéadfaà eolaire réada a fháil a mheaitseáil %s" -#: object-store.c #, c-format msgid "invalid line while parsing alternate refs: %s" msgstr "lÃne neamhbhailà agus tú ag paráil iarmhairtà malartacha: %s" -#: object-store.c #, c-format msgid "replacement %s not found for %s" msgstr "nach bhfuarthas %s a athsholáthar do %s" -#: object-store.c #, c-format msgid "packed object %s (stored in %s) is corrupt" msgstr "tá réad pacáilte %s (stóráilte i %s) truaillithe" -#: object-store.c #, c-format msgid "missing mapping of %s to %s" msgstr "mapáil atá in easnamh de %s go %s" -#: object-store.c #, c-format msgid "%s is not a valid '%s' object" msgstr "Nà réad bailà '%s' é %s '" -#: object.c -#, c-format -msgid "invalid object type \"%s\"" -msgstr "cineál réad neamhbhailà “%sâ€" - -#: object.c -#, c-format -msgid "object %s is a %s, not a %s" -msgstr "is %s é réad %s, nà %s" - -#: object.c -#, c-format -msgid "object %s has unknown type id %d" -msgstr "réad %s tá cineál ID anaithnid %d aige" - -#: object.c -#, c-format -msgid "unable to parse object: %s" -msgstr "nach féidir réad a pháirseáil: %s" - -#: object.c -#, c-format -msgid "hash mismatch %s" -msgstr "neamhoiriúnú hash %s" - -#: pack-bitmap-write.c #, c-format msgid "duplicate entry when writing bitmap index: %s" msgstr "iontráil dúblach agus innéacs bitmap á scrÃobh: %s" -#: pack-bitmap-write.c #, c-format msgid "attempted to store non-selected commit: '%s'" msgstr "rinne iarracht tiomantas neamh-roghnaithe a stóráil: '%s'" -#: pack-bitmap-write.c msgid "too many pseudo-merges" msgstr "an iomarca bréag-chumaisc" -#: pack-bitmap-write.c -msgid "trying to write commit not in index" -msgstr "ag iarraidh tiomantas a scrÃobh nà in innéacs" - -#: pack-bitmap.c msgid "failed to load bitmap index (corrupted?)" msgstr "theip ar innéacs bitmap a luchtú (truaillithe?)" -#: pack-bitmap.c msgid "corrupted bitmap index (too small)" msgstr "innéacs bitmap truaillithe (ró-bheag)" -#: pack-bitmap.c msgid "corrupted bitmap index file (wrong header)" msgstr "comhad innéacs bitmap truaillithe (ceanntásc mÃcheart)" -#: pack-bitmap.c #, c-format msgid "unsupported version '%d' for bitmap index file" msgstr "leagan gan tacaÃocht '%d' do chomhad innéacs bitmap" -#: pack-bitmap.c msgid "corrupted bitmap index file (too short to fit hash cache)" msgstr "" "comhad innéacs bitmap truaillithe (róghearr chun taisce hash a fheistiú)" -#: pack-bitmap.c msgid "corrupted bitmap index file (too short to fit lookup table)" msgstr "" "comhad innéacs bitmap truaillithe (róghearr chun tábla cuardaigh a fheistiú)" -#: pack-bitmap.c msgid "" "corrupted bitmap index file (too short to fit pseudo-merge table header)" msgstr "" "comhad innéacs bitmap truaillithe (ró-ghearr chun ceannteideal tábla bréag-" "chumasc a fheistiú)" -#: pack-bitmap.c msgid "corrupted bitmap index file (too short to fit pseudo-merge table)" msgstr "" "comhad innéacs bitmap truaillithe (ró-ghearr chun tábla bréag-chumasc a " "fheistiú)" -#: pack-bitmap.c msgid "corrupted bitmap index file, pseudo-merge table too short" msgstr "comhad innéacs bitmap truaillithe, tábla bréag-chumasc ró-ghearr" -#: pack-bitmap.c #, c-format msgid "duplicate entry in bitmap index: '%s'" msgstr "iontráil dúblach in innéacs bitmap: '%s'" -#: pack-bitmap.c #, c-format msgid "corrupt ewah bitmap: truncated header for entry %d" msgstr "bitmap ewah truaillithe: ceannteideal gearrtha le haghaidh iontráil %d" -#: pack-bitmap.c #, c-format msgid "corrupt ewah bitmap: commit index %u out of range" msgstr "bitmap ewah truaillithe: innéacs tiomanta %u lasmuigh den raon" -#: pack-bitmap.c msgid "corrupted bitmap pack index" msgstr "innéacs pacáiste bitmap truaillte" -#: pack-bitmap.c msgid "invalid XOR offset in bitmap pack index" msgstr "fritháireamh XOR neamhbhailà in innéacs pacáiste bitmap" -#: pack-bitmap.c msgid "cannot fstat bitmap file" msgstr "nà féidir comhad bitmap fstat" -#: pack-bitmap.c msgid "checksum doesn't match in MIDX and bitmap" msgstr "nà mheaitseálann seicsum i MIDX agus bitmap" -#: pack-bitmap.c msgid "multi-pack bitmap is missing required reverse index" msgstr "tá an t-innéacs droim riachtanach in easnamh ilphacáiste" -#: pack-bitmap.c #, c-format msgid "could not open pack %s" msgstr "nà fhéadfaà pacáiste %s a oscailt" -#: pack-bitmap.c msgid "corrupt bitmap lookup table: triplet position out of index" msgstr "tábla cuardaigh bitmap truaillithe: suÃomh triplet as innéacs" -#: pack-bitmap.c msgid "corrupt bitmap lookup table: xor chain exceeds entry count" msgstr "tábla cuardaigh bitmap truaillithe: sáraÃonn slabhra xor lÃon iontrála" -#: pack-bitmap.c #, c-format msgid "corrupt bitmap lookup table: commit index %u out of range" msgstr "" "tábla cuardaigh bitmap truaillithe: innéacs tiomanta %u lasmuigh den raon" -#: pack-bitmap.c #, c-format msgid "corrupt ewah bitmap: truncated header for bitmap of commit \"%s\"" msgstr "" "bitmap ewah truaillithe: ceannteideal gearrtha le haghaidh bitmap de " "thiomantas “%sâ€" -#: pack-bitmap.c #, c-format msgid "unable to load pack: '%s', disabling pack-reuse" -msgstr "in ann pacáiste a luchtú: '%s', athúsáid pacáiste a dhÃchumasú" +msgstr "" +"nà féidir an pacáiste a luchtú: '%s', ag dÃchumasú athúsáid an phacáiste" -#: pack-bitmap.c msgid "unable to compute preferred pack, disabling pack-reuse" -msgstr "in ann pacáiste roghnaithe a rÃomh, athúsáid pacáiste a dhÃchumasú" +msgstr "" +"nà féidir an pacáiste is fearr leat a rÃomh, athúsáid pacáiste a dhÃchumasú" -#: pack-bitmap.c #, c-format msgid "object '%s' not found in type bitmaps" msgstr "nÃor aimsÃodh réad '%s' i gcineál bitmaps" -#: pack-bitmap.c #, c-format msgid "object '%s' does not have a unique type" msgstr "nÃl cineál uathúil ag réad '%s'" -#: pack-bitmap.c #, c-format msgid "object '%s': real type '%s', expected: '%s'" msgstr "réad '%s': fÃor-chineál '%s', ag súil leis: '%s'" -#: pack-bitmap.c #, c-format msgid "object not in bitmap: '%s'" msgstr "réad nach bhfuil i mbitmap: '%s'" -#: pack-bitmap.c msgid "failed to load bitmap indexes" msgstr "theip ar innéacsanna bitmap a luchtú" -#: pack-bitmap.c msgid "you must specify exactly one commit to test" msgstr "nà mór duit tiomantas amháin a shonrú go dÃreach chun tástáil" -#: pack-bitmap.c #, c-format msgid "commit '%s' doesn't have an indexed bitmap" msgstr "cumann nach bhfuil bitmap innéacsaithe ag '%s'" -#: pack-bitmap.c msgid "mismatch in bitmap results" msgstr "mÃmheaitseáil i dtorthaà bitmap" -#: pack-bitmap.c #, c-format msgid "pseudo-merge index out of range (%<PRIu32> >= %<PRIuMAX>)" msgstr "innéacs bréag-chumaisc lasmuigh den raon (%<PRIu32> >= %<PRIuMAX>)" -#: pack-bitmap.c #, c-format msgid "could not find '%s' in pack '%s' at offset %<PRIuMAX>" msgstr "" "nà raibh '%s' in ann teacht i bpacáiste '%s' ag fhritháireamh%<PRIuMAX>" -#: pack-bitmap.c #, c-format msgid "unable to get disk usage of '%s'" msgstr "nà féidir úsáid diosca a fháil de '%s'" -#: pack-bitmap.c #, c-format msgid "bitmap file '%s' has invalid checksum" msgstr "tá seicsum neamhbhailà ag comhad bitmap '%s'" -#: pack-mtimes.c #, c-format msgid "mtimes file %s is too small" msgstr "tá comhad mtimes %s ró-bheag" -#: pack-mtimes.c #, c-format msgid "mtimes file %s has unknown signature" msgstr "tá sÃniú anaithnid ag comhad mtimes %s" -#: pack-mtimes.c #, c-format msgid "mtimes file %s has unsupported version %<PRIu32>" -msgstr "tá leagan neamh-tacaithe ag comhad mtimes %s% <PRIu32>" +msgstr "tá comhad mtimes %s le leagan %<PRIu32> nach dtacaÃtear leis" -#: pack-mtimes.c #, c-format msgid "mtimes file %s has unsupported hash id %<PRIu32>" -msgstr "tá id hash neamh-tacaithe ag comhad %s mtimes% <PRIu32>" +msgstr "" +"tá comhad mtimes %s le hais-aitheantas hash %<PRIu32> nach dtacaÃtear leis" -#: pack-mtimes.c #, c-format msgid "mtimes file %s is corrupt" msgstr "tá comhad mtimes %s truaillithe" -#: pack-revindex.c +msgid "pack everything" +msgstr "pacáil gach rud" + +msgid "prune loose refs (default)" +msgstr "briseadh scaoilte (réamhshocraithe)" + +msgid "auto-pack refs as needed" +msgstr "tuairiscintà uathoibrÃoch pacáiste" + +msgid "references to include" +msgstr "tagairtà lena n-áirÃtear" + +msgid "references to exclude" +msgstr "tagairtà chun eisiamh" + #, c-format msgid "reverse-index file %s is too small" msgstr "tá comhad innéacs droim %s róbheag" -#: pack-revindex.c #, c-format msgid "reverse-index file %s is corrupt" msgstr "tá comhad innéacs droim %s truaillithe" -#: pack-revindex.c #, c-format msgid "reverse-index file %s has unknown signature" msgstr "tá sÃniú anaithnid ag comhad innéacs droim %s" -#: pack-revindex.c #, c-format msgid "reverse-index file %s has unsupported version %<PRIu32>" -msgstr "tá leagan neamh-tacaithe ag comhad innéacs droim %s% <PRIu32>" +msgstr "tá comhad reverse-index %s le leagan %<PRIu32> nach dtacaÃtear leis" -#: pack-revindex.c #, c-format msgid "reverse-index file %s has unsupported hash id %<PRIu32>" -msgstr "tá id hash neamh-tacaithe ag comhad innéacs droim %s% <PRIu32>" +msgstr "" +"tá comhad reverse-index %s le hais-aitheantas hash %<PRIu32> nach dtacaÃtear " +"leis" -#: pack-revindex.c msgid "invalid checksum" msgstr "seiceáil neamhbhailÃ" -#: pack-revindex.c #, c-format msgid "invalid rev-index position at %<PRIu64>: %<PRIu32> != %<PRIu32>" msgstr "" "suÃomh innéacs-athraithe neamhbhailà ag %<PRIu64>: %<PRIu32> != %<PRIu32>" -#: pack-revindex.c msgid "multi-pack-index reverse-index chunk is the wrong size" msgstr "tá smután droim ar ais-innéacs il-phacáiste ar an méid mÃcheart" -#: pack-revindex.c msgid "could not determine preferred pack" msgstr "nà fhéadfaà pacáiste is fearr a chinneadh" -#: pack-write.c msgid "cannot both write and verify reverse index" msgstr "nà féidir innéacs droim a scrÃobh agus a fhÃorú" -#: pack-write.c #, c-format msgid "could not stat: %s" msgstr "nà fhéadfaà stat: %s" -#: pack-write.c #, c-format msgid "failed to make %s readable" msgstr "theip ar %s a dhéanamh inléite" -#: pack-write.c #, c-format msgid "could not write '%s' promisor file" msgstr "nà fhéadfaà comhad gealltanais '%s' a scrÃobh" -#: packfile.c msgid "offset before end of packfile (broken .idx?)" msgstr "fhritháireamh roimh dheireadh an phackfile (.idx briste?)" -#: packfile.c #, c-format msgid "packfile %s cannot be mapped%s" msgstr "nà féidir comhaid pacáiste %s a mhapáil %s" -#: packfile.c #, c-format msgid "offset before start of pack index for %s (corrupt index?)" msgstr "" "fhritháireamh roimh thús an innéacs pacáiste do %s (innéacs truaillithe?)" -#: packfile.c #, c-format msgid "offset beyond end of pack index for %s (truncated index?)" msgstr "" "fhritháireamh thar dheireadh an innéacs pacáiste do %s (innéacs gearrtha?)" -#: parse-options-cb.c #, c-format msgid "malformed expiration date '%s'" msgstr "dáta éaga mÃfhoirmithe '%s'" -#: parse-options-cb.c #, c-format msgid "option `%s' expects \"always\", \"auto\", or \"never\"" msgstr "tá rogha `%s' ag súil le “i gcónaÃâ€, “uathoibrÃochâ€, nó “riamhâ€" -#: parse-options-cb.c #, c-format msgid "malformed object name '%s'" msgstr "ainm réad mÃfhoirmithe '%s'" -#: parse-options-cb.c #, c-format msgid "option `%s' expects \"%s\" or \"%s\"" msgstr "tá rogha `%s' ag súil le “%s†nó “%sâ€" -#: parse-options.c #, c-format msgid "%s requires a value" msgstr "TeastaÃonn luach ó %s" -#: parse-options.c #, c-format msgid "%s takes no value" msgstr "Nà ghlacann %s aon luach" -#: parse-options.c #, c-format msgid "%s isn't available" msgstr "NÃl %s ar fáil" -#: parse-options.c +#, c-format +msgid "value for %s exceeds %<PRIdMAX>" +msgstr "tá luach %s nÃos mó ná %<PRIdMAX>" + #, c-format msgid "value %s for %s not in range [%<PRIdMAX>,%<PRIdMAX>]" msgstr "luach %s do %s nach bhfuil sa raon [%<PRIdMAX>,%<PRIdMAX>]" -#: parse-options.c #, c-format msgid "%s expects an integer value with an optional k/m/g suffix" msgstr "Tá %s ag súil le luach sláireach le iarmhÃr roghnach k/m/g" -#: parse-options.c #, c-format msgid "%s expects a non-negative integer value with an optional k/m/g suffix" msgstr "" "Tá %s ag súil le luach sláimhir neamh-dhiúltach le iarmhÃr roghnach k/m/g" -#: parse-options.c #, c-format msgid "ambiguous option: %s (could be --%s%s or --%s%s)" msgstr "rogha débhrÃoch: %s (d'fhéadfadh a bheith --%s%s nó --%s%s)" -#: parse-options.c #, c-format msgid "did you mean `--%s` (with two dashes)?" msgstr "an raibh i gceist agat `--%s` (le dhá shraith)?" -#: parse-options.c #, c-format msgid "alias of --%s" msgstr "alias de --%s" -#: parse-options.c msgid "need a subcommand" msgstr "fo-ordú ag teastáil" -#: parse-options.c #, c-format msgid "unknown option `%s'" msgstr "rogha anaithnid `%s'" -#: parse-options.c #, c-format msgid "unknown switch `%c'" msgstr "lasc anaithnid `%c'" -#: parse-options.c #, c-format msgid "unknown non-ascii option in string: `%s'" msgstr "rogha neamh-ascii anaithnid i sreang: `%s'" @@ -23721,7 +19888,6 @@ msgstr "rogha neamh-ascii anaithnid i sreang: `%s'" #. "%s" without any placeholder signal. Most #. translations leave this message as is. #. -#: parse-options.c #, c-format msgid "[=<%s>]" msgstr "[=<%s>]" @@ -23738,7 +19904,6 @@ msgstr "[=<%s>]" #. "%s" without any placeholder signal. Most #. translations leave this message as is. #. -#: parse-options.c #, c-format msgid "[<%s>]" msgstr "[<%s>]" @@ -23753,16 +19918,13 @@ msgstr "[<%s>]" #. may use "%s" without any placeholder signal. Most #. translations leave this message as is. #. -#: parse-options.c #, c-format msgid " <%s>" msgstr " <%s>" -#: parse-options.c msgid "..." msgstr "..." -#: parse-options.c #, c-format msgid "usage: %s" msgstr "úsáid: %s" @@ -23770,7 +19932,6 @@ msgstr "úsáid: %s" #. TRANSLATORS: the colon here should align with the #. one in "usage: %s" translation. #. -#: parse-options.c #, c-format msgid " or: %s" msgstr " nó: %s" @@ -23794,115 +19955,90 @@ msgstr " nó: %s" #. translated) N_() usage string, which contained embedded #. newlines before we split it up. #. -#: parse-options.c #, c-format msgid "%*s%s" msgstr "%*s%s" -#: parse-options.c #, c-format msgid " %s" msgstr " %s" -#: parse-options.c msgid "-NUM" msgstr "-NUMBER" -#: parse-options.c #, c-format msgid "opposite of --no-%s" msgstr "os coinne de --no-%s" -#: parse-options.h msgid "expiry-date" msgstr "dáta éaga" -#: parse-options.h msgid "no-op (backward compatibility)" msgstr "no-op (comhoiriúnacht ar chúl)" -#: parse-options.h msgid "be more verbose" msgstr "a bheith nÃos inbhreithnithe" -#: parse-options.h msgid "be more quiet" msgstr "a bheith nÃos ciúine" -#: parse-options.h msgid "use <n> digits to display object names" msgstr "úsáid dhigit <n>à chun ainmneacha réada a thaispe" -#: parse-options.h msgid "prefixed path to initial superproject" msgstr "cosán réamhshocraithe chuig an superproject tosaigh" -#: parse-options.h msgid "how to strip spaces and #comments from message" msgstr "conas spásanna agus #comments a scriosadh ó theachtaireacht" -#: parse-options.h msgid "read pathspec from file" msgstr "léigh pathspec ón gcomhad" -#: parse-options.h msgid "" "with --pathspec-from-file, pathspec elements are separated with NUL character" msgstr "" "le --pathspec-from-file, déantar eilimintà pathspec scartha le carachtar NUL" -#: parse.c #, c-format msgid "bad boolean environment value '%s' for '%s'" msgstr "droch-luach timpeallachta boolean '%s' do '%s'" -#: path-walk.c #, c-format msgid "failed to walk children of tree %s: not found" msgstr "theip ar pháistà crann %s a shiúl: nÃor aimsÃodh" -#: path-walk.c #, c-format msgid "failed to find object %s" msgstr "theip ar réad %s a aimsiú" -#: path-walk.c #, c-format msgid "failed to find tag %s" msgstr "theip ar chlib %s a aimsiú" -#: path-walk.c msgid "failed to setup revision walk" msgstr "theip orthu siúlóid athbhreithnithe" -#: path.c #, c-format msgid "Could not make %s writable by group" msgstr "Nà fhéadfaà %s a dhéanamh inscrÃofa de réir grúpa" -#: pathspec.c msgid "Escape character '\\' not allowed as last character in attr value" msgstr "" "Nà cheadaÃtear carachtar éalaithe '\\' mar charachtar deireanach i luach attr" -#: pathspec.c msgid "Only one 'attr:' specification is allowed." msgstr "Nà cheadaÃtear ach sonraÃocht 'attr: 'amháin." -#: pathspec.c msgid "attr spec must not be empty" msgstr "nà chóir go mbeadh sonraÃocht attr folamh" -#: pathspec.c #, c-format msgid "invalid attribute name %s" msgstr "ainm tréithe neamhbhailà %s" -#: pathspec.c msgid "global 'glob' and 'noglob' pathspec settings are incompatible" msgstr "nÃl socruithe pathspec domhanda 'glob' agus 'noglob' neamhoiriúnach" -#: pathspec.c msgid "" "global 'literal' pathspec setting is incompatible with all other global " "pathspec settings" @@ -23910,220 +20046,181 @@ msgstr "" "nÃl suÃomh cosáin domhanda 'litriúil' gan luà le gach socruithe beatháin " "domhanda eile" -#: pathspec.c msgid "invalid parameter for pathspec magic 'prefix'" msgstr "paraiméadar neamhbhailà do 'réimÃr' draÃochta pathspec" -#: pathspec.c #, c-format msgid "Invalid pathspec magic '%.*s' in '%s'" msgstr "DraÃocht pathspec neamhbhailà '%.*s' i '%s'" -#: pathspec.c #, c-format msgid "Missing ')' at the end of pathspec magic in '%s'" msgstr "Ar iarraidh ')' ag deireadh draÃochta pathspec i '%s'" -#: pathspec.c #, c-format msgid "Unimplemented pathspec magic '%c' in '%s'" msgstr "DraÃocht pathspec neamh-chur i bhfeidhm '%c' i '%s'" -#: pathspec.c #, c-format msgid "%s: 'literal' and 'glob' are incompatible" msgstr "%s: NÃl 'literal' agus 'glob' neamhoiriúnach" -#: pathspec.c #, c-format msgid "'%s' is outside the directory tree" msgstr "Tá '%s' lasmuigh den chrann eolaire" -#: pathspec.c #, c-format msgid "%s: '%s' is outside repository at '%s'" msgstr "%s: Tá '%s' an stór lasmuigh ag '%s'" -#: pathspec.c #, c-format msgid "'%s' (mnemonic: '%c')" msgstr "'%s' (mnemonic: '%c')" -#: pathspec.c #, c-format msgid "%s: pathspec magic not supported by this command: %s" msgstr "%s: nach dtacaÃonn an t-ordú seo le draÃocht pathspec: %s" -#: pathspec.c #, c-format msgid "pathspec '%s' is beyond a symbolic link" msgstr "tá pathspec '%s' thar nasc siombalach" -#: pathspec.c #, c-format msgid "line is badly quoted: %s" msgstr "tá an lÃne luaite go dona: %s" -#: pkt-line.c msgid "unable to write flush packet" -msgstr "in ann pacáiste srutháin a scrÃobh" +msgstr "nà féidir pacáiste flush a scrÃobh" -#: pkt-line.c msgid "unable to write delim packet" -msgstr "in ann pacáiste delim a scrÃobh" +msgstr "nà féidir pacáiste delim a scrÃobh" -#: pkt-line.c msgid "unable to write response end packet" -msgstr "in ann pacáiste deiridh freagartha a scrÃobh" +msgstr "nà féidir pacáiste deiridh freagartha a scrÃobh" -#: pkt-line.c msgid "flush packet write failed" msgstr "theip ar scrÃobh paicéad sru" -#: pkt-line.c msgid "protocol error: impossibly long line" msgstr "earráid prótacal: lÃne fhada dodhéanta" -#: pkt-line.c msgid "packet write with format failed" msgstr "theip ar scrÃobh pacáiste le formáid" -#: pkt-line.c msgid "packet write failed - data exceeds max packet size" msgstr "theip ar scrÃobh paicéad - sáraÃonn sonraà méid uasta an" -#: pkt-line.c #, c-format msgid "packet write failed: %s" msgstr "theip ar scrÃobh pacáiste: %s" -#: pkt-line.c msgid "read error" msgstr "earráid léigh" -#: pkt-line.c msgid "the remote end hung up unexpectedly" msgstr "crochadh an deireadh iargúlta suas gan choinne" -#: pkt-line.c #, c-format msgid "protocol error: bad line length character: %.4s" msgstr "earráid prótacal: carachtar fad droch-lÃne: %.4s" -#: pkt-line.c #, c-format msgid "protocol error: bad line length %d" msgstr "earráid prótacal: fad droch-lÃne %d" -#: pkt-line.c sideband.c #, c-format msgid "remote error: %s" msgstr "earráid iargúlta: %s" -#: preload-index.c msgid "Refreshing index" msgstr "Innéacs athnuachana" -#: preload-index.c #, c-format msgid "unable to create threaded lstat: %s" -msgstr "nach féidir lstat snáithithe a chruthú: %s" +msgstr "nà féidir lstat snáithithe a chruthú: %s" -#: pretty.c msgid "unable to parse --pretty format" -msgstr "in ann formáid --pretty a pháirseáil" +msgstr "nà féidir formáid --pretty a pharsáil" -#: promisor-remote.c msgid "lazy fetching disabled; some objects may not be available" msgstr "" "tarraingt leisciúil mÃchumasaithe; b'fhéidir nach mbeidh roinnt rudaà ar fáil" -#: promisor-remote.c msgid "promisor-remote: unable to fork off fetch subprocess" msgstr "gealltó-iargúlta: nà féidir leis an bhfophróiseas faighte a fhorc" -#: promisor-remote.c msgid "promisor-remote: could not write to fetch subprocess" msgstr "gealltó-iargúlta: nà fhéadfaà scrÃobh chun fophróiseas a fháil" -#: promisor-remote.c msgid "promisor-remote: could not close stdin to fetch subprocess" msgstr "gealltó-iargúlta: nà fhéadfaà stdin a dhúnadh chun fophróiseas a fháil" -#: promisor-remote.c #, c-format msgid "promisor remote name cannot begin with '/': %s" msgstr "nà féidir ainm iargúlta gealltanaà tosú le '/': %s" -#: promisor-remote.c #, c-format msgid "could not fetch %s from promisor remote" msgstr "nà fhéadfaà %s a fháil ó iargúlta gealltanach" -#: promisor-remote.c +#, c-format +msgid "unsupported field '%s' in '%s' config" +msgstr "réimse neamhthacaithe '%s' i gcumraÃocht '%s'" + #, c-format msgid "no or empty URL advertised for remote '%s'" msgstr "nÃl aon URL nó folamh fógraithe le haghaidh iargúlta '%s'" -#: promisor-remote.c #, c-format msgid "known remote named '%s' but with URL '%s' instead of '%s'" msgstr "iargúlta ar a dtugtar '%s' ach le URL '%s' in ionad '%s'" -#: promisor-remote.c #, c-format -msgid "unknown '%s' value for '%s' config option" -msgstr "luach '%s' anaithnid do rogha cumraithe '%s'" +msgid "invalid element '%s' from remote info" +msgstr "eilimint neamhbhailà '%s' ó eolas iargúlta" + +#, c-format +msgid "server advertised a promisor remote without a name or URL: %s" +msgstr "d’fhógair an freastalaà cianda promisor gan ainm ná URL: %s" -#: promisor-remote.c #, c-format -msgid "unknown element '%s' from remote info" -msgstr "eilimint anaithnid '%s' ó fhaisnéis iargúlta" +msgid "unknown '%s' value for '%s' config option" +msgstr "luach '%s' anaithnid do rogha cumraithe '%s'" -#: promisor-remote.c #, c-format msgid "accepted promisor remote '%s' not found" msgstr "nár aimsÃodh gealltanas iargúlta '%s'" -#: protocol-caps.c msgid "object-info: expected flush after arguments" msgstr "ear-eolas: súil le sruth tar éis argóintÃ" -#: prune-packed.c msgid "Removing duplicate objects" msgstr "Rudaà dúblacha a bhaint" -#: pseudo-merge.c #, c-format msgid "failed to load pseudo-merge regex for %s: '%s'" msgstr "theip ar régex bréag-cumaisc a luchtú do %s: '%s'" -#: pseudo-merge.c #, c-format msgid "%s must be non-negative, using default" msgstr "Nà mór %s a bheith neamh-dhiúltach, ag baint úsáide as" -#: pseudo-merge.c #, c-format msgid "%s must be between 0 and 1, using default" msgstr "Caithfidh %s a bheith idir 0 agus 1, ag baint úsáide as réamhshocrú" -#: pseudo-merge.c #, c-format msgid "%s must be positive, using default" msgstr "Caithfidh %s a bheith dearfach, ag úsáid réamhshocraithe" -#: pseudo-merge.c #, c-format msgid "pseudo-merge group '%s' missing required pattern" msgstr "grúpa bréagchumaisc '%s' ar iarraidh patrún riachtanach" -#: pseudo-merge.c #, c-format msgid "pseudo-merge group '%s' has unstable threshold before stable one" msgstr "tá tairseach éagobhsaà ag an ngrúpa bréagchumaisc '%s' roimh cheann" -#: pseudo-merge.c #, c-format msgid "" "pseudo-merge regex from config has too many capture groups (max=%<PRIuMAX>)" @@ -24131,57 +20228,47 @@ msgstr "" "tá an iomarca grúpaà gabhála sa regex pseudo-merge ón chumraÃocht " "(uasmhéid=%<PRIuMAX>)" -#: pseudo-merge.c #, c-format msgid "extended pseudo-merge read out-of-bounds (%<PRIuMAX> >= %<PRIuMAX>)" msgstr "" "léamh sÃnte cumaisc bhréige lasmuigh de theorainneacha (%<PRIuMAX> >= " "%<PRIuMAX>)" -#: pseudo-merge.c #, c-format msgid "extended pseudo-merge entry is too short (%<PRIuMAX> >= %<PRIuMAX>)" msgstr "tá an iontráil shÃnte chumaisc ró-ghearr (%<PRIuMAX> >= %<PRIuMAX>)" -#: pseudo-merge.c #, c-format msgid "could not find pseudo-merge for commit %s at offset %<PRIuMAX>" msgstr "" "nà fhéadfaà a aimsiú bréag-chumasc do thiomantas %s ag " "fhritháireamh%<PRIuMAX>" -#: pseudo-merge.c #, c-format msgid "extended pseudo-merge lookup out-of-bounds (%<PRIu32> >= %<PRIu32>)" msgstr "" "cuardach sÃnte cumaisc bhréige lasmuigh de theorainneacha (%<PRIu32> >= " "%<PRIu32>)" -#: pseudo-merge.c #, c-format msgid "out-of-bounds read: (%<PRIuMAX> >= %<PRIuMAX>)" msgstr "léamh lasmuigh de theorainneacha: (%<PRIuMAX> >= %<PRIuMAX>)" -#: pseudo-merge.c #, c-format msgid "could not read extended pseudo-merge table for commit %s" msgstr "" "nà fhéadfaà tábla bréag-chumaisc leathnaithe a léamh le haghaidh tiomanta %s" -#: range-diff.c msgid "could not start `log`" msgstr "nà fhéadfaà 'log' a thosú" -#: range-diff.c msgid "could not read `log` output" msgstr "nà raibh in ann aschur `log` a léamh" -#: range-diff.c sequencer.c #, c-format msgid "could not parse commit '%s'" msgstr "nà fhéadfaà gealladh '%s' a pháirseáil" -#: range-diff.c #, c-format msgid "" "could not parse first line of `log` output: did not start with 'commit ': " @@ -24190,66 +20277,63 @@ msgstr "" "nà raibh sé in ann an chéad lÃne d'aschur `log` a pháirseáil: nÃor thosaigh " "sé le 'commit': '%s'" -#: range-diff.c #, c-format msgid "could not parse git header '%.*s'" msgstr "nÃorbh fhéidir ceanntásc git a pharsáil '%.*s'" -#: range-diff.c msgid "failed to generate diff" msgstr "theip ar éagsúlacht a ghiniúint" -#: range-diff.c +#, c-format +msgid "" +"range-diff: unable to compute the range-diff, since it exceeds the maximum " +"memory for the cost matrix: %s (%<PRIuMAX> bytes) needed, limited to %s " +"(%<PRIuMAX> bytes)" +msgstr "" +"difrÃocht-raoin: nà féidir an difrÃocht-raoin a rÃomh, ós rud é go sáraÃonn " +"sé an uasmhéid cuimhne don mhaitrÃs costais: %s (%<PRIuMAX> beart) ag " +"teastáil, teoranta do %s (%<PRIuMAX> beart)" + #, c-format msgid "could not parse log for '%s'" msgstr "nà raibh in ann logáil a pháirseáil le haghaidh '%s'" -#: reachable.c #, c-format msgid "invalid extra cruft tip: '%s'" msgstr "tip cruft bhreise neamhbhailÃ: '%s'" -#: reachable.c msgid "unable to enumerate additional recent objects" -msgstr "in ann rudaà breise le déanaà a áireamh" +msgstr "nà féidir réada breise le déanaà a liostú" -#: read-cache.c #, c-format msgid "will not add file alias '%s' ('%s' already exists in index)" msgstr "" "nà chuirfidh sé alias comhad '%s' leis (tá '%s' ann cheana féin san innéacs)" -#: read-cache.c msgid "cannot create an empty blob in the object database" msgstr "nà féidir le blob folamh a chruthú sa bhunachar sonraà réad" -#: read-cache.c #, c-format msgid "%s: can only add regular files, symbolic links or git-directories" msgstr "" "%s: nà féidir ach comhaid rialta, naisc siombalacha nó eolairà git-eolairà a " "chur leis" -#: read-cache.c #, c-format msgid "unable to index file '%s'" msgstr "nà féidir an comhad '%s' a innéacsú" -#: read-cache.c #, c-format msgid "unable to add '%s' to index" msgstr "nà féidir '%s' a chur leis an innéacs" -#: read-cache.c #, c-format msgid "'%s' appears as both a file and as a directory" msgstr "Tá '%s' le feiceáil mar chomhad agus mar eolaire" -#: read-cache.c msgid "Refresh index" msgstr "Innéacs athnuachan" -#: read-cache.c #, c-format msgid "" "index.version set, but the value is invalid.\n" @@ -24258,7 +20342,6 @@ msgstr "" "index.version socraithe, ach tá an luach neamhbhailÃ.\n" "Ag baint úsáide as leagan %i" -#: read-cache.c #, c-format msgid "" "GIT_INDEX_VERSION set, but the value is invalid.\n" @@ -24267,143 +20350,114 @@ msgstr "" "socraigh GIT_INDEX_VERSION, ach tá an luach neamhbhailÃ.\n" "Ag baint úsáide as leagan %i" -#: read-cache.c #, c-format msgid "bad signature 0x%08x" msgstr "droch-shÃniú 0x%08x" -#: read-cache.c #, c-format msgid "bad index version %d" msgstr "leagan innéacs droch%d" -#: read-cache.c msgid "bad index file sha1 signature" msgstr "comhad innéacs droch-sha1 sÃniú" -#: read-cache.c #, c-format msgid "index uses %.4s extension, which we do not understand" msgstr "úsáideann innéacs sÃneadh %.4s, nach dtuigimid" -#: read-cache.c #, c-format msgid "ignoring %.4s extension" msgstr "neamhaird a dhéanamh le sÃneadh %.4s" -#: read-cache.c #, c-format msgid "unknown index entry format 0x%08x" msgstr "formáid iontrála innéacs anaithnid 0x%08x" -#: read-cache.c #, c-format msgid "malformed name field in the index, near path '%s'" msgstr "réimse ainm mhÃfhoirmithe san innéacs, in aice le cosán '%s'" -#: read-cache.c msgid "unordered stage entries in index" msgstr "iontrálacha céime neamh-ordaithe san innéacs" -#: read-cache.c #, c-format msgid "multiple stage entries for merged file '%s'" msgstr "iontrálacha ilchéime do chomhad cumaisc '%s'" -#: read-cache.c #, c-format msgid "unordered stage entries for '%s'" msgstr "iontrálacha stáitse neamh-ordaithe do '%s'" -#: read-cache.c #, c-format msgid "unable to create load_cache_entries thread: %s" msgstr "nà féidir an snáithe load_cache_entries a chruthú: %s" -#: read-cache.c #, c-format msgid "unable to join load_cache_entries thread: %s" msgstr "nà féidir teacht le snáithe load_cache_entries thread: %s" -#: read-cache.c #, c-format msgid "%s: index file open failed" msgstr "%s: theip ar oscailt comhad innéacs" -#: read-cache.c #, c-format msgid "%s: cannot stat the open index" msgstr "%s: nà féidir an t-innéacs oscailte a stáit" -#: read-cache.c #, c-format msgid "%s: index file smaller than expected" msgstr "%s: comhad innéacs nÃos lú ná mar a bhà súil leis" -#: read-cache.c #, c-format msgid "%s: unable to map index file%s" msgstr "%s: nà féidir comhad innéacs %s a mhapáil" -#: read-cache.c #, c-format msgid "unable to create load_index_extensions thread: %s" -msgstr "nach féidir snáithe load_index_extensions a chruthú: %s" +msgstr "nà féidir an snáithe load_index_extensions a chruthú: %s" -#: read-cache.c #, c-format msgid "unable to join load_index_extensions thread: %s" msgstr "nà féidir teacht le snáithe load_index_extensions: %s" -#: read-cache.c #, c-format msgid "could not freshen shared index '%s'" msgstr "nà raibh in ann innéacs roinnte '%s' a athnuachan" -#: read-cache.c #, c-format msgid "broken index, expect %s in %s, got %s" msgstr "innéacs briste, súil le %s i %s, fuair %s" -#: read-cache.c msgid "cannot write split index for a sparse index" msgstr "nà féidir innéacs scoilte a scrÃobh le haghaidh innéacs neall" -#: read-cache.c msgid "failed to convert to a sparse-index" msgstr "theip ar thiontú go innéacs neamhchoitianta" -#: read-cache.c #, c-format msgid "unable to open git dir: %s" -msgstr "in ann git dir a oscailt: %s" +msgstr "nà féidir an eolaire git a oscailt: %s" -#: read-cache.c #, c-format msgid "unable to unlink: %s" -msgstr "nach féidir dÃnasc a dhéanamh: %s" +msgstr "nà féidir dÃcheangal: %s" -#: read-cache.c #, c-format msgid "cannot fix permission bits on '%s'" msgstr "nà féidir giotáin ceada a shocrú ar '%s'" -#: read-cache.c #, c-format msgid "%s: cannot drop to stage #0" msgstr "%s: nà féidir titim go dtà céim #0" -#: read-cache.c #, c-format msgid "unexpected diff status %c" msgstr "stádas diff gan choinne %c" -#: read-cache.c #, c-format msgid "remove '%s'\n" msgstr "bain '%s'\n" -#: rebase-interactive.c msgid "" "You can fix this with 'git rebase --edit-todo' and then run 'git rebase --" "continue'.\n" @@ -24413,7 +20467,6 @@ msgstr "" "rebase --continue' a rith.\n" "Nó is féidir leat an rebase a chur le 'git rebase --abort'.\n" -#: rebase-interactive.c #, c-format msgid "" "unrecognized setting %s for option rebase.missingCommitsCheck. Ignoring." @@ -24421,7 +20474,6 @@ msgstr "" "socrú neamhaithnithe %s le haghaidh rogha rebase.missingCommitsCheck. " "Neamhaird a dhéanamh." -#: rebase-interactive.c msgid "" "\n" "Commands:\n" @@ -24483,7 +20535,6 @@ msgstr "" "Is féidir na lÃnte seo a athordú; déantar iad a fhorghnÃomhú ó bharr go " "bun.\n" -#: rebase-interactive.c #, c-format msgid "Rebase %s onto %s (%d command)" msgid_plural "Rebase %s onto %s (%d commands)" @@ -24491,7 +20542,6 @@ msgstr[0] "Athbhunú %s ar %s (ordú %d)" msgstr[1] "Athbhunú %s ar %s (%d orduithe)" msgstr[2] "Athbhunú %s ar %s (%d orduithe)" -#: rebase-interactive.c msgid "" "\n" "Do not remove any line. Use 'drop' explicitly to remove a commit.\n" @@ -24500,7 +20550,6 @@ msgstr "" "Ná bain aon lÃne. Bain úsáid as 'drop' go sainráite chun tiomantas a " "bhaint.\n" -#: rebase-interactive.c msgid "" "\n" "If you remove a line here THAT COMMIT WILL BE LOST.\n" @@ -24508,7 +20557,6 @@ msgstr "" "\n" "Má bhaineann tú lÃne anseo CAILLFIDH AN TIOMANTAS.\n" -#: rebase-interactive.c msgid "" "\n" "You are editing the todo file of an ongoing interactive rebase.\n" @@ -24523,7 +20571,6 @@ msgstr "" " git rebase --continue\n" "\n" -#: rebase-interactive.c msgid "" "\n" "However, if you remove everything, the rebase will be aborted.\n" @@ -24532,12 +20579,10 @@ msgstr "" "\n" "Mar sin féin, má bhaineann tú gach rud, cuirfear deireadh leis an athbhunú.\n" -#: rebase-interactive.c #, c-format msgid "could not write '%s'." msgstr "nà fhéadfaà '%s' a scrÃobh." -#: rebase-interactive.c #, c-format msgid "" "Warning: some commits may have been dropped accidentally.\n" @@ -24546,7 +20591,6 @@ msgstr "" "Rabhadh: b'fhéidir gur titim roinnt gealltanna de thaisme.\n" "Gealltanna titim (nÃos nuaà go nÃos sine):\n" -#: rebase-interactive.c #, c-format msgid "" "To avoid this message, use \"drop\" to explicitly remove a commit.\n" @@ -24564,298 +20608,251 @@ msgstr "" "Is iad na hiompraÃochtaà féideartha: neamhaird a dhéanamh, rabhadh, " "earráid.\n" -#: rebase.c #, c-format msgid "%s: 'preserve' superseded by 'merges'" msgstr "%s: cuireadh 'caomhnú' in ionad 'le' cumaisc '" -#: ref-filter.c wt-status.c msgid "gone" msgstr "imithe" -#: ref-filter.c #, c-format msgid "ahead %d" msgstr "ar aghaidh %d" -#: ref-filter.c #, c-format msgid "behind %d" msgstr "taobh thiar de %d" -#: ref-filter.c #, c-format msgid "ahead %d, behind %d" msgstr "tosaigh %d, taobh thiar de %d" -#: ref-filter.c #, c-format msgid "%%(%.*s) does not take arguments" msgstr "%%(%.*s) nà ghlacann argóintÃ" -#: ref-filter.c #, c-format msgid "unrecognized %%(%.*s) argument: %s" msgstr "neamhaithnithe %%(%.*s) argóint: %s" -#: ref-filter.c #, c-format msgid "expected format: %%(color:<color>)" msgstr "formáid ionchais: %%(color:<dath>)" -#: ref-filter.c #, c-format msgid "unrecognized color: %%(color:%s)" msgstr "dath gan aithint: %%(color:%s)" -#: ref-filter.c #, c-format msgid "Integer value expected refname:lstrip=%s" msgstr "Luach sláimhir a bhfuiltear ag súil leis refname:lstrip=%s" -#: ref-filter.c #, c-format msgid "Integer value expected refname:rstrip=%s" msgstr "Luach sláimhir a bhfuiltear ag súil leis refname:rstrip=%s" -#: ref-filter.c #, c-format msgid "expected %%(trailers:key=<value>)" msgstr "ionchasach %%(trailers:key=<value>)" -#: ref-filter.c #, c-format msgid "unknown %%(trailers) argument: %s" msgstr "argóint %%(trailers) anaithnid: %s" -#: ref-filter.c #, c-format msgid "positive value expected contents:lines=%s" msgstr "ábhar ag súil le luach dearfach:lines=%s" -#: ref-filter.c #, c-format msgid "argument expected for %s" msgstr "argóint ag súil le haghaidh %s" -#: ref-filter.c #, c-format msgid "positive value expected %s=%s" msgstr "luach dearfach a bhfuiltear ag súil leis %s=%s" -#: ref-filter.c #, c-format msgid "cannot fully parse %s=%s" msgstr "nà féidir %s=%s a pháirseáil go hiomlán" -#: ref-filter.c #, c-format msgid "value expected %s=" msgstr "luach ag súil leis %s=" -#: ref-filter.c #, c-format msgid "positive value expected '%s' in %%(%s)" msgstr "luach dearfach a bhÃothas ag súil le '%s' i %%(%s)" -#: ref-filter.c #, c-format msgid "expected format: %%(align:<width>,<position>)" msgstr "ionchasach formáid: %%(align:<width>,<position>)" -#: ref-filter.c #, c-format msgid "unrecognized position:%s" msgstr "suÃomh gan aithint:%s" -#: ref-filter.c #, c-format msgid "unrecognized width:%s" msgstr "leithead gan aithint:%s" -#: ref-filter.c #, c-format msgid "unrecognized %%(%s) argument: %s" msgstr "argóint %%(%s) gan aitheantas: %s" -#: ref-filter.c #, c-format msgid "positive width expected with the %%(align) atom" msgstr "leithead dearfach a bhÃothas ag súil leis leis an adamh %%(align)" -#: ref-filter.c #, c-format msgid "expected format: %%(ahead-behind:<committish>)" msgstr "formáid ionchais: %%(ahead-behind:<committish>)" -#: ref-filter.c #, c-format msgid "expected format: %%(is-base:<committish>)" msgstr "formáid ionchais: %%(is-base:<committish>)" -#: ref-filter.c #, c-format msgid "malformed field name: %.*s" msgstr "ainm réimse mÃfhoirmithe: %.*s" -#: ref-filter.c #, c-format msgid "unknown field name: %.*s" msgstr "ainm réimse anaithnid: %.*s" -#: ref-filter.c #, c-format msgid "" "not a git repository, but the field '%.*s' requires access to object data" msgstr "" "nà stórlann git é, ach éilÃonn an réimse '%.*s' rochtain ar shonraà réada" -#: ref-filter.c #, c-format msgid "format: %%(%s) atom used without a %%(%s) atom" msgstr "formáid: %%(%s) adaim a úsáidtear gan adaim %%(%s)" -#: ref-filter.c #, c-format msgid "format: %%(then) atom used more than once" msgstr "formáid: %%(then) adaim a úsáidtear nÃos mó ná uair amháin" -#: ref-filter.c #, c-format msgid "format: %%(then) atom used after %%(else)" msgstr "formáid: %%(then) adaim a úsáidtear tar éis %%(else)" -#: ref-filter.c #, c-format msgid "format: %%(else) atom used more than once" msgstr "formáid: %%(else) adaim a úsáidtear nÃos mó ná uair amháin" -#: ref-filter.c #, c-format msgid "format: %%(end) atom used without corresponding atom" msgstr "formáid: %%(end) adaim a úsáidtear gan adaim chomhfhreagrach" -#: ref-filter.c #, c-format msgid "malformed format string %s" msgstr "teaghrán formáid mhÃfhoirmithe %s" -#: ref-filter.c #, c-format msgid "this command reject atom %%(%.*s)" msgstr "diúltú an t-ordú seo adamh %%(%.*s)" -#: ref-filter.c #, c-format msgid "--format=%.*s cannot be used with --python, --shell, --tcl" msgstr "--format=%.*s nà féidir é a úsáid le --python, --shell, --tcl" -#: ref-filter.c msgid "failed to run 'describe'" msgstr "theip ar 'cur sÃos' a rith" -#: ref-filter.c #, c-format msgid "(no branch, rebasing %s)" msgstr "(gan aon bhrainse, athbhunú %s)" -#: ref-filter.c #, c-format msgid "(no branch, rebasing detached HEAD %s)" msgstr "(gan aon bhrainse, athbhunú CEAD scoite %s)" -#: ref-filter.c #, c-format msgid "(no branch, bisect started on %s)" msgstr "(gan aon bhrainse, thosaigh bisect ar %s)" -#: ref-filter.c #, c-format msgid "(HEAD detached at %s)" msgstr "(HEAD scoite ag %s)" -#: ref-filter.c #, c-format msgid "(HEAD detached from %s)" msgstr "(CEAD scoite ó %s)" -#: ref-filter.c msgid "(no branch)" msgstr "(gan aon bhrainse)" -#: ref-filter.c #, c-format msgid "missing object %s for %s" msgstr "réad atá ar iarraidh %s do %s" -#: ref-filter.c #, c-format msgid "parse_object_buffer failed on %s for %s" msgstr "theip ar parse_object_buffer ar %s do %s" -#: ref-filter.c #, c-format msgid "malformed object at '%s'" msgstr "réad mÃfhoirmithe ag '%s'" -#: ref-filter.c #, c-format msgid "ignoring ref with broken name %s" msgstr "neamhaird a dhéanamh ar tagairt le ainm briste %s" -#: ref-filter.c refs.c #, c-format msgid "ignoring broken ref %s" msgstr "ag déanamh neamhaird ar thagairt briste %s" -#: ref-filter.c #, c-format msgid "format: %%(end) atom missing" msgstr "formáid :%%(end) ataim ar iarraidh" -#: ref-filter.c #, c-format msgid "malformed object name %s" msgstr "ainm réad mÃfhoirmithe %s" -#: ref-filter.c #, c-format msgid "option `%s' must point to a commit" msgstr "caithfidh rogha `%s' a chur in iúl do thiomantas" -#: ref-filter.h msgid "key" msgstr "eochair" -#: ref-filter.h msgid "field name to sort on" msgstr "ainm réimse le sórtáil" -#: ref-filter.h msgid "exclude refs which match pattern" msgstr "a eisiamh iarmhairtà a mheaitseálann patrún" -#: reflog.c #, c-format msgid "not a reflog: %s" msgstr "nà athbhreithniú: %s" -#: reflog.c #, c-format msgid "no reflog for '%s'" msgstr "gan aon athbhreithniú do '%s'" -#: refs.c +msgid "Checking references consistency" +msgstr "Comhsheasmhacht tagairtÃ" + #, c-format msgid "%s does not point to a valid object!" msgstr "Nà thugann %s in iúl go réad bailÃ!" -#: refs.c +#, c-format +msgid "%s%s will become dangling after %s is deleted\n" +msgstr "Beidh %s%s crochta tar éis %s a scriosadh\n" + +#, c-format +msgid "%s%s has become dangling after %s was deleted\n" +msgstr "Tá %s%s crochta anois tar éis %s a scriosadh\n" + #, c-format msgid "" "Using '%s' as the name for the initial branch. This default branch name\n" -"is subject to change. To configure the initial branch name to use in all\n" -"of your new repositories, which will suppress this warning, call:\n" +"will change to \"main\" in Git 3.0. To configure the initial branch name\n" +"to use in all of your new repositories, which will suppress this warning,\n" +"call:\n" "\n" "\tgit config --global init.defaultBranch <name>\n" "\n" @@ -24864,131 +20861,144 @@ msgid "" "\n" "\tgit branch -m <name>\n" msgstr "" -"Ag baint úsáide as '%s' mar ainm don bhrainse tosaigh. An ainm brainse " -"réamhshocraithe\n" -"tá sé faoi réir athraithe. Chun an t-ainm brainse tosaigh a chumrú le húsáid " -"i ngach\n" -"de do stór nua, a chuirfidh an rabhadh seo a chur faoi chois, glaoigh ar:\n" +"Ag baint úsáide as '%s' mar ainm don bhrainse tosaigh. Athróidh an t-ainm " +"réamhshocraithe brainse seo go \"main\" i Git 3.0. Chun ainm an bhrainse " +"tosaigh a chumrú\n" +"le húsáid i do stórtha nua go léir, rud a chuirfidh cosc ​​ar an rabhadh seo,\n" +"glaoigh ar:\n" "\n" -"\tgit config --global init.defaultBranch <name>\n" +"git config --global init.defaultBranch <name>\n" "\n" -"Is iad na hainmneacha a roghnaÃtear go coitianta in ionad 'máistir' prÃomh " -"',' stoc 'agus\n" -"'forbair'. Is féidir an brainse atá dÃreach cruthaithe a athainmniú trÃd an " +"Is iad na hainmneacha a roghnaÃtear go coitianta in ionad 'master' ná " +"'main', 'trunk' agus\n" +"'development'. Is féidir an brainse dÃreach cruthaithe a athainmniú trÃd an " "ordú seo:\n" "\n" -"\tgit branch -m <name>\n" +"git branch -m <name>\n" + +#, c-format +msgid "" +"Using '%s' as the name for the initial branch since Git 3.0.\n" +"If you expected Git to create 'master', the just-created\n" +"branch can be renamed via this command:\n" +"\n" +"\tgit branch -m master\n" +msgstr "" +"Ag baint úsáide as '%s' mar ainm don chéad bhrainse ó Git 3.0.\n" +"Más rud é go raibh súil agat go gcruthódh Git 'master', is féidir an brainse " +"a cruthaÃodh dÃreach a athainmniú trÃd an ordú seo:\n" +"\n" +"git branch -m master\n" -#: refs.c #, c-format msgid "could not retrieve `%s`" msgstr "nà fhéadfaà `%s` a aisghabháil" -#: refs.c #, c-format msgid "invalid branch name: %s = %s" msgstr "ainm brainse neamhbhailÃ: %s = %s" -#: refs.c #, c-format msgid "ignoring dangling symref %s" msgstr "ag déanamh neamhaird ar shiomtref crochta %s" -#: refs.c #, c-format msgid "log for ref %s has gap after %s" msgstr "tá bearna ag logáil le haghaidh tagairt %s tar éis %s" -#: refs.c #, c-format msgid "log for ref %s unexpectedly ended on %s" msgstr "chrÃochnaigh logáil le haghaidh tagairt %s gan choinne ar %s" -#: refs.c #, c-format msgid "log for %s is empty" msgstr "tá logáil le haghaidh %s folamh" -#: refs.c #, c-format msgid "refusing to update reflog for pseudoref '%s'" msgstr "diúltú reflog a nuashonrú do pseudoref '%s'" -#: refs.c #, c-format msgid "refusing to update pseudoref '%s'" msgstr "diúltú pseudoref '%s' a nuashonrú" -#: refs.c #, c-format msgid "refusing to update reflog with bad name '%s'" msgstr "diúltú reflog a nuashonrú le droch-ainm '%s'" -#: refs.c #, c-format msgid "refusing to update ref with bad name '%s'" msgstr "diúltú tagairt a nuashonrú le droch-ainm '%s'" -#: refs.c msgid "refusing to force and skip creation of reflog" msgstr "diúltú cruthú reflog a chur i bhfeidhm agus a scipeáil" -#: refs.c #, c-format msgid "update_ref failed for ref '%s': %s" msgstr "theip ar update_ref le haghaidh tagairt '%s': %s" -#: refs.c #, c-format msgid "multiple updates for ref '%s' not allowed" msgstr "nà cheadaÃtear nuashonruithe iolracha le haghaidh tagairt '%s'" -#: refs.c msgid "ref updates forbidden inside quarantine environment" msgstr "nuashonruithe ref toirmiscthe laistigh de" -#: refs.c msgid "ref updates aborted by hook" msgstr "nuashonruithe tagartha a chuirtear deireadh leis" -#: refs.c #, c-format msgid "'%s' exists; cannot create '%s'" msgstr "Tá '%s' ann; nà féidir '%s' a chruthú" -#: refs.c #, c-format msgid "cannot process '%s' and '%s' at the same time" msgstr "nà féidir '%s' agus '%s' a phróiseáil ag an am céanna" -#: refs.c #, c-format msgid "could not delete reference %s: %s" msgstr "nà fhéadfaà tagairt %s a scriosadh: %s" -#: refs.c #, c-format msgid "could not delete references: %s" msgstr "nà fhéadfaà tagairtà a scriosadh: %s" -#: refs.c #, c-format msgid "Finished dry-run migration of refs, the result can be found at '%s'\n" msgstr "" "Imirce tirim crÃochnaithe na n-iarmhairc, is féidir an toradh a fháil ag " "'%s'\n" -#: refs.c #, c-format msgid "could not remove temporary migration directory '%s'" msgstr "nà fhéadfaà eolaire imirce sealadach '%s' a bhaint" -#: refs.c #, c-format msgid "migrated refs can be found at '%s'" msgstr "is féidir airgeanna imirceacha a fháil ag '%s'" -#: refs/files-backend.c refs/reftable-backend.c +msgid "" +"'core.preferSymlinkRefs=true' is nominated for removal.\n" +"hint: The use of symbolic links for symbolic refs is deprecated\n" +"hint: and will be removed in Git 3.0. The configuration that\n" +"hint: tells Git to use them is thus going away. You can unset\n" +"hint: it with:\n" +"hint:\n" +"hint:\tgit config unset core.preferSymlinkRefs\n" +"hint:\n" +"hint: Git will then use the textual symref format instead." +msgstr "" +"Tá 'core.preferSymlinkRefs=true' ainmnithe le haghaidh bainte.\n" +"leid: Tá úsáid naisc shiombalacha le haghaidh tagairtà siombalacha imithe i " +"léig\n" +"leid: agus bainfear iad i Git 3.0. Dá bhrà sin, tá an chumraÃocht a\n" +"leid: insÃonn do Git iad a úsáid ag imeacht. Is féidir leat é a dhÃchumasú\n" +"leid: le:\n" +"leid:\n" +"leid:\tgit config unset core.preferSymlinkRefs\n" +"leid:\n" +"leid: Úsáidfidh Git an fhormáid symref téacsúil ina ionad." + #, c-format msgid "" "cannot lock ref '%s': expected symref with target '%s': but is a regular ref" @@ -24996,41 +21006,34 @@ msgstr "" "nà féidir tagairt '%s' a ghlasáil: ag súil le symref le sprioc '%s': ach is " "tagairt rialta é" -#: refs/files-backend.c +#, c-format +msgid "trying to write reflog for '%s' with incomplete values" +msgstr "ag iarraidh reflog a scrÃobh do '%s' le luachanna neamhiomlána" + #, c-format msgid "cannot read ref file '%s'" msgstr "nà féidir comhad tagartha '%s' a léamh" -#: refs/files-backend.c #, c-format msgid "cannot open directory %s" msgstr "nà féidir eolaire %s a oscailt" -#: refs/files-backend.c -msgid "Checking references consistency" -msgstr "Comhsheasmhacht tagairtÃ" - -#: refs/packed-backend.c #, c-format msgid "unable to open '%s'" msgstr "nà féidir '%s' a oscailt" -#: refs/reftable-backend.c #, c-format msgid "refname is dangerous: %s" msgstr "tá refname contúirteach: %s" -#: refs/reftable-backend.c #, c-format msgid "trying to write ref '%s' with nonexistent object %s" msgstr "ag iarraidh tagairt '%s' a scrÃobh le réad nach bhfuil %s ann" -#: refs/reftable-backend.c #, c-format msgid "trying to write non-commit object %s to branch '%s'" msgstr "ag iarraidh réad neamh-thiomanta %s a scrÃobh chuig brainse '%s'" -#: refs/reftable-backend.c #, c-format msgid "" "multiple updates for 'HEAD' (including one via its referent '%s') are not " @@ -25039,17 +21042,14 @@ msgstr "" "nà cheadaÃtear nuashonruithe iolracha do 'HEAD' (lena n-áirÃtear ceann trÃd " "an tagairt '%s')" -#: refs/reftable-backend.c #, c-format msgid "cannot lock ref '%s': unable to resolve reference '%s'" msgstr "nà féidir tagairt '%s' a ghlasáil: nà féidir tagairt '%s' a réiteach" -#: refs/reftable-backend.c #, c-format msgid "cannot lock ref '%s': error reading reference" msgstr "nà féidir tagairt '%s' a ghlasáil: earráid ag léamh tagairt" -#: refs/reftable-backend.c #, c-format msgid "" "multiple updates for '%s' (including one via symref '%s') are not allowed" @@ -25057,213 +21057,172 @@ msgstr "" "nà cheadaÃtear nuashonruithe iolracha do '%s' (lena n-áirÃtear ceann trà " "symref '%s')" -#: refs/reftable-backend.c +#, c-format +msgid "cannot lock ref '%s': dangling symref already exists" +msgstr "" +"nà féidir an tagairt '%s' a ghlasáil: tá an tagairt shiombalach crochta ann " +"cheana féin" + #, c-format msgid "cannot lock ref '%s': reference already exists" msgstr "nà féidir tagairt '%s' a ghlasáil: tá tagairt ann cheana féin" -#: refs/reftable-backend.c #, c-format msgid "cannot lock ref '%s': reference is missing but expected %s" msgstr "" "nà féidir tagairt '%s' a ghlasáil: tá tagairt ar iarraidh ach táthar ag súil " "leis %s" -#: refs/reftable-backend.c #, c-format msgid "cannot lock ref '%s': is at %s but expected %s" msgstr "" "nà féidir tagairt '%s' a ghlasáil: tá sé ag %s ach táthar ag súil leis %s" -#: refs/reftable-backend.c #, c-format msgid "reftable: transaction prepare: %s" msgstr "athfhabhtaithe: ullmhú idirbheart: %s" -#: refs/reftable-backend.c #, c-format msgid "reftable: transaction failure: %s" msgstr "athfhabhtaithe: teip ar idirbheart: %s" -#: refs/reftable-backend.c #, c-format msgid "unable to compact stack: %s" -msgstr "nach féidir cruach a dhlúthú: %s" +msgstr "nà féidir an cruach a chomhdhlúthú: %s" -#: refs/reftable-backend.c #, c-format msgid "refname %s not found" msgstr "nà aimsÃodh refname %s" -#: refs/reftable-backend.c #, c-format msgid "refname %s is a symbolic ref, copying it is not supported" msgstr "rs tagairt siombalach é refname %s, nà thacaÃtear leis a chóipeáil" -#: refspec.c #, c-format msgid "pattern '%s' has no '*'" msgstr "nÃl aon '*' ag patrún '%s'" -#: refspec.c #, c-format msgid "replacement '%s' has no '*'" msgstr "nÃl aon '*' ag athsholáthar '%s'" -#: remote-curl.c #, c-format msgid "invalid quoting in push-option value: '%s'" msgstr "luachan neamhbhailà i luach brú rogha: '%s'" -#: remote-curl.c #, c-format msgid "unknown value for object-format: %s" msgstr "luach anaithnid d'fhormáid réad: %s" -#: remote-curl.c #, c-format msgid "%sinfo/refs not valid: is this a git repository?" msgstr "NÃl %sinfo/refs bailÃ: an stór git é seo?" -#: remote-curl.c msgid "invalid server response; expected service, got flush packet" msgstr "freagra freastalaà neamhbhailÃ; seirbhÃs a bhÃothas ag súil" -#: remote-curl.c #, c-format msgid "invalid server response; got '%s'" msgstr "freagra freastalaà neamhbhailÃ; fuair '%s'" -#: remote-curl.c #, c-format msgid "repository '%s' not found" msgstr "nÃor aimsÃodh stór '%s'" -#: remote-curl.c #, c-format msgid "Authentication failed for '%s'" msgstr "Theip ar fhÃordheimhniú do '%s'" -#: remote-curl.c #, c-format msgid "unable to access '%s' with http.pinnedPubkey configuration: %s" msgstr "nà féidir rochtain a fháil ar '%s' le cumraÃocht http.pinnedPubkey: %s" -#: remote-curl.c #, c-format msgid "unable to access '%s': %s" msgstr "nà féidir teacht ar '%s': %s" -#: remote-curl.c #, c-format msgid "redirecting to %s" msgstr "atreorú chuig %s" -#: remote-curl.c msgid "shouldn't have EOF when not gentle on EOF" msgstr "nÃor chóir go mbeadh EOF ann nuair nach bhfuil sé miline ar EOF" -#: remote-curl.c msgid "remote server sent unexpected response end packet" msgstr "sheol freastalaà iargúlta paicéad deiridh" -#: remote-curl.c msgid "unable to rewind rpc post data - try increasing http.postBuffer" msgstr "" -"nach féidir sonraà post rpc a athfhillt - déan iarracht http.postBuffer a " +"nà féidir sonraà poist rpc a athchasadh - déan iarracht http.postBuffer a " "mhéadú" -#: remote-curl.c #, c-format msgid "remote-curl: bad line length character: %.4s" msgstr "iargúlta: carachtar fad droch-lÃne: %.4s" -#: remote-curl.c msgid "remote-curl: unexpected response end packet" msgstr "iargúlta: paicéad deiridh freagartha gan choinne" -#: remote-curl.c #, c-format msgid "RPC failed; %s" msgstr "Theip ar RPC; %s" -#: remote-curl.c -msgid "cannot handle pushes this big" -msgstr "nà féidir brú mór seo a láimhseáil" - -#: remote-curl.c #, c-format msgid "cannot deflate request; zlib deflate error %d" msgstr "nà féidir iarratas a dhÃscaoileadh; earráid dÃfhabhtaithe zlib %d" -#: remote-curl.c #, c-format msgid "cannot deflate request; zlib end error %d" msgstr "nà féidir iarratas a dhÃscaoileadh; earráid deiridh zlib %d" -#: remote-curl.c #, c-format msgid "%d bytes of length header were received" msgstr "Fuarthas %d bytes de cheanntásc fad" -#: remote-curl.c #, c-format msgid "%d bytes of body are still expected" msgstr "Táthar ag súil fós ag súil le %d bytes den chorp" -#: remote-curl.c msgid "dumb http transport does not support shallow capabilities" msgstr "nà thacaÃonn iompar HTTP dumb le cumais éadomhain" -#: remote-curl.c msgid "fetch failed." msgstr "theip ar fáil." -#: remote-curl.c msgid "cannot fetch by sha1 over smart http" msgstr "nà féidir le sha1 a fháil thar http cliste" -#: remote-curl.c #, c-format msgid "protocol error: expected sha/ref, got '%s'" msgstr "earráid prótacal: súil le sha/ref, fuair '%s'" -#: remote-curl.c #, c-format msgid "http transport does not support %s" msgstr "nà thacaÃonn iompar http le %s" -#: remote-curl.c msgid "protocol error: expected '<url> <path>', missing space" msgstr "earráid prótacal: súil leis '<url><path>', spás in easnamh" -#: remote-curl.c #, c-format msgid "failed to download file at URL '%s'" msgstr "theip ar an comhad a Ãoslódáil ag URL '%s'" -#: remote-curl.c msgid "git-http-push failed" msgstr "theip ar git-http-push" -#: remote-curl.c msgid "remote-curl: usage: git remote-curl <remote> [<url>]" msgstr "<remote><url>remote-curl: úsáid: git remote-curl []" -#: remote-curl.c msgid "remote-curl: error reading command stream from git" msgstr "remote-curl: earráid ag léamh sruth ordaithe ó git" -#: remote-curl.c msgid "remote-curl: fetch attempted without a local repo" msgstr "remote-curl: iarracht a fháil gan repo áitiúil" -#: remote-curl.c #, c-format msgid "remote-curl: unknown command '%s' from git" msgstr "remote-curl: ordú anaithnid '%s' ó git" -#: remote.c #, c-format msgid "" "reading remote from \"%s/%s\", which is nominated for removal.\n" @@ -25286,57 +21245,46 @@ msgstr "" "Mura féidir leat, cuir in iúl dúinn le do thoil cén fáth a gcaithfidh tú\n" "é a úsáid fós trà rÃomhphost a sheoladh chuig <git@vger.kernel.org>." -#: remote.c #, c-format msgid "config remote shorthand cannot begin with '/': %s" msgstr "nà féidir le '/' tosú le gearrthánach iargúlta config: %s" -#: remote.c msgid "more than one receivepack given, using the first" msgstr "" "nÃos mó ná pacáiste glacadóra amháin a thugtar, ag baint úsáide as an gcéad" -#: remote.c msgid "more than one uploadpack given, using the first" msgstr "" "nÃos mó ná pacáiste uaslódála amháin tugtha, ag baint úsáide as an gcéad" -#: remote.c #, c-format msgid "unrecognized followRemoteHEAD value '%s' ignored" msgstr "neamhaird a dhéanamh ar luach FollowRemoteHead '%s' gan aithint" -#: remote.c #, c-format msgid "unrecognized value transfer.credentialsInUrl: '%s'" msgstr "aistriú luacha transfer.credentialsInUrl: '%s'" -#: remote.c #, c-format msgid "URL '%s' uses plaintext credentials" msgstr "Úsáideann URL '%s' dhintiúir téacs simplÃ" -#: remote.c #, c-format msgid "Cannot fetch both %s and %s to %s" msgstr "Nà féidir %s agus %s a fháil chuig %s" -#: remote.c #, c-format msgid "%s usually tracks %s, not %s" msgstr "Is gnách go rianann %s %s, nà %s" -#: remote.c #, c-format msgid "%s tracks both %s and %s" msgstr "Rianann %s %s agus %s araon" -#: remote.c #, c-format msgid "src refspec %s does not match any" msgstr "src refspec %s nà mheaitseálann aon" -#: remote.c #, c-format msgid "src refspec %s matches more than one" msgstr "meaitseálann src refspec %s nÃos mó ná ceann amháin" @@ -25345,7 +21293,6 @@ msgstr "meaitseálann src refspec %s nÃos mó ná ceann amháin" #. <remote> <src>:<dst>" push, and "being pushed ('%s')" is #. the <src>. #. -#: remote.c #, c-format msgid "" "The destination you provided is not a full refname (i.e.,\n" @@ -25370,7 +21317,6 @@ msgstr "" "NÃor oibrigh ceachtar acu, mar sin thugamar suas. Caithfidh tú an tagairt a " "cháiliú go hiomlán." -#: remote.c #, c-format msgid "" "The <src> part of the refspec is a commit object.\n" @@ -25381,7 +21327,6 @@ msgstr "" "An raibh i gceist agat brainse nua a chruthú trà bhrú chuig\n" "'%s:refs/heads/%s'?" -#: remote.c #, c-format msgid "" "The <src> part of the refspec is a tag object.\n" @@ -25392,7 +21337,6 @@ msgstr "" "An raibh i gceist agat clib nua a chruthú trà bhrú chuig\n" "'%s:refs/tags/%s'?" -#: remote.c #, c-format msgid "" "The <src> part of the refspec is a tree object.\n" @@ -25403,7 +21347,6 @@ msgstr "" "An raibh sé i gceist agat crann nua a chlibeáil trà bhrú chuig\n" "'%s:refs/tags/%s'?" -#: remote.c #, c-format msgid "" "The <src> part of the refspec is a blob object.\n" @@ -25414,105 +21357,90 @@ msgstr "" "An raibh sé i gceist agat blob nua a chlibeáil trà bhrú chuig\n" "'%s:refs/tags/%s'?" -#: remote.c +#, c-format +msgid "" +"The <src> part of the refspec ('%s') is an object ID that doesn't exist.\n" +msgstr "" +"Is aitheantóir réada nach bhfuil ann an chuid <src> den refspec ('%s').\n" + #, c-format msgid "%s cannot be resolved to branch" msgstr "Nà féidir %s a réiteach chuig an mbrainse" -#: remote.c #, c-format msgid "unable to delete '%s': remote ref does not exist" msgstr "nà féidir '%s' a scriosadh: nÃl tagairt iargúlta ann" -#: remote.c #, c-format msgid "dst refspec %s matches more than one" msgstr "meaitseálann dst refspec %s nÃos mó ná ceann amháin" -#: remote.c #, c-format msgid "dst ref %s receives from more than one src" msgstr "faigheann dst ref %s ó nÃos mó ná src amháin" -#: remote.c msgid "HEAD does not point to a branch" msgstr "Nà chuireann HEAD in iúl do bhrainse" -#: remote.c #, c-format msgid "no such branch: '%s'" msgstr "aon bhrainse den sórt sin: '%s'" -#: remote.c #, c-format msgid "no upstream configured for branch '%s'" msgstr "nÃl aon chumrú suas srutha le haghaidh brainse '%s'" -#: remote.c #, c-format msgid "upstream branch '%s' not stored as a remote-tracking branch" msgstr "brainse suas srutha '%s' nach stóráiltear mar bhrainse cianrianaithe" -#: remote.c #, c-format msgid "push destination '%s' on remote '%s' has no local tracking branch" msgstr "" "nÃl aon bhrainse rianaithe áitiúil ag ceann scrÃbe brúite '%s' ar iargúlta " "'%s'" -#: remote.c #, c-format msgid "branch '%s' has no remote for pushing" msgstr "nÃl aon iargúlta ag brainse '%s' chun brú" -#: remote.c #, c-format msgid "push refspecs for '%s' do not include '%s'" msgstr "nà chuimsÃonn '%s' brú refspections do '%s'" -#: remote.c msgid "push has no destination (push.default is 'nothing')" msgstr "nÃl aon cheann scrÃbe ag brú (is é 'rud ar bith' push.default)" -#: remote.c msgid "cannot resolve 'simple' push to a single destination" msgstr "nà féidir brú 'simplÃ' a réiteach chuig ceann scrÃbe amháin" -#: remote.c #, c-format msgid "couldn't find remote ref %s" msgstr "nà raibh in ann tagairt iargúlta %s a fháil" -#: remote.c #, c-format msgid "* Ignoring funny ref '%s' locally" msgstr "* Ag neamhaird den tagairt ghreannmhar '%s' go háitiúil" -#: remote.c #, c-format msgid "Your branch is based on '%s', but the upstream is gone.\n" msgstr "Tá do bhrainse bunaithe ar '%s', ach tá an suas sruth imithe.\n" -#: remote.c msgid " (use \"git branch --unset-upstream\" to fixup)\n" msgstr " (bain úsáid as \"git branch --unset-upstream\" chun é a dheisiú)\n" -#: remote.c #, c-format msgid "Your branch is up to date with '%s'.\n" msgstr "Tá do bhrainse cothrom le dáta le '%s'.\n" -#: remote.c #, c-format msgid "Your branch and '%s' refer to different commits.\n" msgstr "TagraÃonn do bhrainse agus '%s' do thiomnuithe difriúla.\n" -#: remote.c #, c-format msgid " (use \"%s\" for details)\n" msgstr " (bain úsáid as \"%s\" le haghaidh sonraÃ)\n" -#: remote.c #, c-format msgid "Your branch is ahead of '%s' by %d commit.\n" msgid_plural "Your branch is ahead of '%s' by %d commits.\n" @@ -25520,11 +21448,9 @@ msgstr[0] "Tá do bhrainse chun tosaigh ar '%s' le tiomantas %d.\n" msgstr[1] "Tá do bhrainse chun tosaigh ar '%s' le tiomantais %d.\n" msgstr[2] "Tá do bhrainse chun tosaigh ar '%s' le tiomantais %d.\n" -#: remote.c msgid " (use \"git push\" to publish your local commits)\n" msgstr " (bain úsáid as “git push†chun do thiomanta áitiúla a fhoilsiú)\n" -#: remote.c #, c-format msgid "Your branch is behind '%s' by %d commit, and can be fast-forwarded.\n" msgid_plural "" @@ -25539,11 +21465,9 @@ msgstr[2] "" "Tá do bhrainse taobh thiar de '%s' faoi %d tiomnuithe, agus is féidir é a " "luasghéarú ar aghaidh.\n" -#: remote.c msgid " (use \"git pull\" to update your local branch)\n" msgstr " (bain úsáid as “git pull†chun do bhrainse áitiúil a nuashonrú)\n" -#: remote.c #, c-format msgid "" "Your branch and '%s' have diverged,\n" @@ -25561,148 +21485,172 @@ msgstr[2] "" "Tá do bhrainse agus '%s' scartha óna chéile,\n" "agus tá %d agus %d tiomnuithe difriúla acu faoi seach.\n" -#: remote.c msgid "" " (use \"git pull\" if you want to integrate the remote branch with yours)\n" msgstr "" " (bain úsáid as “git pull†más mian leat an brainse iargúlta a chomhtháthú " "le leatsa)\n" -#: remote.c #, c-format msgid "cannot parse expected object name '%s'" msgstr "nà féidir ainm réad a bhfuil súil leis '%s' a pharsáil" -#: remote.c #, c-format msgid "cannot strip one component off url '%s'" msgstr "nà féidir comhpháirt amháin a bhaint as url '%s'" -#: replace-object.c +#, c-format +msgid "cannot open index for %s" +msgstr "nà féidir innéacs a oscailt do %s" + +#, c-format +msgid "pack %s too large to consider in geometric progression" +msgstr "pacáiste %s ró-mhór le breithniú i ddul chun cinn geo" + +#, c-format +msgid "pack %s too large to roll up" +msgstr "pacáiste %s ró-mhór le rolladh suas" + +#, c-format +msgid "could not open tempfile %s for writing" +msgstr "nà fhéadfaà teachtaireacht %s a oscailt le haghaidh scrÃobh" + +msgid "could not close refs snapshot tempfile" +msgstr "nà raibh in ann tempfile snapshot refs a dhúnadh" + +#, c-format +msgid "could not remove stale bitmap: %s" +msgstr "nà fhéadfaà bitmap seasta a bhaint: %s" + +msgid "could not start pack-objects to repack promisor objects" +msgstr "nà fhéadfaà rudaà pacáiste a thosú chun rudaà gealltanna a athphacáil" + +msgid "failed to feed promisor objects to pack-objects" +msgstr "theip ar rudaà gealltanna a bheathú ar rudaà pacáiste" + +msgid "repack: Expecting full hex object ID lines only from pack-objects." +msgstr "" +"athphacáil: Ag súil le lÃnte aitheantais réad heicseach iomlána ach ó " +"phacáistÃ." + +msgid "could not finish pack-objects to repack promisor objects" +msgstr "" +"nà fhéadfadh sé rudaà pacáiste a chrÃochnú chun rudaà geallta a athphacáil" + +#, c-format +msgid "pack prefix %s does not begin with objdir %s" +msgstr "nà thosaÃonn réimÃr pacáiste %s le objdir %s" + +#, c-format +msgid "renaming pack to '%s' failed" +msgstr "theip ar phacáiste a athainmniú go '%s'" + +#, c-format +msgid "pack-objects did not write a '%s' file for pack %s-%s" +msgstr "nÃor scrÃobh pack-objects comhad '%s' do phacáiste %s-%s" + +#, c-format +msgid "could not unlink: %s" +msgstr "nà fhéadfaà dÃcheangal: %s" + #, c-format msgid "bad replace ref name: %s" msgstr "droch-ainm tagartha athsholáthair: %s" -#: replace-object.c #, c-format msgid "duplicate replace ref: %s" msgstr "athsholáthar dúblach tagairt: %s" -#: replace-object.c #, c-format msgid "replace depth too high for object %s" msgstr "doimhneacht ró-ard a chur in ionad do réad %s" -#: rerere.c msgid "corrupt MERGE_RR" msgstr "truaillithe MERGE_RR" -#: rerere.c msgid "unable to write rerere record" -msgstr "in ann taifead a scrÃobh arÃs" +msgstr "nà féidir taifead rerere a scrÃobh" -#: rerere.c #, c-format msgid "there were errors while writing '%s' (%s)" msgstr "bhà earráidà ann agus tú ag scrÃobh '%s' (%s)" -#: rerere.c #, c-format msgid "could not parse conflict hunks in '%s'" msgstr "nà fhéadfaà coimhlint a pharsáil i '%s'" -#: rerere.c #, c-format msgid "failed utime() on '%s'" msgstr "theip ar utime () ar '%s'" -#: rerere.c #, c-format msgid "writing '%s' failed" msgstr "theip ar scrÃobh '%s'" -#: rerere.c #, c-format msgid "Staged '%s' using previous resolution." msgstr "'%s 'céim ag baint úsáide as réiteach roimhe seo." -#: rerere.c #, c-format msgid "Recorded resolution for '%s'." msgstr "Réiteach taifeadta le haghaidh '%s'." -#: rerere.c #, c-format msgid "Resolved '%s' using previous resolution." msgstr "Réitigh '%s' ag úsáid réiteach roimhe seo." -#: rerere.c #, c-format msgid "cannot unlink stray '%s'" msgstr "nà féidir le '%s' a dhÃnascadh" -#: rerere.c #, c-format msgid "Recorded preimage for '%s'" msgstr "RéamhÃomhá taifeadta do '%s'" -#: rerere.c #, c-format msgid "failed to update conflicted state in '%s'" msgstr "theip ar an stát coinbhleachta a nuashonrú i '%s'" -#: rerere.c #, c-format msgid "no remembered resolution for '%s'" msgstr "nÃl aon réiteach cuimhne ar '%s'" -#: rerere.c #, c-format msgid "Updated preimage for '%s'" msgstr "RéamhÃomhá nuashonraithe do '%s'" -#: rerere.c #, c-format msgid "Forgot resolution for '%s'\n" msgstr "Déan dearmad dearmad ar réiteach '%s'\n" -#: rerere.c msgid "unable to open rr-cache directory" -msgstr "in ann eolaire rr-cache a oscailt" +msgstr "nà féidir an t-eolaire rr-cache a oscailt" -#: rerere.h msgid "update the index with reused conflict resolution if possible" msgstr "an t-innéacs a nuashonrú le réiteach coinbhleachta a athúsáidtear" -#: reset.c msgid "could not determine HEAD revision" msgstr "nà raibh sé in ann athbhreithniú HEAD" -#: reset.c sequencer.c #, c-format msgid "failed to find tree of %s" msgstr "theip ar chrann %s a aimsiú" -#: revision.c #, c-format msgid "unsupported section for hidden refs: %s" msgstr "rannán gan tacaÃocht do thaifeanna i bhfolach: %s" -#: revision.c msgid "--exclude-hidden= passed more than once" msgstr "--exclude-hidden= rith nÃos mó ná uair amháin" -#: revision.c #, c-format msgid "resolve-undo records `%s` which is missing" msgstr "taifid réitigh a chealú `%s` atá ar iarraidh" -#: revision.c #, c-format msgid "%s exists but is a symbolic ref" msgstr "Tá %s ann ach is tagairt siombalach é" -#: revision.c msgid "" "--merge requires one of the pseudorefs MERGE_HEAD, CHERRY_PICK_HEAD, " "REVERT_HEAD or REBASE_HEAD" @@ -25710,144 +21658,111 @@ msgstr "" "TeastaÃonn --merge ceann de na pseudorefs MERGE_HEAD, CHERRY_PICK_HEAD, " "REVERT_HEAD nó REBASE_HEAD" -#: revision.c #, c-format msgid "could not get commit for --ancestry-path argument %s" msgstr "nà fhéadfaà tiomantas a fháil le haghaidh argóint --ancestry-path %s" -#: revision.c msgid "--unpacked=<packfile> no longer supported" msgstr "--unpacked=<packfile> nà thacaÃtear leis a thuilleadh" -#: revision.c #, c-format msgid "invalid option '%s' in --stdin mode" -msgstr "rogha neamhbhailà '%s' i mód --stdin" +msgstr "rogha neamhbhailà '%s' in --stdin mode" -#: revision.c msgid "your current branch appears to be broken" msgstr "is cosúil go bhfuil do bhrainse reatha briste" -#: revision.c #, c-format msgid "your current branch '%s' does not have any commits yet" msgstr "nÃl aon gealltanais fós ag do bhrainse reatha '%s'" -#: revision.c msgid "object filtering requires --objects" msgstr "teastaÃonn scagadh réad --objects" -#: revision.c msgid "-L does not yet support diff formats besides -p and -s" msgstr "Nà thacaÃonn -L le formáidà diff fós seachas -p agus -s" -#: run-command.c #, c-format msgid "cannot create async thread: %s" msgstr "nà féidir snáithe async a chruthú: %s" -#: scalar.c worktree.c #, c-format msgid "'%s' does not exist" msgstr "NÃl '%s' ann" -#: scalar.c #, c-format msgid "could not switch to '%s'" msgstr "nà fhéadfaà aistriú go '%s'" -#: scalar.c msgid "need a working directory" msgstr "teastaÃonn eolaire oibre" -#: scalar.c msgid "Scalar enlistments require a worktree" msgstr "TeastaÃonn crann oibre ó liostú scalar" -#: scalar.c #, c-format msgid "could not configure %s=%s" msgstr "nà fhéadfaà %s=%s a chumrú" -#: scalar.c msgid "could not configure log.excludeDecoration" msgstr "nà fhéadfaà log.excludeDecoration a chumrú" -#: scalar.c msgid "could not add enlistment" msgstr "nà fhéadfaà liostú a chur leis" -#: scalar.c msgid "could not set recommended config" msgstr "nà fhéadfaà cumraÃocht mholta a shocrú" -#: scalar.c msgid "could not toggle maintenance" msgstr "nÃorbh fhéidir cothabháil a athrú" -#: scalar.c msgid "could not start the FSMonitor daemon" msgstr "nà fhéadfaà an daemon FSMonitor a thosú" -#: scalar.c msgid "could not turn off maintenance" msgstr "nà fhéadfadh cothabháil a mhúchadh" -#: scalar.c msgid "could not remove enlistment" msgstr "nà fhéadfaà liostú a bhaint" -#: scalar.c #, c-format msgid "remote HEAD is not a branch: '%.*s'" msgstr "nà brainse é iargúlta HEAD: '%.*s" -#: scalar.c msgid "failed to get default branch name from remote; using local default" msgstr "" "theip ar ainm brainse réamhshocraithe a fháil ó iargúlta; ag baint úsáide as" -#: scalar.c msgid "failed to get default branch name" msgstr "theip ort ainm brainse réamhshocraithe a fháil" -#: scalar.c msgid "failed to unregister repository" msgstr "theip ar stór a dhÃchlárú" -#: scalar.c msgid "failed to stop the FSMonitor daemon" msgstr "theip ar an daemon FSMonitor a stopadh" -#: scalar.c msgid "failed to delete enlistment directory" msgstr "theip ar eolaire liostála a scriosadh" -#: scalar.c msgid "branch to checkout after clone" msgstr "brainse chun an tseiceáil tar éis clóin" -#: scalar.c msgid "when cloning, create full working directory" msgstr "agus tú ag clónú, cruthaigh eolaire oibre iomlán" -#: scalar.c msgid "only download metadata for the branch that will be checked out" msgstr "meiteashonraà a Ãoslódáil ach don bhrainse a sheiceálfar" -#: scalar.c msgid "create repository within 'src' directory" msgstr "cruthaigh stór laistigh de eolaire 'src'" -#: scalar.c msgid "specify if tags should be fetched during clone" msgstr "sonraigh an gcaithfear clibeanna a fháil le linn clóin" -#: scalar.c msgid "specify if background maintenance should be enabled" msgstr "sonraigh an bhfuil cothabháil chúlra le cumasú" -#: scalar.c msgid "" "scalar clone [--single-branch] [--branch <main-branch>] [--full-clone]\n" "\t[--[no-]src] [--[no-]tags] [--[no-]maintenance] <url> [<enlistment>]" @@ -25855,69 +21770,54 @@ msgstr "" "clón scálach [--single-branch] [--branch <prÃomhbhrainse>] [--full-clone]\n" "[--[no-]src] [--[no-]tags] [--[no-]maintenance] <url> [<liostáil>]" -#: scalar.c #, c-format msgid "cannot deduce worktree name from '%s'" msgstr "nà féidir ainm crann oibre a bhaint as '%s'" -#: scalar.c #, c-format msgid "directory '%s' exists already" msgstr "tá eolaire '%s' ann cheana féin" -#: scalar.c #, c-format msgid "failed to get default branch for '%s'" msgstr "theip ar bhrainse réamhshocraithe a fháil do '%s'" -#: scalar.c #, c-format msgid "could not configure remote in '%s'" msgstr "nà fhéadfaà iargúlta a chumrú i '%s'" -#: scalar.c #, c-format msgid "could not disable tags in '%s'" msgstr "nà fhéadfaà clibeanna a dhÃchumasú i '%s'" -#: scalar.c #, c-format msgid "could not configure '%s'" msgstr "nà fhéadfaà '%s' a chumrú" -#: scalar.c msgid "partial clone failed; attempting full clone" msgstr "theip ar chlón páirteach; iarracht clón iomlán" -#: scalar.c msgid "could not configure for full clone" msgstr "nà fhéadfaà a chumrú le haghaidh clón iomlán" -#: scalar.c msgid "scalar diagnose [<enlistment>]" msgstr "<enlistment>diagnóis scalar []" -#: scalar.c msgid "`scalar list` does not take arguments" msgstr "Nà ghlacann `liosta scalar` argóintÃ" -#: scalar.c msgid "scalar register [--[no-]maintenance] [<enlistment>]" msgstr "clár scálach [--[gan-]chothabháil] [<liostáil>]" -#: scalar.c msgid "reconfigure all registered enlistments" msgstr "gach liostáil cláraithe a athchumrú" -#: scalar.c msgid "(enable|disable|keep)" msgstr "(cumasaigh|dÃchumasaigh|coinnigh)" -#: scalar.c msgid "signal how to adjust background maintenance" msgstr "comhartha a thabhairt maidir le conas cothabháil chúlra a choigeartú" -#: scalar.c msgid "" "scalar reconfigure [--maintenance=(enable|disable|keep)] [--all | " "<enlistment>]" @@ -25925,41 +21825,33 @@ msgstr "" "scalar reconfigure [--maintenance=(enable|disable|keep)] [--all | " "<enlistment>]" -#: scalar.c msgid "--all or <enlistment>, but not both" msgstr "--all nó <enlistment>, ach nà an dá cheann" -#: scalar.c #, c-format msgid "unknown mode for --maintenance option: %s" msgstr "mód anaithnid don rogha --maintenance: %s" -#: scalar.c #, c-format msgid "could not remove stale scalar.repo '%s'" msgstr "nà fhéadfaà scalar.repo '%s' a bhaint as scalar.repo" -#: scalar.c #, c-format msgid "removed stale scalar.repo '%s'" msgstr "bainte scale scalar.repo '%s'" -#: scalar.c #, c-format msgid "repository at '%s' has different owner" msgstr "tá úinéir difriúil ag an stórlann ag '%s'" -#: scalar.c #, c-format msgid "repository at '%s' has a format issue" msgstr "tá ceist formáide ag stór ag '%s'" -#: scalar.c #, c-format msgid "repository not found in '%s'" msgstr "nà bhfuarthas stór i '%s'" -#: scalar.c #, c-format msgid "" "to unregister this repository from Scalar, run\n" @@ -25968,7 +21860,6 @@ msgstr "" "chun an stór seo a dhÃchlárú ó Scalar, reáchtáil\n" " git config --global --unset --fixed-value scalar.repo “%sâ€" -#: scalar.c msgid "" "scalar run <task> [<enlistment>]\n" "Tasks:\n" @@ -25976,49 +21867,38 @@ msgstr "" "rith scalar <tasc> [<liostáil>]\n" "Tascanna:\n" -#: scalar.c #, c-format msgid "no such task: '%s'" msgstr "gan aon tasc den sórt sin: '%s'" -#: scalar.c msgid "scalar unregister [<enlistment>]" msgstr "<enlistment>scálar dÃchlárú []" -#: scalar.c msgid "scalar delete <enlistment>" msgstr "scriosadh scalar <enlistment>" -#: scalar.c msgid "refusing to delete current working directory" msgstr "diúltú eolaire oibre reatha a scriosadh" -#: scalar.c msgid "include Git version" msgstr "leagan Git san áireamh" -#: scalar.c msgid "include Git's build options" msgstr "áireamh roghanna tógála Git" -#: scalar.c msgid "scalar verbose [-v | --verbose] [--build-options]" msgstr "scalar verbose [-v | --verbose] [--build-options]" -#: scalar.c msgid "-C requires a <directory>" msgstr "ÉilÃonn -C a <directory>" -#: scalar.c #, c-format msgid "could not change to '%s'" msgstr "nà fhéadfaà athrú go '%s'" -#: scalar.c msgid "-c requires a <key>=<value> argument" msgstr "<value>ÉilÃonn -c a <key>= argóint" -#: scalar.c msgid "" "scalar [-C <directory>] [-c <key>=<value>] <command> [<options>]\n" "\n" @@ -26028,41 +21908,32 @@ msgstr "" "\n" "Orduithe:\n" -#: send-pack.c msgid "unexpected flush packet while reading remote unpack status" msgstr "paicéad srutháin gan choinne agus stádas dÃphacála iargúlta" -#: send-pack.c #, c-format msgid "unable to parse remote unpack status: %s" -msgstr "nach féidir stádas iargúlta dÃphacáil a pháirseáil: %s" +msgstr "nà féidir stádas dÃphacála iargúlta a pharsáil: %s" -#: send-pack.c #, c-format msgid "remote unpack failed: %s" msgstr "theip ar dhÃphacáil iargúlta: %s" -#: send-pack.c msgid "failed to sign the push certificate" msgstr "theip ar an deimhniú brú a shÃniú" -#: send-pack.c msgid "send-pack: unable to fork off fetch subprocess" msgstr "pacáiste seolta: nà féidir leis an bhfophróiseas faighte a fhorc" -#: send-pack.c msgid "push negotiation failed; proceeding anyway with push" msgstr "theip ar chaibidlÃocht brú; dul ar aghaidh ar aon nós" -#: send-pack.c msgid "the receiving end does not support this repository's hash algorithm" msgstr "nà thacaÃonn an deireadh glacadh le halgartam hash an stór seo" -#: send-pack.c msgid "the receiving end does not support --signed push" msgstr "nà thacaÃonn an deireadh glacadh le brú --signed" -#: send-pack.c msgid "" "not sending a push certificate since the receiving end does not support --" "signed push" @@ -26070,42 +21941,33 @@ msgstr "" "nÃl teastas brú á sheoladh ós rud é nach dtacaÃonn an taobh glactha le --" "signed brúigh" -#: send-pack.c msgid "the receiving end does not support --atomic push" msgstr "nà thacaÃonn an deireadh glacadh le brú --atomic" -#: send-pack.c msgid "the receiving end does not support push options" msgstr "nà thacaÃonn an deireadh glacadh le roghanna brú" -#: sequencer.c #, c-format msgid "invalid commit message cleanup mode '%s'" msgstr "modh glantacháin teachtaireachta tiomanta neamhbhailà '%s'" -#: sequencer.c #, c-format msgid "could not delete '%s'" msgstr "nà fhéadfaà '%s' a scriosadh" -#: sequencer.c msgid "revert" msgstr "filleadh" -#: sequencer.c msgid "cherry-pick" msgstr "pioc silÃnÃ" -#: sequencer.c msgid "rebase" msgstr "athbhunú" -#: sequencer.c #, c-format msgid "unknown action: %d" msgstr "gnÃomh anaithnid: %d" -#: sequencer.c msgid "" "Resolve all conflicts manually, mark them as resolved with\n" "\"git add/rm <conflicted_files>\", then run \"git rebase --continue\".\n" @@ -26120,7 +21982,6 @@ msgstr "" "Chun abordú agus dul ar ais go dtà an stát roimh “git rebaseâ€, reáchtáil " "“git rebase --abortâ€." -#: sequencer.c msgid "" "after resolving the conflicts, mark the corrected paths\n" "with 'git add <paths>' or 'git rm <paths>'" @@ -26128,7 +21989,6 @@ msgstr "" "tar éis na coinbhleachtaà a réiteach, marcáil na cosáin cearta\n" "<paths>le 'git add <paths>'nó 'git rm'" -#: sequencer.c msgid "" "After resolving the conflicts, mark them with\n" "\"git add/rm <pathspec>\", then run\n" @@ -26145,7 +22005,6 @@ msgstr "" "Chun abordú agus dul ar ais go dtà an stát roimh “git cherry-pickâ€,\n" "reáchtáil “git cherry-pick --abortâ€." -#: sequencer.c msgid "" "After resolving the conflicts, mark them with\n" "\"git add/rm <pathspec>\", then run\n" @@ -26163,86 +22022,68 @@ msgstr "" "revertâ€,\n" "reáchtáil “git revert --abortâ€." -#: sequencer.c #, c-format msgid "could not lock '%s'" msgstr "nà fhéadfaà '%s' a ghlasáil" -#: sequencer.c #, c-format msgid "could not write eol to '%s'" msgstr "nà fhéadfaà eol a scrÃobh chuig '%s'" -#: sequencer.c #, c-format msgid "failed to finalize '%s'" msgstr "theip ar '%s' a chur i gcrÃch" -#: sequencer.c #, c-format msgid "your local changes would be overwritten by %s." msgstr "d'athruithe áitiúla a fhorscrÃobhadh ag %s." -#: sequencer.c msgid "commit your changes or stash them to proceed." msgstr "do chuid athruithe a dhéanamh nó iad a stóráil chun dul ar aghaidh." #. TRANSLATORS: %s will be "revert", "cherry-pick" or #. "rebase". #. -#: sequencer.c #, c-format msgid "%s: Unable to write new index file" msgstr "%s: Nà féidir comhad innéacs nua a scrÃobh" -#: sequencer.c msgid "unable to update cache tree" -msgstr "in ann crann taisce a nuashonrú" +msgstr "nà féidir crann taisce a nuashonrú" -#: sequencer.c msgid "could not resolve HEAD commit" msgstr "nà fhéadfaà tiomantas HEAD a réiteach" -#: sequencer.c #, c-format msgid "no key present in '%.*s'" msgstr "nÃl aon eochair i láthair i '%.*s" -#: sequencer.c #, c-format msgid "unable to dequote value of '%s'" -msgstr "nach féidir luach '%s' a dhÃchur" +msgstr "nà féidir luach '%s' a dhÃlua" -#: sequencer.c msgid "'GIT_AUTHOR_NAME' already given" msgstr "'GIT_AUTHOR_NAME' tugtha cheana féin" -#: sequencer.c msgid "'GIT_AUTHOR_EMAIL' already given" msgstr "'GIT_AUTHOR_EMAIL' tugtha cheana féin" -#: sequencer.c msgid "'GIT_AUTHOR_DATE' already given" msgstr "'GIT_AUTHOR_DATE' tugtha cheana féin" -#: sequencer.c #, c-format msgid "unknown variable '%s'" msgstr "athróg anaithnid '%s'" -#: sequencer.c msgid "missing 'GIT_AUTHOR_NAME'" msgstr "ar iarraidh 'GIT_AUTHOR_NAME'" -#: sequencer.c msgid "missing 'GIT_AUTHOR_EMAIL'" msgstr "ar iarraidh 'GIT_AUTHOR_EMAIL'" -#: sequencer.c msgid "missing 'GIT_AUTHOR_DATE'" msgstr "ar iarraidh 'GIT_AUTHOR_DATE'" -#: sequencer.c #, c-format msgid "" "you have staged changes in your working tree\n" @@ -26272,11 +22113,9 @@ msgstr "" "\n" " git rebase --continue\n" -#: sequencer.c msgid "'prepare-commit-msg' hook failed" msgstr "Theip ar chroà 'prepar-chommit-msg'" -#: sequencer.c msgid "" "Your name and email address were configured automatically based\n" "on your username and hostname. Please check that they are accurate.\n" @@ -26306,7 +22145,6 @@ msgstr "" "\n" " git commit --amend --reset-author\n" -#: sequencer.c msgid "" "Your name and email address were configured automatically based\n" "on your username and hostname. Please check that they are accurate.\n" @@ -26332,184 +22170,145 @@ msgstr "" "\n" " git commit --amend --reset-author\n" -#: sequencer.c msgid "couldn't look up newly created commit" msgstr "nà fhéadfadh sé gealltanas nua-chruthaithe a fheiceáil" -#: sequencer.c msgid "could not parse newly created commit" msgstr "nà fhéadfadh sé gealltanas nua-chruthaithe a pháirsÃ" -#: sequencer.c msgid "unable to resolve HEAD after creating commit" -msgstr "in ann HEAD a réiteach tar éis tiomantas a chruthú" +msgstr "nà féidir HEAD a réiteach tar éis tiomantas a chruthú" -#: sequencer.c msgid "detached HEAD" msgstr "scoite CEANN" -#: sequencer.c msgid " (root-commit)" msgstr " (fréamh-thiomantas)" -#: sequencer.c msgid "could not parse HEAD" msgstr "nà fhéadfaà HEAD a pháirseáil" -#: sequencer.c #, c-format msgid "HEAD %s is not a commit!" msgstr "Nà gealltanas é HEAD %s!" -#: sequencer.c msgid "unable to parse commit author" msgstr "nà féidir leis an údar tiomanta a pharsáil" -#: sequencer.c #, c-format msgid "unable to read commit message from '%s'" -msgstr "nach féidir teachtaireacht tiomanta ó '%s' a léamh" +msgstr "nà féidir teachtaireacht tiomnaithe ó '%s' a léamh" -#: sequencer.c #, c-format msgid "invalid author identity '%s'" msgstr "aitheantas údair neamhbhailà '%s'" -#: sequencer.c msgid "corrupt author: missing date information" msgstr "údar truaillithe: faisnéis dáta in easnamh" -#: sequencer.c #, c-format msgid "could not update %s" msgstr "nà fhéadfaà %s a nuashonrú" -#: sequencer.c #, c-format msgid "could not parse parent commit %s" msgstr "nà fhéadfaà tuismitheoir tiomantas %s a pharsáil" -#: sequencer.c #, c-format msgid "unknown command: %d" msgstr "ordú anaithnid: %d" -#: sequencer.c msgid "This is the 1st commit message:" msgstr "Seo an chéad teachtaireacht tiomanta:" -#: sequencer.c #, c-format msgid "This is the commit message #%d:" msgstr "Seo an teachtaireacht tiomanta #%d:" -#: sequencer.c msgid "The 1st commit message will be skipped:" msgstr "Scaipfear an chéad teachtaireacht tiomanta:" -#: sequencer.c #, c-format msgid "The commit message #%d will be skipped:" msgstr "Scaipfear an teachtaireacht tiomanta #%d:" -#: sequencer.c #, c-format msgid "This is a combination of %d commits." msgstr "Is meascán de ghealltanais %d é seo." -#: sequencer.c #, c-format msgid "cannot write '%s'" msgstr "nà féidir '%s' a scrÃobh" -#: sequencer.c msgid "need a HEAD to fixup" msgstr "teastaÃonn CEAD ag teastáil chun socrú" -#: sequencer.c msgid "could not read HEAD" msgstr "nà raibh in ann HEAD a léamh" -#: sequencer.c msgid "could not read HEAD's commit message" msgstr "nà raibh sé in ann teachtaireacht tiomanta HEAD a léamh" -#: sequencer.c #, c-format msgid "could not read commit message of %s" msgstr "nà raibh sé in ann teachtaireacht tiomanta %s a léamh" -#: sequencer.c msgid "your index file is unmerged." msgstr "tá do chomhad innéacs neamh-chumasaithe." -#: sequencer.c msgid "cannot fixup root commit" msgstr "nà féidir le déanamh fréimhe a shocrú" -#: sequencer.c #, c-format msgid "commit %s is a merge but no -m option was given." msgstr "cumasc é tiomnú %s ach nÃor tugadh rogha -m." -#: sequencer.c #, c-format msgid "commit %s does not have parent %d" msgstr "commiteáil %s nÃl tuismitheoir %d aige" -#: sequencer.c #, c-format msgid "cannot get commit message for %s" msgstr "nà féidir teachtaireacht tiomanta a fháil do %s" #. TRANSLATORS: The first %s will be a "todo" command like #. "revert" or "pick", the second %s a SHA1. -#: sequencer.c #, c-format msgid "%s: cannot parse parent commit %s" msgstr "%s: nà féidir le tuismitheoir tiomantas %s a pharsáil" -#: sequencer.c #, c-format msgid "could not revert %s... %s" msgstr "nà raibh ann %s a chur ar ais... %s" -#: sequencer.c #, c-format msgid "could not apply %s... %s" msgstr "nà fhéadfaà %s a chur i bhfeidhm... %s" -#: sequencer.c #, c-format msgid "dropping %s %s -- patch contents already upstream\n" msgstr "scaoileadh %s %s -- ábhar paiste suas an sruth cheana féin\n" -#: sequencer.c #, c-format msgid "git %s: failed to read the index" msgstr "git %s: theip ar an t-innéacs a léamh" -#: sequencer.c #, c-format msgid "git %s: failed to refresh the index" msgstr "git %s: theip ar an t-innéacs a athnuachan" -#: sequencer.c #, c-format msgid "'%s' is not a valid label" msgstr "Nà lipéad bailà é '%s'" -#: sequencer.c #, c-format msgid "'%s' is not a valid refname" msgstr "Nà athainm bailà é '%s'" -#: sequencer.c #, c-format msgid "update-ref requires a fully qualified refname e.g. refs/heads/%s" msgstr "teastaÃonn athainm iomlán cáilithe uasghabháilte e.g. refs/heads/%s" -#: sequencer.c #, c-format msgid "'%s' does not accept merge commits" msgstr "Nà ghlacann '%s' le gealltanais cumaisc" @@ -26517,7 +22316,6 @@ msgstr "Nà ghlacann '%s' le gealltanais cumaisc" #. TRANSLATORS: 'pick' and 'merge -C' should not be #. translated. #. -#: sequencer.c msgid "" "'pick' does not take a merge commit. If you wanted to\n" "replay the merge, use 'merge -C' on the commit." @@ -26528,7 +22326,6 @@ msgstr "" #. TRANSLATORS: 'reword' and 'merge -c' should not be #. translated. #. -#: sequencer.c msgid "" "'reword' does not take a merge commit. If you wanted to\n" "replay the merge and reword the commit message, use\n" @@ -26542,7 +22339,6 @@ msgstr "" #. TRANSLATORS: 'edit', 'merge -C' and 'break' should #. not be translated. #. -#: sequencer.c msgid "" "'edit' does not take a merge commit. If you wanted to\n" "replay the merge, use 'merge -C' on the commit, and then\n" @@ -26555,148 +22351,115 @@ msgstr "" "'brise' chun an rialú a thabhairt ar ais duit ionas gur féidir leat\n" "déan 'git commit --amend && git rebase --continue'." -#: sequencer.c msgid "cannot squash merge commit into another commit" msgstr "nà féidir le squash tiomantas a chumasc i dtiomantas eile" -#: sequencer.c #, c-format msgid "invalid command '%.*s'" msgstr "ordú neamhbhailà '%.*s" -#: sequencer.c #, c-format msgid "missing arguments for %s" msgstr "argóintà atá in easnamh do %s" -#: sequencer.c #, c-format msgid "could not parse '%s'" msgstr "nà fhéadfaà '%s' a pháirseáil" -#: sequencer.c #, c-format msgid "invalid line %d: %.*s" msgstr "lÃne neamhbhailà %d: %.*s" -#: sequencer.c #, c-format msgid "cannot '%s' without a previous commit" msgstr "nà féidir '%s' gan gealltanas roimhe seo" -#: sequencer.c msgid "cancelling a cherry picking in progress" msgstr "piocadh silÃnà atá ar siúl a chur ar ceal" -#: sequencer.c msgid "cancelling a revert in progress" msgstr "filleadh atá ar siúl a chealú" -#: sequencer.c msgid "please fix this using 'git rebase --edit-todo'." msgstr "" "déan é seo a shocrú le do thoil ag baint úsáide as 'git rebase --edit-todo'." -#: sequencer.c #, c-format msgid "unusable instruction sheet: '%s'" msgstr "bileog treoracha neamhúsáidte: '%s'" -#: sequencer.c msgid "no commits parsed." msgstr "nÃl aon gealltanais paráilsithe." -#: sequencer.c msgid "cannot cherry-pick during a revert." msgstr "nà féidir le silÃnà a phiocadh le linn filleadh." -#: sequencer.c msgid "cannot revert during a cherry-pick." msgstr "nà féidir filleadh ar ais le linn pioc silÃnÃ." -#: sequencer.c msgid "unusable squash-onto" msgstr "squash-on neamhúsáidte" -#: sequencer.c #, c-format msgid "malformed options sheet: '%s'" msgstr "bileog roghanna mÃfhoirmithe: '%s'" -#: sequencer.c msgid "empty commit set passed" msgstr "rith tacar tiomanta folamh" -#: sequencer.c msgid "revert is already in progress" msgstr "tá filleadh ar siúl cheana féin" -#: sequencer.c #, c-format msgid "try \"git revert (--continue | %s--abort | --quit)\"" msgstr "bain triail as “git revert (--continue | %s--abort | --quit)â€" -#: sequencer.c msgid "cherry-pick is already in progress" msgstr "tá pioc silÃnà ar siúl cheana féin" -#: sequencer.c #, c-format msgid "try \"git cherry-pick (--continue | %s--abort | --quit)\"" msgstr "bain triail as “git cherry-pick (--continue | %s--abort | --quit)â€" -#: sequencer.c #, c-format msgid "could not create sequencer directory '%s'" msgstr "nà fhéadfaà eolaire seicheamhach '%s' a chruthú" -#: sequencer.c msgid "no cherry-pick or revert in progress" msgstr "nÃl aon phiocadh silÃnà nó filleadh ar siúl ar siúl" -#: sequencer.c msgid "cannot resolve HEAD" msgstr "nà féidir le HEAD a réiteach" -#: sequencer.c msgid "cannot abort from a branch yet to be born" msgstr "nà féidir éirà as brainse nach rugadh fós" -#: sequencer.c #, c-format msgid "cannot read '%s': %s" msgstr "nà féidir '%s' a léamh: %s" -#: sequencer.c msgid "unexpected end of file" msgstr "deireadh gan choinne an chomhaid" -#: sequencer.c #, c-format msgid "stored pre-cherry-pick HEAD file '%s' is corrupt" msgstr "tá comhad HEAD réamh-phiocadh silÃnà stóráilte '%s' truaillithe" -#: sequencer.c msgid "You seem to have moved HEAD. Not rewinding, check your HEAD!" msgstr "Is cosúil gur bhogadh tú CEANN. Gan athfhillte, seiceáil do CHEANN!" -#: sequencer.c msgid "no revert in progress" msgstr "nÃl aon fhilleadh ar siúl" -#: sequencer.c msgid "no cherry-pick in progress" msgstr "nÃl aon phiocadh silÃnà ar siúl" -#: sequencer.c msgid "failed to skip the commit" msgstr "theip ar an gealltanas a scipeáil" -#: sequencer.c msgid "there is nothing to skip" msgstr "nÃl aon rud le scipeáil" -#: sequencer.c #, c-format msgid "" "have you committed already?\n" @@ -26705,15 +22468,12 @@ msgstr "" "an ndearna tú tiomanta cheana féin?\n" "bain triail as “git %s --continueâ€" -#: sequencer.c msgid "cannot read HEAD" msgstr "nà féidir le HEAD a léamh" -#: sequencer.c msgid "could not write commit message file" msgstr "nà raibh sé in ann comhad teachtaireachta tiomanta a" -#: sequencer.c #, c-format msgid "" "You can amend the commit now, with\n" @@ -26732,22 +22492,18 @@ msgstr "" "\n" " git rebase --continue\n" -#: sequencer.c #, c-format msgid "Could not apply %s... %.*s" msgstr "NÃorbh fhéidir iarratas a dhéanamh %s... %.*s" -#: sequencer.c #, c-format msgid "Could not merge %.*s" msgstr "NÃorbh fhéidir cumasc %.*s" -#: sequencer.c #, c-format msgid "Executing: %s\n" msgstr "ForghnÃomhú: %s\n" -#: sequencer.c #, c-format msgid "" "execution failed: %s\n" @@ -26761,11 +22517,9 @@ msgstr "" "\n" " git rebase --continue\n" -#: sequencer.c msgid "and made changes to the index and/or the working tree.\n" msgstr "agus rinne siad athruithe ar an innéacs agus/nó ar an gcrann oibre.\n" -#: sequencer.c #, c-format msgid "" "execution succeeded: %s\n" @@ -26782,57 +22536,45 @@ msgstr "" " git rebase --continue\n" "\n" -#: sequencer.c #, c-format msgid "illegal label name: '%.*s'" msgstr "ainm lipéid neamhdhleathach: '%.*s'" -#: sequencer.c #, c-format msgid "could not resolve '%s'" msgstr "nà fhéadfaà '%s' a réiteach" -#: sequencer.c msgid "writing fake root commit" msgstr "tiomantas fréamh bréige a scrÃobh" -#: sequencer.c msgid "writing squash-onto" msgstr "scrÃobh squash-on" -#: sequencer.c msgid "cannot merge without a current revision" msgstr "nà féidir a chumasc gan athbhreithniú reatha" -#: sequencer.c #, c-format msgid "unable to parse '%.*s'" -msgstr "nach féidir le parsáil a dhéanamh '%.*s" +msgstr "nà féidir '%.*s' a pharsáil" -#: sequencer.c #, c-format msgid "nothing to merge: '%.*s'" msgstr "nÃl aon rud le cumasc: '%.*s'" -#: sequencer.c msgid "octopus merge cannot be executed on top of a [new root]" msgstr "nà féidir cumaisc ochtair a fhorghnÃomhú ar bharr [fréamh nua]" -#: sequencer.c #, c-format msgid "could not get commit message of '%s'" msgstr "nà fhéadfaà teachtaireacht tiomanta de '%s' a fháil" -#: sequencer.c #, c-format msgid "could not even attempt to merge '%.*s'" msgstr "nÃorbh fhéidir fiú iarracht a dhéanamh '%.*s' a chumasc" -#: sequencer.c msgid "merge: Unable to write new index file" msgstr "cumaisc: Nà féidir comhad innéacs nua a scrÃobh" -#: sequencer.c #, c-format msgid "" "another 'rebase' process appears to be running; '%s.lock' already exists" @@ -26840,7 +22582,6 @@ msgstr "" "is cosúil go bhfuil próiseas 'rebase' eile ag rith; tá '%s.lock' ann cheana " "féin" -#: sequencer.c #, c-format msgid "" "Updated the following refs with %s:\n" @@ -26849,7 +22590,6 @@ msgstr "" "NuashonraÃodh na hifrÃochtaà seo a leanas le %s:\n" "%s" -#: sequencer.c #, c-format msgid "" "Failed to update the following refs with %s:\n" @@ -26858,40 +22598,32 @@ msgstr "" "Theip ar na hiarratais seo a leanas a nuashonrú le %s:\n" "%s" -#: sequencer.c msgid "Cannot autostash" msgstr "Nà féidir uathoibriú" -#: sequencer.c #, c-format msgid "Unexpected stash response: '%s'" msgstr "Freagra stash gan choinne: '%s'" -#: sequencer.c #, c-format msgid "Could not create directory for '%s'" msgstr "Nà fhéadfaà eolaire a chruthú do '%s'" -#: sequencer.c #, c-format msgid "Created autostash: %s\n" msgstr "Autostash cruthaithe: %s\n" -#: sequencer.c msgid "could not reset --hard" msgstr "nà fhéadfaà athshocrú --hard" -#: sequencer.c #, c-format msgid "Applied autostash.\n" msgstr "Autostash feidhmithe.\n" -#: sequencer.c #, c-format msgid "cannot store %s" msgstr "nà féidir %s a stóráil" -#: sequencer.c #, c-format msgid "" "%s\n" @@ -26903,33 +22635,26 @@ msgstr "" "Is féidir leat \"git stash pop\" nó \"git stash drop\" a rith ag am ar " "bith.\n" -#: sequencer.c msgid "Applying autostash resulted in conflicts." msgstr "Bhà coinbhleachtaà mar thoradh ar autostash i bhfeidhm." -#: sequencer.c msgid "Autostash exists; creating a new stash entry." msgstr "Tá Autostash ann; ag cruthú iontráil nua stash." -#: sequencer.c msgid "autostash reference is a symref" msgstr "is é tagairt autostash ina symref" -#: sequencer.c msgid "could not detach HEAD" msgstr "nà fhéadfadh CEAD a dhÃcheangal" -#: sequencer.c #, c-format msgid "Stopped at HEAD\n" msgstr "Stopadh ag HEAD\n" -#: sequencer.c #, c-format msgid "Stopped at %s\n" msgstr "Stop ag %s\n" -#: sequencer.c #, c-format msgid "" "Could not execute the todo command\n" @@ -26951,58 +22676,46 @@ msgstr "" " git rebase --edit-todo\n" " git rebase --continue\n" -#: sequencer.c #, c-format msgid "Stopped at %s... %.*s\n" msgstr "Stopadh ag %s... %.*s\n" -#: sequencer.c #, c-format msgid "Rebasing (%d/%d)%s" msgstr "Ag athbhunú (%d/%d) %s" -#: sequencer.c #, c-format msgid "unknown command %d" msgstr "ordú anaithnid %d" -#: sequencer.c msgid "could not read orig-head" msgstr "nà raibh sé in ann ceann orig-head a léamh" -#: sequencer.c msgid "could not read 'onto'" msgstr "nà fhéadfaà 'ar' léamh" -#: sequencer.c #, c-format msgid "could not update HEAD to %s" msgstr "nà fhéadfaà HEAD a nuashonrú go %s" -#: sequencer.c #, c-format msgid "Successfully rebased and updated %s.\n" msgstr "Athbhunaithe agus nuashonraithe %s go rathúil.\n" -#: sequencer.c msgid "cannot rebase: You have unstaged changes." msgstr "nà féidir athbhunú: Tá athruithe gan stáitse agat." -#: sequencer.c msgid "cannot amend non-existing commit" msgstr "nà féidir gealltanas nach bhfuil ann a leasú" -#: sequencer.c #, c-format msgid "invalid file: '%s'" msgstr "comhad neamhbhailÃ: '%s'" -#: sequencer.c #, c-format msgid "invalid contents: '%s'" msgstr "ábhar neamhbhailÃ: '%s'" -#: sequencer.c msgid "" "\n" "You have uncommitted changes in your working tree. Please, commit them\n" @@ -27013,74 +22726,58 @@ msgstr "" "iad\n" "ar dtús agus ansin rith 'git rebase --continue' arÃs." -#: sequencer.c #, c-format msgid "could not write file: '%s'" msgstr "nà fhéadfaà comhad a scrÃobh: '%s'" -#: sequencer.c msgid "could not remove CHERRY_PICK_HEAD" msgstr "nà fhéadfaà CHERRY_PICK_HEAD a bhaint" -#: sequencer.c msgid "could not commit staged changes." msgstr "nà fhéadfadh athruithe stáitse a dhéanamh." -#: sequencer.c #, c-format msgid "%s: can't cherry-pick a %s" msgstr "%s: nà féidir %s a roghnú silÃnÃ" -#: sequencer.c #, c-format msgid "%s: bad revision" msgstr "%s: droch-athbhreithniú" -#: sequencer.c msgid "can't revert as initial commit" msgstr "nà féidir teacht ar ais mar thiomantas tosaigh" -#: sequencer.c #, c-format msgid "skipped previously applied commit %s" -msgstr "scipeáil tiomantas %s a cuireadh i bhfeidhm" +msgstr "scipeáil an tiomnú a cuireadh i bhfeidhm roimhe seo %s" -#: sequencer.c msgid "use --reapply-cherry-picks to include skipped commits" msgstr "" "bain úsáid as --reapply-cherry-picks chun gealltanais scipeáilte a áireamh" -#: sequencer.c msgid "make_script: unhandled options" msgstr "make_script: roghanna neamh-láimhseáilte" -#: sequencer.c msgid "make_script: error preparing revisions" msgstr "make_script: earráid ag ullmhú athbhreithnithe" -#: sequencer.c msgid "nothing to do" msgstr "aon rud le déanamh" -#: sequencer.c msgid "could not skip unnecessary pick commands" msgstr "nà fhéadfadh orduithe pioc gan ghá a scipeáil" -#: sequencer.c msgid "the script was already rearranged." msgstr "athshocraÃodh an script cheana féin." -#: sequencer.c #, c-format msgid "update-refs file at '%s' is invalid" msgstr "tá comhad update-refs ag '%s' neamhbhailÃ" -#: setup.c #, c-format msgid "'%s' is outside repository at '%s'" msgstr "Tá '%s' an stór lasmuigh ag '%s'" -#: setup.c #, c-format msgid "" "%s: no such path in the working tree.\n" @@ -27090,7 +22787,6 @@ msgstr "" "Úsáid 'git <command>--<path>... 'chun cosáin nach bhfuil ann go háitiúil a " "shonrú." -#: setup.c #, c-format msgid "" "ambiguous argument '%s': unknown revision or path not in the working tree.\n" @@ -27102,12 +22798,10 @@ msgstr "" "Úsáid '--' chun cosáin a scaradh ó athbhreithnithe, mar seo:\n" "'git <command>[<revision>...] -- [<file>...] '" -#: setup.c #, c-format msgid "option '%s' must come before non-option arguments" msgstr "caithfidh rogha '%s' teacht roimh argóintà neamh-rogha" -#: setup.c #, c-format msgid "" "ambiguous argument '%s': both revision and filename\n" @@ -27118,95 +22812,74 @@ msgstr "" "Úsáid '--' chun cosáin a scaradh ó athbhreithnithe, mar seo:\n" "'git <command>[<revision>...] -- [<file>...] '" -#: setup.c msgid "unable to set up work tree using invalid config" msgstr "" -"in ann crann oibre a chur ar bun ag baint úsáide as cumraÃocht nebhailÃ" +"nà féidir crann oibre a bhunú ag baint úsáide as cumraÃocht neamhbhailÃ" -#: setup.c #, c-format msgid "'%s' already specified as '%s'" msgstr "'%s' sonraithe cheana féin mar '%s'" -#: setup.c #, c-format msgid "Expected git repo version <= %d, found %d" msgstr "Leagan repo git ag súil leis <= %d, aimsÃodh %d" -#: setup.c msgid "unknown repository extension found:" msgid_plural "unknown repository extensions found:" msgstr[0] "sÃneadh stórais anaithnid aimsithe:" msgstr[1] "sÃntà stórais anaithnide aimsithe:" msgstr[2] "sÃntà stórais anaithnide aimsithe:" -#: setup.c msgid "repo version is 0, but v1-only extension found:" msgid_plural "repo version is 0, but v1-only extensions found:" msgstr[0] "is é leagan repo 0, ach fuarthas sÃneadh v1 amháin:" msgstr[1] "is é 0 an leagan den stór, ach fuarthas sÃntà v1 amháin:" msgstr[2] "is é 0 an leagan den stór, ach fuarthas sÃntà v1 amháin:" -#: setup.c #, c-format msgid "error opening '%s'" msgstr "earráid ag oscailt '%s'" -#: setup.c #, c-format msgid "too large to be a .git file: '%s'" msgstr "ró-mhór le bheith ina chomhad .git: '%s'" -#: setup.c #, c-format msgid "error reading %s" msgstr "earráid ag léamh %s" -#: setup.c #, c-format msgid "invalid gitfile format: %s" msgstr "formáid gitfile neamhbhailÃ: %s" -#: setup.c #, c-format msgid "no path in gitfile: %s" msgstr "gan aon chosán i gitfile: %s" -#: setup.c #, c-format msgid "not a git repository: %s" msgstr "nà stór git: %s" -#: setup.c #, c-format msgid "'$%s' too big" msgstr "'$%s' ró-mhór" -#: setup.c #, c-format msgid "not a git repository: '%s'" msgstr "nà stór git: '%s'" -#: setup.c #, c-format msgid "cannot chdir to '%s'" msgstr "nà féidir teacht ar '%s'" -#: setup.c -msgid "cannot come back to cwd" -msgstr "nà féidir teacht ar ais chuig cwd" - -#: setup.c #, c-format msgid "failed to stat '%*s%s%s'" msgstr "theip ar '%*s%s%s' a thaispeáint" -#: setup.c #, c-format msgid "safe.directory '%s' not absolute" msgstr "nÃl safe.directory '%s' iomlán" -#: setup.c #, c-format msgid "" "detected dubious ownership in repository at '%s'\n" @@ -27219,21 +22892,17 @@ msgstr "" "\n" "git config --global --add safe.directory %s" -#: setup.c msgid "Unable to read current working directory" msgstr "Nà féidir eolaire oibre reatha a léamh" -#: setup.c #, c-format msgid "cannot change to '%s'" msgstr "nà féidir athrú go '%s'" -#: setup.c #, c-format msgid "not a git repository (or any of the parent directories): %s" msgstr "nà stór git (nó aon cheann de na tuismitheoireolairÃ): %s" -#: setup.c #, c-format msgid "" "not a git repository (or any parent up to mount point %s)\n" @@ -27243,12 +22912,10 @@ msgstr "" "Stopadh ag teorainn an chórais chomhaid (nÃl GIT_DISCOVERY_ACROSS_FILESYSTEM " "socraithe)." -#: setup.c #, c-format msgid "cannot use bare repository '%s' (safe.bareRepository is '%s')" msgstr "nà féidir stór lom '%s' a úsáid (safe.bareRepository is '%s')" -#: setup.c #, c-format msgid "" "problem with core.sharedRepository filemode value (0%.3o).\n" @@ -27258,174 +22925,141 @@ msgstr "" "Nà mór ceadanna léite agus scrÃbhneoireachta a bheith ag úinéir na gcomhad i " "gcónaÃ." -#: setup.c msgid "fork failed" msgstr "theip ar fhorc" -#: setup.c msgid "setsid failed" msgstr "theip ar setsid" -#: setup.c #, c-format msgid "cannot stat template '%s'" msgstr "nà féidir teacht ar theimpléad '%s'" -#: setup.c #, c-format msgid "cannot opendir '%s'" msgstr "nà féidir '%s' a oscailt" -#: setup.c #, c-format msgid "cannot readlink '%s'" msgstr "nà féidir nasc '%s' a léamh" -#: setup.c #, c-format msgid "cannot symlink '%s' '%s'" msgstr "nà féidir '%s' '' %s 'a nascadh" -#: setup.c #, c-format msgid "cannot copy '%s' to '%s'" msgstr "nà féidir '%s' a chóipeáil chuig '%s'" -#: setup.c #, c-format msgid "ignoring template %s" msgstr "ag neamhaird den teimpléad %s" -#: setup.c #, c-format msgid "templates not found in %s" msgstr "teimpléid gan aimsiú i %s" -#: setup.c #, c-format msgid "not copying templates from '%s': %s" msgstr "gan teimpléid a chóipeáil ó '%s': %s" -#: setup.c #, c-format msgid "invalid initial branch name: '%s'" msgstr "ainm brainse tosaigh neamhbhailÃ: '%s'" -#: setup.c #, c-format msgid "re-init: ignored --initial-branch=%s" msgstr "ath-init: neamhaird a dhéanamh ar --initial-branch=%s" -#: setup.c #, c-format msgid "unable to handle file type %d" -msgstr "in ann cineál comhad %d a láimhseáil" +msgstr "nà féidir cineál comhaid %d a láimhseáil" -#: setup.c #, c-format msgid "unable to move %s to %s" -msgstr "nach féidir %s a bhogadh go %s" +msgstr "nà féidir %s a bhogadh go %s" -#: setup.c msgid "attempt to reinitialize repository with different hash" msgstr "iarracht a dhéanamh stór a aththionsú le hash difriúil" -#: setup.c msgid "" "attempt to reinitialize repository with different reference storage format" msgstr "" "iarracht a dhéanamh stór a aththionsú le formáid stórála tagartha difriúil" -#: setup.c #, c-format msgid "%s already exists" msgstr "Tá %s ann cheana féin" -#: setup.c #, c-format msgid "Reinitialized existing shared Git repository in %s%s\n" msgstr "Stórlann Git roinnte atá ann cheana a athsheoladh i %s%s\n" -#: setup.c #, c-format msgid "Reinitialized existing Git repository in %s%s\n" msgstr "AththionscnaÃodh stór Git atá ann cheana i %s%s\n" -#: setup.c #, c-format msgid "Initialized empty shared Git repository in %s%s\n" msgstr "Stórlann Git roinnte folamh tosaithe i %s%s\n" -#: setup.c #, c-format msgid "Initialized empty Git repository in %s%s\n" msgstr "Stórlann Git folamh tosaithe i %s%s\n" -#: sparse-index.c #, c-format msgid "index entry is a directory, but not sparse (%08x)" msgstr "is eolaire é iontráil innéacs, ach nà neamhchoitianta (%08x)" -#: split-index.c msgid "cannot use split index with a sparse index" msgstr "nà féidir innéacs scoilte a úsáid le hinnéacs neamhchoitianta" #. TRANSLATORS: The first %s is a command like "ls-tree". -#: strbuf.c #, c-format msgid "bad %s format: element '%s' does not start with '('" msgstr "fhormáid olc %s: nà thosaÃonn eilimint '%s' le '('" #. TRANSLATORS: The first %s is a command like "ls-tree". -#: strbuf.c #, c-format msgid "bad %s format: element '%s' does not end in ')'" msgstr "droch-fhormáid %s: nà chrÃochnaÃonn eilimint '%s' i ')'" #. TRANSLATORS: %s is a command like "ls-tree". -#: strbuf.c #, c-format msgid "bad %s format: %%%.*s" msgstr "fhormáid %s olc: %%%.*s" #. TRANSLATORS: IEC 80000-13:2008 gibibyte -#: strbuf.c #, c-format msgid "%u.%2.2u GiB" msgstr "%u.%2.2u GiB" #. TRANSLATORS: IEC 80000-13:2008 gibibyte/second -#: strbuf.c #, c-format msgid "%u.%2.2u GiB/s" msgstr "%u.%2.2u GiB/s" #. TRANSLATORS: IEC 80000-13:2008 mebibyte -#: strbuf.c #, c-format msgid "%u.%2.2u MiB" msgstr "%u.%2.2u MiB" #. TRANSLATORS: IEC 80000-13:2008 mebibyte/second -#: strbuf.c #, c-format msgid "%u.%2.2u MiB/s" msgstr "%u.%2.2u MiB/s" #. TRANSLATORS: IEC 80000-13:2008 kibibyte -#: strbuf.c #, c-format msgid "%u.%2.2u KiB" msgstr "%u.%2.2u KiB" #. TRANSLATORS: IEC 80000-13:2008 kibibyte/second -#: strbuf.c #, c-format msgid "%u.%2.2u KiB/s" msgstr "%u.%2.2u KiB/s" #. TRANSLATORS: IEC 80000-13:2008 byte -#: strbuf.c #, c-format msgid "%u byte" msgid_plural "%u bytes" @@ -27434,7 +23068,6 @@ msgstr[1] "%u beart" msgstr[2] "%u beart" #. TRANSLATORS: IEC 80000-13:2008 byte/second -#: strbuf.c #, c-format msgid "%u byte/s" msgid_plural "%u bytes/s" @@ -27442,64 +23075,52 @@ msgstr[0] "%u beart/s" msgstr[1] "%u beart/s" msgstr[2] "%u beart/s" -#: submodule-config.c #, c-format msgid "ignoring suspicious submodule name: %s" msgstr "ag déanamh neamhaird d'ainm fo-mhodúil amhrasach: %s" -#: submodule-config.c msgid "negative values not allowed for submodule.fetchJobs" msgstr "luachanna diúltacha nach gceadaÃtear le haghaidh submodule.fetchJobs" -#: submodule-config.c #, c-format msgid "ignoring '%s' which may be interpreted as a command-line option: %s" msgstr "" "neamhaird a dhéanamh ar '%s' ar féidir a léirmhÃniú mar rogha lÃne ordaithe: " "%s" -#: submodule-config.c #, c-format msgid "Could not update .gitmodules entry %s" msgstr "Nà fhéadfaà iontráil.gitmodules %s a nuashonrú" -#: submodule.c msgid "Cannot change unmerged .gitmodules, resolve merge conflicts first" msgstr "" "Nà féidir .gitmodules neamh-chumhdaithe a athrú, coinbhleachtaà cumaisc a " "réiteach" -#: submodule.c #, c-format msgid "Could not find section in .gitmodules where path=%s" msgstr "" "NÃorbh fhéidir an rannóg a aimsiú i .gitmodules áit a bhfuil an cosán = %s" -#: submodule.c #, c-format msgid "Could not remove .gitmodules entry for %s" msgstr "Nà fhéadfaà iontráil.gitmodules a bhaint do %s" -#: submodule.c msgid "staging updated .gitmodules failed" msgstr "theip ar stáisiú nuashonraithe .gitmodules" -#: submodule.c #, c-format msgid "in unpopulated submodule '%s'" msgstr "i bhfo-mhodúl neamhdhaonra '%s'" -#: submodule.c #, c-format msgid "Pathspec '%s' is in submodule '%.*s'" msgstr "Tá pathspec '%s' i bhfo-mhodúl '%.*s" -#: submodule.c #, c-format msgid "bad --ignore-submodules argument: %s" msgstr "argóint olc --ignore-submodules: %s" -#: submodule.c #, c-format msgid "" "Submodule in commit %s at path: '%s' collides with a submodule named the " @@ -27508,12 +23129,10 @@ msgstr "" "Fo-mhodúl i dtiomantas %s ag an gcosán: imbhuaileann '%s' le fo-mhodúl darb " "ainm mar an gcéanna. Ag scipeáil é." -#: submodule.c #, c-format msgid "submodule entry '%s' (%s) is a %s, not a commit" msgstr "is %s é iontráil an fhomhodúil '%s' (%s), nà tiomnú" -#: submodule.c #, c-format msgid "" "Could not run 'git rev-list <commits> --not --remotes -n 1' command in " @@ -27522,42 +23141,34 @@ msgstr "" "Nà raibh an t-ordú 'git rev-list <commits>--not --remotes -n 1' a reáchtáil " "i bhfo-mhodúl %s" -#: submodule.c #, c-format msgid "process for submodule '%s' failed" msgstr "theip ar phróiseas le haghaidh fo-mhodúl '%s'" -#: submodule.c #, c-format msgid "Pushing submodule '%s'\n" msgstr "Ag brú an fho-mhodúil '%s'\n" -#: submodule.c #, c-format msgid "Unable to push submodule '%s'\n" msgstr "Nà féidir an fho-mhodúl '%s' a bhrú\n" -#: submodule.c #, c-format msgid "Fetching submodule %s%s\n" msgstr "Ag fáil fo-mhodúl %s%s\n" -#: submodule.c #, c-format msgid "Could not access submodule '%s'\n" msgstr "NÃorbh fhéidir rochtain a fháil ar fho-mhodúl '%s'\n" -#: submodule.c #, c-format msgid "Could not access submodule '%s' at commit %s\n" msgstr "NÃorbh fhéidir rochtain a fháil ar fho-mhodúl '%s' ag tiomantas %s\n" -#: submodule.c #, c-format msgid "Fetching submodule %s%s at commit %s\n" msgstr "Ag fáil fo-mhodúl %s%s ag an tiomnú %s\n" -#: submodule.c #, c-format msgid "" "Errors during submodule fetch:\n" @@ -27566,72 +23177,58 @@ msgstr "" "Earráidà le linn teacht fo-mhodúil:\n" "%s" -#: submodule.c #, c-format msgid "'%s' not recognized as a git repository" msgstr "Nà aithnÃtear '%s' mar stór git" -#: submodule.c #, c-format msgid "Could not run 'git status --porcelain=2' in submodule %s" msgstr "Nà féidir 'git status --porcelain=2' a reáchtáil i bhfo-mhodúl %s" -#: submodule.c #, c-format msgid "'git status --porcelain=2' failed in submodule %s" msgstr "Theip ar 'git status --porcelain=2' i bhfo-mhodúl %s" -#: submodule.c #, c-format msgid "could not start 'git status' in submodule '%s'" msgstr "nà fhéadfaà 'git status' a thosú i bhfo-mhodúl '%s'" -#: submodule.c #, c-format msgid "could not run 'git status' in submodule '%s'" msgstr "nà fhéadfaà 'git status' a reáchtáil i bhfo-mhodúl '%s'" -#: submodule.c #, c-format msgid "Could not unset core.worktree setting in submodule '%s'" msgstr "Nà fhéadfaà socrú core.worktree a dhÃshocrú i bhfo-mhodúl '%s'" -#: submodule.c #, c-format msgid "could not recurse into submodule '%s'" msgstr "nà fhéadfaà athshlánú isteach i bhfo-mhodúl '%s'" -#: submodule.c msgid "could not reset submodule index" msgstr "nà fhéadfadh innéacs fo-mhodúil a athshocrú" -#: submodule.c #, c-format msgid "submodule '%s' has dirty index" msgstr "tá innéacs salach ag fo-mhodúl '%s'" -#: submodule.c #, c-format msgid "Submodule '%s' could not be updated." msgstr "Nà fhéadfaà fo-mhodúl '%s' a nuashonrú." -#: submodule.c #, c-format msgid "submodule git dir '%s' is inside git dir '%.*s'" msgstr "tá fo-mhodúl git dir '%s' taobh istigh de git dir '%.*s" -#: submodule.c #, c-format msgid "expected '%.*s' in submodule path '%s' not to be a symbolic link" msgstr "" "ag súil leis '%.*s' i gcosán fo-mhodúil '%s' gan a bheith ina nasc siombalach" -#: submodule.c #, c-format msgid "expected submodule path '%s' not to be a symbolic link" msgstr "ag súil nach mbeidh cosán fo-mhodúil '%s' ina nasc siombalach" -#: submodule.c #, c-format msgid "" "relocate_gitdir for submodule '%s' with more than one worktree not supported" @@ -27639,17 +23236,14 @@ msgstr "" "relocate_gitdir le haghaidh fo-mhodúil '%s' le nÃos mó ná crann oibre amháin " "nach dtacaÃtear leis" -#: submodule.c #, c-format msgid "could not lookup name for submodule '%s'" msgstr "nà fhéadfaà ainm a lorg don fho-mhodúl '%s'" -#: submodule.c #, c-format msgid "refusing to move '%s' into an existing git dir" msgstr "diúltú '%s' a bhogadh isteach i git dir atá ann cheana" -#: submodule.c #, c-format msgid "" "Migrating git directory of '%s%s' from\n" @@ -27660,120 +23254,95 @@ msgstr "" "'%s' go\n" "'%s'\n" -#: submodule.c msgid "could not start ls-files in .." msgstr "nà fhéadfaà ls-files a thosú i.." -#: submodule.c #, c-format msgid "ls-tree returned unexpected return code %d" msgstr "d’fhill an crann ls cód fillte gan choinne %d" -#: symlinks.c #, c-format msgid "failed to lstat '%s'" msgstr "theip ar lstat '%s'" -#: t/helper/test-bundle-uri.c msgid "no remote configured to get bundle URIs from" msgstr "gan aon iargúlta cumraithe chun URIs beartán a fháil ó" -#: t/helper/test-bundle-uri.c msgid "could not get the bundle-uri list" msgstr "nà raibh in ann an liosta bundle-uri a fháil" -#: t/helper/test-cache-tree.c msgid "test-tool cache-tree <options> (control|prime|update)" msgstr "test-tool cache-tree <options> (control|prime|update)" -#: t/helper/test-cache-tree.c msgid "clear the cache tree before each iteration" msgstr "glan an crann taisce roimh gach athrú" -#: t/helper/test-cache-tree.c msgid "number of entries in the cache tree to invalidate (default 0)" msgstr "" "lÃon na n-iontrálacha sa chrann taisce le neamhbhailà (réamhshocraithe 0)" -#: t/helper/test-pack-deltas.c msgid "the number of objects to write" msgstr "lÃon na rudaà le scrÃobh" -#: t/helper/test-path-walk.c msgid "test-tool path-walk <options> -- <revision-options>" msgstr "test-tool path-walk <options> -- <revision-options>" -#: t/helper/test-path-walk.c msgid "toggle inclusion of blob objects" msgstr "cuimsiú rudaà blob a thógáil" -#: t/helper/test-path-walk.c msgid "toggle inclusion of commit objects" msgstr "toggle áireamh rudaà tiomanta" -#: t/helper/test-path-walk.c msgid "toggle inclusion of tag objects" msgstr "cuimsiú rudaà clibeanna a thosc" -#: t/helper/test-path-walk.c msgid "toggle inclusion of tree objects" msgstr "cuimsiú rudaà crann a thógáil" -#: t/helper/test-path-walk.c msgid "toggle pruning of uninteresting paths" msgstr "bearradh cosáin neamh-spéisiúla a thosú" -#: t/helper/test-path-walk.c +msgid "toggle aggressive edge walk" +msgstr "siúlóid imeall ionsaitheach a scoránaigh" + msgid "read a pattern list over stdin" msgstr "léigh liosta patrún thar stdin" -#: t/helper/test-reach.c #, c-format msgid "commit %s is not marked reachable" msgstr "nach bhfuil comhordú %s marcáilte inrochtana" -#: t/helper/test-reach.c msgid "too many commits marked reachable" msgstr "an iomarca gealltanais atá marcáilte inrochtana" -#: t/helper/test-read-midx.c msgid "could not determine MIDX preferred pack" msgstr "nà fhéadfaà pacáiste is fearr MIDX a chinneadh" -#: t/helper/test-serve-v2.c msgid "test-tool serve-v2 [<options>]" msgstr "test-tool serve-v2 [<options>]" -#: t/helper/test-serve-v2.c msgid "exit immediately after advertising capabilities" msgstr "imeacht dÃreach tar éis cumais fógraÃochta" -#: t/helper/test-simple-ipc.c msgid "test-helper simple-ipc is-active [<name>] [<options>]" msgstr "<name><options>tá cúntóir tástála simple-ipc gnÃomhach [] []" -#: t/helper/test-simple-ipc.c msgid "test-helper simple-ipc run-daemon [<name>] [<threads>]" msgstr "<name><threads>cúntóir tástála simple-ipc run-daemon [] []" -#: t/helper/test-simple-ipc.c msgid "test-helper simple-ipc start-daemon [<name>] [<threads>] [<max-wait>]" msgstr "" "<name><threads><max-wait>cúntóir tástála simple-ipc tosaigh daemon [] [] []" -#: t/helper/test-simple-ipc.c msgid "test-helper simple-ipc stop-daemon [<name>] [<max-wait>]" msgstr "<name><max-wait>cúntóir tástála simple-ipc stad-daemon [] []" -#: t/helper/test-simple-ipc.c msgid "test-helper simple-ipc send [<name>] [<token>]" msgstr "<name><token>cúntóir tástála simple-ipc seol [] []" -#: t/helper/test-simple-ipc.c msgid "test-helper simple-ipc sendbytes [<name>] [<bytecount>] [<byte>]" msgstr "<name><bytecount><byte>test-helper simple-ipc sendbytes [] [] []" -#: t/helper/test-simple-ipc.c msgid "" "test-helper simple-ipc multiple [<name>] [<threads>] [<bytecount>] " "[<batchsize>]" @@ -27781,99 +23350,76 @@ msgstr "" "test-helper simple-ipc multiple [<name>] [<threads>] [<bytecount>] " "[<batchsize>]" -#: t/helper/test-simple-ipc.c msgid "name or pathname of unix domain socket" msgstr "ainm nó ainm cosán soicéad fearainn unix" -#: t/helper/test-simple-ipc.c msgid "named-pipe name" msgstr "ainm pÃopa ainmnithe" -#: t/helper/test-simple-ipc.c msgid "number of threads in server thread pool" msgstr "lÃon na snáitheanna i linn snáithe freastalaÃ" -#: t/helper/test-simple-ipc.c msgid "seconds to wait for daemon to start or stop" msgstr "soicind chun fanacht go dtosóidh nó stopfaidh an daemon" -#: t/helper/test-simple-ipc.c msgid "number of bytes" msgstr "lÃon na mbetaÃ" -#: t/helper/test-simple-ipc.c msgid "number of requests per thread" msgstr "lÃon iarratais in aghaidh an snáithe" -#: t/helper/test-simple-ipc.c msgid "byte" -msgstr "bith" +msgstr "beart" -#: t/helper/test-simple-ipc.c msgid "ballast character" msgstr "carachtar balasta" -#: t/helper/test-simple-ipc.c msgid "token" msgstr "comhartha" -#: t/helper/test-simple-ipc.c msgid "command token to send to the server" msgstr "comhartha ordaithe le seoladh chuig an bhfreastalaÃ" -#: t/unit-tests/unit-test.c msgid "unit-test [<options>]" msgstr "unit-test [<options>]" -#: t/unit-tests/unit-test.c msgid "immediately exit upon the first failed test" msgstr "imeacht láithreach ar an gcéad tástáil theip" -#: t/unit-tests/unit-test.c msgid "suite[::test]" msgstr "suite [::test]" -#: t/unit-tests/unit-test.c msgid "run only test suite or individual test <suite[::test]>" msgstr "reáchtáil ach sraith tástála nó tástáil aonair <suite [::test] >" -#: t/unit-tests/unit-test.c msgid "suite" msgstr "svuÃt" -#: t/unit-tests/unit-test.c msgid "exclude test suite <suite>" msgstr "sraith tástála a eisiamh <suite>" -#: trailer.c #, c-format msgid "running trailer command '%s' failed" msgstr "theip ar an ordú leantóir '%s' a rith" -#: trailer.c #, c-format msgid "unknown value '%s' for key '%s'" msgstr "luach anaithnid '%s' don eochair '%s'" -#: trailer.c #, c-format msgid "empty trailer token in trailer '%.*s'" msgstr "comhartha leantóra folamh i leantóir '%.*s'" -#: transport-helper.c msgid "full write to remote helper failed" msgstr "theip ar scrÃobh iomlán chuig cianchúntóir" -#: transport-helper.c #, c-format msgid "unable to find remote helper for '%s'" -msgstr "in ann cúntóir iargúlta a aimsiú do '%s'" +msgstr "nà féidir cúntóir iargúlta a aimsiú do '%s'" -#: transport-helper.c msgid "can't dup helper output fd" msgstr "nà féidir le aschur cúntóra fd a dhéanamh" -#: transport-helper.c #, c-format msgid "" "unknown mandatory capability %s; this remote helper probably needs newer " @@ -27882,117 +23428,92 @@ msgstr "" "cumas éigeantach anaithnid %s; is dócha go mbeidh leagan nÃos nuaà de Git ag " "teastáil ó" -#: transport-helper.c msgid "this remote helper should implement refspec capability" msgstr "ba cheart go gcuirfeadh an cúntóir cianda seo cumas refspec" -#: transport-helper.c #, c-format msgid "%s unexpectedly said: '%s'" msgstr "Dúirt %s gan choinne: '%s'" -#: transport-helper.c #, c-format msgid "%s also locked %s" msgstr "Glas %s freisin %s" -#: transport-helper.c msgid "couldn't run fast-import" msgstr "nà raibh in ann allmhairiú tapa a reá" -#: transport-helper.c msgid "error while running fast-import" msgstr "earráid agus iompórtáil tapa á rith" -#: transport-helper.c #, c-format msgid "could not read ref %s" msgstr "nà raibh in ann tagairt %s a léamh" -#: transport-helper.c #, c-format msgid "unknown response to connect: %s" msgstr "freagra anaithnid chun nascadh: %s" -#: transport-helper.c msgid "setting remote service path not supported by protocol" -msgstr "cosán seirbhÃse iargúlta a shocrú nach dtacaÃonn" +msgstr "nà thacaÃonn prótacal le cosán seirbhÃse cianda a shocrú" -#: transport-helper.c msgid "invalid remote service path" msgstr "cosán seirbhÃse iargúlta" -#: transport-helper.c #, c-format msgid "can't connect to subservice %s" msgstr "nà féidir nasc a dhéanamh le fo-sheirbhÃs %s" -#: transport-helper.c transport.c msgid "--negotiate-only requires protocol v2" msgstr "--negotiate-only ag teastáil prótacal v2" -#: transport-helper.c msgid "'option' without a matching 'ok/error' directive" msgstr "'roghan' gan treoir 'ok/earráid' a mheaitseáil" -#: transport-helper.c #, c-format msgid "expected ok/error, helper said '%s'" msgstr "súil le ok/earráid, dúirt an cúntóir '%s'" -#: transport-helper.c #, c-format msgid "helper reported unexpected status of %s" msgstr "thuairiscigh cúntóir stádas gan choinne %s" -#: transport-helper.c #, c-format msgid "helper %s does not support dry-run" -msgstr "nà thacaÃonn cúntóir %s le rith tirim" +msgstr "nà thacaÃonn cúntóir %s le dry-run" -#: transport-helper.c #, c-format msgid "helper %s does not support --signed" msgstr "nà thacaÃonn cúntóir %s le --signed" -#: transport-helper.c #, c-format msgid "helper %s does not support --signed=if-asked" -msgstr "nà thacaÃonn cúntóir %s le --signed=if-iarrtha" +msgstr "nà thacaÃonn cúntóir %s le --signed=if-asked" -#: transport-helper.c #, c-format msgid "helper %s does not support --atomic" msgstr "nà thacaÃonn cúntóir %s le --atomic" -#: transport-helper.c #, c-format msgid "helper %s does not support --%s" msgstr "nà thacaÃonn cúntóir %s le --%s" -#: transport-helper.c #, c-format msgid "helper %s does not support 'push-option'" -msgstr "nà thacaÃonn cúntóir %s le 'push-rogha'" +msgstr "nà thacaÃonn cúntóir %s le 'push-option'" -#: transport-helper.c msgid "remote-helper doesn't support push; refspec needed" msgstr "nà thacaÃonn cúntóir iargúlta le brú; teastaÃonn refspec" -#: transport-helper.c #, c-format msgid "helper %s does not support '--force'" msgstr "nà thacaÃonn cúntóir %s le '--force'" -#: transport-helper.c msgid "couldn't run fast-export" msgstr "nà raibh sé in ann onnmhairiú tapa a" -#: transport-helper.c msgid "error while running fast-export" msgstr "earráid agus easpórtáil tapa á rith" -#: transport-helper.c #, c-format msgid "" "No refs in common and none specified; doing nothing.\n" @@ -28002,101 +23523,80 @@ msgstr "" "rud.\n" "B'fhéidir gur chóir duit brainse a shonrú.\n" -#: transport-helper.c #, c-format msgid "unsupported object format '%s'" msgstr "formáid réad gan tacaÃocht '%s'" -#: transport-helper.c #, c-format msgid "malformed response in ref list: %s" msgstr "freagra mÃfhoirmithe sa liosta tagartha: %s" -#: transport-helper.c #, c-format msgid "read(%s) failed" msgstr "theip ar léamh (%s)" -#: transport-helper.c #, c-format msgid "write(%s) failed" msgstr "theip ar scrÃobh (%s)" -#: transport-helper.c #, c-format msgid "%s thread failed" msgstr "Theip ar snáithe %s" -#: transport-helper.c #, c-format msgid "%s thread failed to join: %s" msgstr "Theip ar shnáithe %s a bheith páirteach: %s" -#: transport-helper.c #, c-format msgid "can't start thread for copying data: %s" msgstr "nà féidir snáithe a thosú chun sonraà a chóipeáil: %s" -#: transport-helper.c #, c-format msgid "%s process failed to wait" msgstr "Theip ar phróiseas %s fanacht" -#: transport-helper.c #, c-format msgid "%s process failed" msgstr "Theip ar phróiseas %s" -#: transport-helper.c msgid "can't start thread for copying data" msgstr "nà féidir snáithe a thosú chun sonraà a chóipe" -#: transport.c #, c-format msgid "Would set upstream of '%s' to '%s' of '%s'\n" msgstr "Socródh sé suas sruth de '%s' go '%s' de '%s'\n" -#: transport.c #, c-format msgid "could not read bundle '%s'" msgstr "nà fhéadfaà beartán '%s' a léamh" -#: transport.c #, c-format msgid "transport: invalid depth option '%s'" msgstr "iompar: rogha doimhneachta neamhbhailà '%s'" -#: transport.c msgid "see protocol.version in 'git help config' for more details" msgstr "" "féach protocol.version in 'git help config' le haghaidh tuilleadh sonraÃ" -#: transport.c msgid "server options require protocol version 2 or later" msgstr "teastaÃonn leagan prótacal 2 nó nÃos déanaà ó roghanna" -#: transport.c msgid "server does not support wait-for-done" msgstr "nà thacaÃonn freastalaà le fanacht le déanamh" -#: transport.c msgid "could not parse transport.color.* config" msgstr "nà fhéadfaà transport.color.* config a pháirseáil" -#: transport.c msgid "support for protocol v2 not implemented yet" msgstr "tacaÃocht do phrótacal v2 nach bhfuil curtha i bhfeidhm" -#: transport.c #, c-format msgid "transport '%s' not allowed" msgstr "nà cheadaÃtear iompar '%s'" -#: transport.c msgid "git-over-rsync is no longer supported" msgstr "nà thacaÃtear le git-over-rsync a thuilleadh" -#: transport.c #, c-format msgid "" "The following submodule paths contain changes that can\n" @@ -28105,7 +23605,6 @@ msgstr "" "Tá athruithe ar féidir leis na cosáin fo-mhodúil seo a leanas\n" "nach bhfuil le fáil ar aon iargúlta:\n" -#: transport.c #, c-format msgid "" "\n" @@ -28131,43 +23630,33 @@ msgstr "" "\n" "chun iad a bhrú chuig iargúlta.\n" -#: transport.c msgid "Aborting." msgstr "Ag gearradh." -#: transport.c msgid "failed to push all needed submodules" msgstr "theip ar gach fo-mhodúl riachtanach a bhrú" -#: transport.c msgid "bundle-uri operation not supported by protocol" msgstr "oibrÃocht bundle-uri nach dtacaÃonn prótacal" -#: transport.c msgid "could not retrieve server-advertised bundle-uri list" msgstr "nà fhéadfaà liosta bundle-uri a fógraÃodh ag freastalaà a aisghab" -#: transport.c msgid "operation not supported by protocol" msgstr "oibriú nach dtacaÃonn prótacal" -#: tree-walk.c msgid "too-short tree object" msgstr "réad crann ró-ghearr" -#: tree-walk.c msgid "malformed mode in tree entry" msgstr "modh mÃfhoirmithe i iontráil crann" -#: tree-walk.c msgid "empty filename in tree entry" msgstr "ainm comhaid folamh i iontráil crann" -#: tree-walk.c msgid "too-short tree file" msgstr "comhad crann ró-ghearr" -#: unpack-trees.c #, c-format msgid "" "Your local changes to the following files would be overwritten by checkout:\n" @@ -28177,7 +23666,6 @@ msgstr "" "sheiceáil:\n" "%%sDéan d'athruithe nó déan iad a stóráil sula n-athraÃonn tú brainsÃ." -#: unpack-trees.c #, c-format msgid "" "Your local changes to the following files would be overwritten by checkout:\n" @@ -28187,7 +23675,6 @@ msgstr "" "sheiceáil:\n" "%%s" -#: unpack-trees.c #, c-format msgid "" "Your local changes to the following files would be overwritten by merge:\n" @@ -28198,7 +23685,6 @@ msgstr "" "%%sDo chuid athruithe a dhéanamh nó cuir isteach iad sula ndéanann tú a " "chumasc." -#: unpack-trees.c #, c-format msgid "" "Your local changes to the following files would be overwritten by merge:\n" @@ -28208,7 +23694,6 @@ msgstr "" "chumasc:\n" "%%s" -#: unpack-trees.c #, c-format msgid "" "Your local changes to the following files would be overwritten by %s:\n" @@ -28217,7 +23702,6 @@ msgstr "" "Déanfadh %s d'athruithe áitiúla ar na comhaid seo a leanas a fhorscrÃobh:\n" "%%sDéan do chuid athruithe nó iad a stóráil os comhair %s." -#: unpack-trees.c #, c-format msgid "" "Your local changes to the following files would be overwritten by %s:\n" @@ -28226,7 +23710,6 @@ msgstr "" "Déanfadh %s d'athruithe áitiúla ar na comhaid seo a leanas a fhorscrÃobh:\n" "%%s" -#: unpack-trees.c #, c-format msgid "" "Updating the following directories would lose untracked files in them:\n" @@ -28235,7 +23718,6 @@ msgstr "" "Chaillfeadh na n-eolairà seo a leanas a nuashonrú comhaid gan rianú iontu:\n" "%s" -#: unpack-trees.c #, c-format msgid "" "Refusing to remove the current working directory:\n" @@ -28244,7 +23726,6 @@ msgstr "" "Diúltú an eolaire oibre reatha a bhaint:\n" "%s" -#: unpack-trees.c #, c-format msgid "" "The following untracked working tree files would be removed by checkout:\n" @@ -28253,7 +23734,6 @@ msgstr "" "Bainfà na comhaid crann oibre gan rianú seo a leanas trà sheiceáil:\n" "%%sBogadh nó bain iad sula n-athraÃonn tú brainsÃ." -#: unpack-trees.c #, c-format msgid "" "The following untracked working tree files would be removed by checkout:\n" @@ -28262,7 +23742,6 @@ msgstr "" "Bainfà na comhaid crann oibre gan rianú seo a leanas trà sheiceáil:\n" "%%s" -#: unpack-trees.c #, c-format msgid "" "The following untracked working tree files would be removed by merge:\n" @@ -28271,7 +23750,6 @@ msgstr "" "Bainfà na comhaid crann oibre gan rianú seo a leanas trà chumasc:\n" "%%sDo thoil bog nó bain iad sula ndéanann tú a chumasc." -#: unpack-trees.c #, c-format msgid "" "The following untracked working tree files would be removed by merge:\n" @@ -28280,7 +23758,6 @@ msgstr "" "Bainfà na comhaid crann oibre gan rianú seo a leanas trà chumasc:\n" "%%s" -#: unpack-trees.c #, c-format msgid "" "The following untracked working tree files would be removed by %s:\n" @@ -28289,7 +23766,6 @@ msgstr "" "Bainfà %s na comhaid crann oibre neamhrianaithe seo a leanas:\n" "%%sDo thoil bog nó bain iad roimh %s." -#: unpack-trees.c #, c-format msgid "" "The following untracked working tree files would be removed by %s:\n" @@ -28298,7 +23774,6 @@ msgstr "" "Bainfà %s na comhaid crann oibre neamhrianaithe seo a leanas:\n" "%%s" -#: unpack-trees.c #, c-format msgid "" "The following untracked working tree files would be overwritten by " @@ -28309,7 +23784,6 @@ msgstr "" "sheiceáil:\n" "%%sBogadh nó bain iad sula n-athraÃonn tú brainsÃ." -#: unpack-trees.c #, c-format msgid "" "The following untracked working tree files would be overwritten by " @@ -28320,7 +23794,6 @@ msgstr "" "sheiceáil:\n" "%%s" -#: unpack-trees.c #, c-format msgid "" "The following untracked working tree files would be overwritten by merge:\n" @@ -28330,7 +23803,6 @@ msgstr "" "chumasc:\n" "%%sDo thoil bog nó bain iad sula ndéanann tú cumasc." -#: unpack-trees.c #, c-format msgid "" "The following untracked working tree files would be overwritten by merge:\n" @@ -28340,7 +23812,6 @@ msgstr "" "chumasc:\n" "%%s" -#: unpack-trees.c #, c-format msgid "" "The following untracked working tree files would be overwritten by %s:\n" @@ -28349,7 +23820,6 @@ msgstr "" "Bheadh %s na comhaid crann oibre neamhrianaithe seo a leanas a fhorscrÃobh:\n" "%%sDo thoil bog nó bain iad roimh %s." -#: unpack-trees.c #, c-format msgid "" "The following untracked working tree files would be overwritten by %s:\n" @@ -28358,12 +23828,10 @@ msgstr "" "Bheadh %s na comhaid crann oibre neamhrianaithe seo a leanas a fhorscrÃobh:\n" "%%s" -#: unpack-trees.c #, c-format msgid "Entry '%s' overlaps with '%s'. Cannot bind." msgstr "Tá iontráil '%s' ag forluà le '%s'. Nà féidir ceangal a dhéanamh." -#: unpack-trees.c #, c-format msgid "" "Cannot update submodule:\n" @@ -28372,7 +23840,6 @@ msgstr "" "Nà féidir fo-mhodúl a nuashonrú:\n" "%s" -#: unpack-trees.c #, c-format msgid "" "The following paths are not up to date and were left despite sparse " @@ -28383,7 +23850,6 @@ msgstr "" "patrúin neamhchoitianta:\n" "%s" -#: unpack-trees.c #, c-format msgid "" "The following paths are unmerged and were left despite sparse patterns:\n" @@ -28393,7 +23859,6 @@ msgstr "" "neamhchoitianta:\n" "%s" -#: unpack-trees.c #, c-format msgid "" "The following paths were already present and thus not updated despite sparse " @@ -28404,12 +23869,10 @@ msgstr "" "nuashonraÃodh in ainneoin\n" "%s" -#: unpack-trees.c #, c-format msgid "Aborting\n" msgstr "Gearradh\n" -#: unpack-trees.c #, c-format msgid "" "After fixing the above paths, you may want to run `git sparse-checkout " @@ -28418,11 +23881,9 @@ msgstr "" "Tar éis duit na cosáin thuas a shocrú, b'fhéidir gur mhaith leat `git sparse-" "checkout reapply` a reáchtáil.\n" -#: unpack-trees.c msgid "Updating files" msgstr "Comhad a nuashonrú" -#: unpack-trees.c msgid "" "the following paths have collided (e.g. case-sensitive paths\n" "on a case-insensitive filesystem) and only one from the same\n" @@ -28432,381 +23893,331 @@ msgstr "" "ar chóras comhaid cás-neamh-Ãogair) agus ach ceann amháin ón gcéanna\n" "tá grúpa imbhuailte sa chrann oibre:\n" -#: unpack-trees.c msgid "Updating index flags" msgstr "Nuashonrú bratacha innéacs" -#: unpack-trees.c #, c-format msgid "worktree and untracked commit have duplicate entries: %s" msgstr "" "tá iontrálacha dúbailte ag crann oibre agus tiomantas neamhrianaithe: %s" -#: upload-pack.c msgid "expected flush after fetch arguments" msgstr "súil le sruth tar éis argóintà a fháil" -#: urlmatch.c msgid "invalid URL scheme name or missing '://' suffix" msgstr "ainm scéime URL neamhbhailà nó iarmhÃr ': //' in easnamh" -#: urlmatch.c #, c-format msgid "invalid %XX escape sequence" msgstr "seicheamh éalaithe %XX neamhbhailÃ" -#: urlmatch.c msgid "missing host and scheme is not 'file:'" msgstr "nà 'comhad: 'à an óstach agus an scéim atá in easnamh:" -#: urlmatch.c msgid "a 'file:' URL may not have a port number" msgstr "b'fhéidir nach mbeadh uimhir chalafoirt ag URL 'file: '" -#: urlmatch.c msgid "invalid characters in host name" msgstr "carachtair neamhbhailà in ainm ósta" -#: urlmatch.c msgid "invalid port number" -msgstr "uimhir phort neamhbhail" +msgstr "uimhir phoirt neamhbhailÃ" -#: urlmatch.c msgid "invalid '..' path segment" msgstr "deighleog cosáin '..' neamhbhailÃ" -#: usage.c #, c-format msgid "error: unable to format message: %s\n" msgstr "earráid: nà féidir teachtaireacht a fhormáidiú: %s\n" -#: usage.c msgid "usage: " msgstr "úsáid: " -#: usage.c msgid "fatal: " msgstr "marfach: " -#: usage.c msgid "error: " msgstr "earráid: " -#: usage.c msgid "warning: " msgstr "rabhadh: " -#: version.c +#, c-format +msgid "'%s' is nominated for removal.\n" +msgstr "Tá '%s' ainmnithe le haghaidh bainte.\n" + +#, c-format +msgid "" +"If you still use this command, here's what you can do:\n" +"\n" +"- read https://git-scm.com/docs/BreakingChanges.html\n" +"- check if anyone has discussed this on the mailing\n" +" list and if they came up with something that can\n" +" help you: https://lore.kernel.org/git/?q=%s\n" +"- send an email to <git@vger.kernel.org> to let us\n" +" know that you still use this command and were unable\n" +" to determine a suitable replacement\n" +"\n" +msgstr "" +"Más rud é go bhfuil an t-ordú seo in úsáid agat fós, seo an méid is féidir " +"leat a dhéanamh:\n" +"\n" +"- léigh https://git-scm.com/docs/BreakingChanges.html\n" +"- seiceáil an bhfuil aon duine tar éis plé a dhéanamh ar an méid seo ar an " +"liosta poist agus an bhfuil rud éigin acu a d'fhéadfadh cabhrú leat: https://" +"lore.kernel.org/git/?q=%s\n" +"- seol rÃomhphost chuig <git@vger.kernel.org> chun a chur in iúl dúinn go " +"bhfuil tú fós ag úsáid an ordaithe seo agus nár éirigh leat ceann eile " +"oiriúnach a aimsiú\n" + +msgid "refusing to run without --i-still-use-this" +msgstr "ag diúltú rith gan --i-still-use-this fós" + #, c-format msgid "uname() failed with error '%s' (%d)\n" msgstr "theip ar uname () le earráid '%s' (%d)\n" -#: walker.c msgid "Fetching objects" msgstr "Rudaà a fháil" -#: worktree.c #, c-format msgid "'%s' at main working tree is not the repository directory" msgstr "Nà hé '%s' ag an bprÃomhchrann oibre an eolaire stórais" -#: worktree.c #, c-format msgid "'%s' file does not contain absolute path to the working tree location" msgstr "NÃl cosán iomlán chuig suÃomh an chrainn oibre i gcomhad '%s'" -#: worktree.c #, c-format msgid "'%s' is not a .git file, error code %d" msgstr "Nà comhad .git é '%s', cód earráide %d" -#: worktree.c #, c-format msgid "'%s' does not point back to '%s'" msgstr "Nà dhÃrÃonn '%s' ar ais chuig '%s'" -#: worktree.c msgid "not a directory" -msgstr "nà eolaire" +msgstr "nà eolaire é" -#: worktree.c msgid ".git is not a file" msgstr "Nà comhad é .git" -#: worktree.c msgid ".git file broken" msgstr "comhad .git briste" -#: worktree.c msgid ".git file incorrect" msgstr "comhad .git mÃcheart" -#: worktree.c msgid ".git file absolute/relative path mismatch" msgstr "comhad .git neamhoiriúnú iomlán/coibhneasta coibhneasta" -#: worktree.c msgid "not a valid path" msgstr "nà cosán bailÃ" -#: worktree.c msgid "unable to locate repository; .git is not a file" -msgstr "in ann stór a aimsiú; nà comhad é .git" +msgstr "nà féidir an stórlann a aimsiú; nà comhad é .git" -#: worktree.c msgid "unable to locate repository; .git file does not reference a repository" -msgstr "in ann stór a aimsiú; nà thagann comhad .git tagairt do stór" +msgstr "" +"nà féidir an stórlann a aimsiú; nà dhéanann an comhad .git tagairt do " +"stórlann" -#: worktree.c msgid "unable to locate repository; .git file broken" -msgstr "in ann stór a aimsiú; comhad .git briste" +msgstr "nà féidir an stórlann a aimsiú; comhad .git briste" -#: worktree.c msgid "gitdir unreadable" msgstr "gitdir unreadable" -#: worktree.c msgid "gitdir absolute/relative path mismatch" -msgstr "mÃmheaitseáil cosán iomlán/coibhneasta gitdir" +msgstr "gitdir mÃ-oiriúnacht chosáin absalóideach/coibhneasta" -#: worktree.c msgid "gitdir incorrect" msgstr "gitdir mÃcheart" -#: worktree.c msgid "not a valid directory" msgstr "nà eolaire bailÃ" -#: worktree.c msgid "gitdir file does not exist" msgstr "nÃl comhad gitdir ann" -#: worktree.c #, c-format msgid "unable to read gitdir file (%s)" -msgstr "nach féidir comhad gitdir a léamh (%s)" +msgstr "nà féidir comhad gitdir (%s) a léamh" -#: worktree.c #, c-format msgid "short read (expected %<PRIuMAX> bytes, read %<PRIuMAX>)" msgstr "léamh gearr (súil leis%<PRIuMAX>bytes, léithe%<PRIuMAX>)" -#: worktree.c msgid "invalid gitdir file" msgstr "comhad gitdir neamhbhailÃ" -#: worktree.c msgid "gitdir file points to non-existent location" msgstr "pointeálann comhad gitdir chuig suÃomh nach bhfuil ann" -#: worktree.c #, c-format msgid "unable to set %s in '%s'" -msgstr "nach féidir %s a shocrú i '%s'" +msgstr "nà féidir %s a shocrú i '%s'" -#: worktree.c #, c-format msgid "unable to unset %s in '%s'" -msgstr "nach féidir %s a dhÃshocrú i '%s'" +msgstr "nà féidir %s a dhÃshuiteáil i '%s'" -#: worktree.c msgid "failed to set extensions.worktreeConfig setting" msgstr "theip ar shocrú extensions.worktreeConfig" -#: worktree.c msgid "unable to upgrade repository format to support relative worktrees" -msgstr "in ann formáid stórais a uasghrádú chun tacú le crainn oibre coibh" +msgstr "" +"nà féidir formáid an stórais a uasghrádú chun tacú le crainn oibre " +"coibhneasta" -#: worktree.c msgid "unable to set extensions.relativeWorktrees setting" msgstr "nà féidir an socrú extensions.relativeWorktrees a shocrú" -#: wrapper.c #, c-format msgid "could not setenv '%s'" msgstr "nà fhéadfaà '%s' a shocrú" -#: wrapper.c #, c-format msgid "unable to create '%s'" msgstr "nà féidir '%s' a chruthú" -#: wrapper.c #, c-format msgid "could not open '%s' for reading and writing" msgstr "nà fhéadfaà '%s' a oscailt le haghaidh léamh agus scrÃbhneoireachta" -#: wrapper.c #, c-format msgid "unable to access '%s'" msgstr "nà féidir rochtain a fháil ar '%s'" -#: wrapper.c msgid "unable to get current working directory" -msgstr "in ann eolaire oibre reatha a fháil" +msgstr "nà féidir an t-eolaire oibre reatha a fháil" -#: wrapper.c msgid "unable to get random bytes" -msgstr "in ann bétaà randamacha a fháil" +msgstr "nà féidir bearta randamacha a fháil" -#: wrapper.c #, c-format msgid "attempting to mmap %<PRIuMAX> over limit %<PRIuMAX>" msgstr "ag iarraidh mmapáil %<PRIuMAX> thar theorainn %<PRIuMAX>" -#: wrapper.c #, c-format msgid "mmap failed%s" msgstr "theip ar mmap %s" -#: wt-status.c msgid "Unmerged paths:" msgstr "Cosáin neamh-chumasaithe:" -#: wt-status.c msgid " (use \"git restore --staged <file>...\" to unstage)" msgstr "" " (bain úsáid as “git restore --staged <comhad>...†chun an stáitse a dhÃchur)" -#: wt-status.c #, c-format msgid " (use \"git restore --source=%s --staged <file>...\" to unstage)" msgstr "" " (bain úsáid as \"git restore --source=%s --staged <comhad>...\" chun an " "stáitse a dhÃ-ardú)" -#: wt-status.c msgid " (use \"git rm --cached <file>...\" to unstage)" msgstr "" " (bain úsáid as “git rm --cached <comhad>...†chun an stáitse a dhÃchur)" -#: wt-status.c msgid " (use \"git add <file>...\" to mark resolution)" msgstr " (bain úsáid as “git add <comhad>...†chun réiteach a mharcáil)" -#: wt-status.c msgid " (use \"git add/rm <file>...\" as appropriate to mark resolution)" msgstr "" " (bain úsáid \"git add/rm <comhad>...\" de réir mar is cuà chun réiteach a " "mharcáil)" -#: wt-status.c msgid " (use \"git rm <file>...\" to mark resolution)" msgstr " (bain úsáid as “git rm <comhad>...†chun réiteach a mharcáil)" -#: wt-status.c msgid "Changes to be committed:" msgstr "Athruithe atá le déanamh:" -#: wt-status.c msgid "Changes not staged for commit:" msgstr "Athruithe nach ndearnadh a chur ar stáitse le haghaidh tiomantais:" -#: wt-status.c msgid " (use \"git add <file>...\" to update what will be committed)" msgstr "" " (bain úsáid as “git add <comhad>...†chun an méid a bheidh tiomanta a " "nuashonrú)" -#: wt-status.c msgid " (use \"git add/rm <file>...\" to update what will be committed)" msgstr "" " (bain úsáid as “git add/rm <comhad>...†chun an méid a bheidh tiomanta a " "nuashonrú)" -#: wt-status.c msgid "" " (use \"git restore <file>...\" to discard changes in working directory)" msgstr "" " (bain úsáid as “git restore <comhad>...†chun athruithe ar eolaire oibre a " "dhiúscairt)" -#: wt-status.c msgid " (commit or discard the untracked or modified content in submodules)" msgstr "" " (an t-ábhar neamhrianaithe nó modhnaithe i bhfo-mhodúil a thiomsú nó a " "dhiúscairt)" -#: wt-status.c #, c-format msgid " (use \"git %s <file>...\" to include in what will be committed)" msgstr "" " (bain úsáid as “git %s <comhad>...†chun an méid a bheidh tiomanta san " "áireamh)" -#: wt-status.c msgid "both deleted:" msgstr "scriosta an dá cheann:" -#: wt-status.c msgid "added by us:" msgstr "curtha leis againn:" -#: wt-status.c msgid "deleted by them:" msgstr "scriosta ag siad:" -#: wt-status.c msgid "added by them:" msgstr "a chuir siad leis:" -#: wt-status.c msgid "deleted by us:" msgstr "scriosta againn:" -#: wt-status.c msgid "both added:" msgstr "chuir an bheirt leis:" -#: wt-status.c msgid "both modified:" msgstr "an dá cheann modhnaithe:" -#: wt-status.c msgid "new file:" msgstr "comhad nua:" -#: wt-status.c msgid "copied:" msgstr "cóipeáilte:" -#: wt-status.c msgid "deleted:" msgstr "scriosta:" -#: wt-status.c msgid "modified:" msgstr "modhnaithe:" -#: wt-status.c msgid "renamed:" msgstr "athainmnithe:" -#: wt-status.c msgid "typechange:" msgstr "cineál cineál:" -#: wt-status.c msgid "unknown:" msgstr "anaithnid:" -#: wt-status.c msgid "unmerged:" msgstr "gan chumasc:" -#: wt-status.c msgid "new commits, " msgstr "tiomantais nua, " -#: wt-status.c msgid "modified content, " msgstr "ábhar modhnaithe, " -#: wt-status.c msgid "untracked content, " msgstr "ábhar neamhrianaithe, " -#: wt-status.c #, c-format msgid "Your stash currently has %d entry" msgid_plural "Your stash currently has %d entries" @@ -28814,15 +24225,12 @@ msgstr[0] "Tá %d iontráil i do stash faoi láthair" msgstr[1] "Tá %d iontrálacha ar do stash faoi láthair" msgstr[2] "Tá %d iontrálacha ar do stash faoi láthair" -#: wt-status.c msgid "Submodules changed but not updated:" msgstr "Fo-mhodúil athraithe ach gan nuashonrú:" -#: wt-status.c msgid "Submodule changes to be committed:" msgstr "Athruithe fo-mhodúil atá le tiomantas:" -#: wt-status.c msgid "" "Do not modify or remove the line above.\n" "Everything below it will be ignored." @@ -28830,7 +24238,6 @@ msgstr "" "Ná déan an lÃne thuas a mhodhnú ná a bhaint.\n" "Déanfar neamhaird ar gach rud thÃos é." -#: wt-status.c #, c-format msgid "" "\n" @@ -28842,64 +24249,50 @@ msgstr "" "rÃomh.\n" "Is féidir leat '--no-ahead-behind' a úsáid chun seo a sheachaint.\n" -#: wt-status.c msgid "You have unmerged paths." msgstr "Tá cosáin neamh-chumasaithe agat." -#: wt-status.c msgid " (fix conflicts and run \"git commit\")" msgstr " (coinbhleachtaà a shocrú agus reáchtáil “git commitâ€)" -#: wt-status.c msgid " (use \"git merge --abort\" to abort the merge)" msgstr "" " (bain úsáid as “git merge --abort†chun an cumaisc a chur ar deireadh)" -#: wt-status.c msgid "All conflicts fixed but you are still merging." msgstr "SocraÃodh gach coinbhleacht ach tá tú fós ag cumasc." -#: wt-status.c msgid " (use \"git commit\" to conclude merge)" msgstr " (bain úsáid as “git commit†chun cumasc a thabhairt i gcrÃch)" -#: wt-status.c msgid "You are in the middle of an am session." msgstr "Tá tú i lár seisiún am." -#: wt-status.c msgid "The current patch is empty." msgstr "Tá an paiste reatha folamh." -#: wt-status.c msgid " (fix conflicts and then run \"git am --continue\")" msgstr " (déan coinbhleachtaà a shocrú agus ansin rith “git am --continueâ€)" -#: wt-status.c msgid " (use \"git am --skip\" to skip this patch)" msgstr " (bain úsáid as “git am --skip†chun an paiste seo a scipeáil)" -#: wt-status.c msgid "" " (use \"git am --allow-empty\" to record this patch as an empty commit)" msgstr "" " (bain úsáid as “git am --allow-empty†chun an paiste seo a thaifeadadh mar " "thiomantas folamh)" -#: wt-status.c msgid " (use \"git am --abort\" to restore the original branch)" msgstr "" " (bain úsáid as “git am --abort†chun an bhrainse bunaidh a chur ar ais)" -#: wt-status.c msgid "git-rebase-todo is missing." msgstr "tá git-rebase-todo ar iarraidh." -#: wt-status.c msgid "No commands done." msgstr "NÃl aon orduithe déanta." -#: wt-status.c #, c-format msgid "Last command done (%<PRIuMAX> command done):" msgid_plural "Last commands done (%<PRIuMAX> commands done):" @@ -28907,16 +24300,13 @@ msgstr[0] "An chéad ordú eile le déanamh (%<PRIuMAX>ordú atá fágtha):" msgstr[1] "Na chéad orduithe eile le déanamh (%<PRIuMAX> orduithe atá fágtha):" msgstr[2] "Na chéad orduithe eile le déanamh (%<PRIuMAX> orduithe atá fágtha):" -#: wt-status.c #, c-format msgid " (see more in file %s)" msgstr " (féach tuilleadh i gcomhad %s)" -#: wt-status.c msgid "No commands remaining." msgstr "NÃl aon orduithe fágtha." -#: wt-status.c #, c-format msgid "Next command to do (%<PRIuMAX> remaining command):" msgid_plural "Next commands to do (%<PRIuMAX> remaining commands):" @@ -28924,40 +24314,32 @@ msgstr[0] "An chéad ordú eile le déanamh (%<PRIuMAX> an t-ordú atá fágtha) msgstr[1] "Na chéad orduithe eile le déanamh (%<PRIuMAX> orduithe atá fágtha):" msgstr[2] "Na chéad orduithe eile le déanamh (%<PRIuMAX> orduithe atá fágtha):" -#: wt-status.c msgid " (use \"git rebase --edit-todo\" to view and edit)" msgstr "" " (bain úsáid as “git rebase --edit-todo†chun féachaint agus eagar a chur in " "eagar)" -#: wt-status.c #, c-format msgid "You are currently rebasing branch '%s' on '%s'." msgstr "Tá tú ag athbhunú brainse '%s' faoi láthair ar '%s'." -#: wt-status.c msgid "You are currently rebasing." msgstr "Tá tú ag athbhunú faoi láthair." -#: wt-status.c msgid " (fix conflicts and then run \"git rebase --continue\")" msgstr "" " (déan coinbhleachtaà a shocrú agus ansin rith “git rebase --continueâ€)" -#: wt-status.c msgid " (use \"git rebase --skip\" to skip this patch)" msgstr " (bain úsáid as “git rebase --skip†chun an paiste seo a scipeáil)" -#: wt-status.c msgid " (use \"git rebase --abort\" to check out the original branch)" msgstr "" " (bain úsáid as “git rebase --abort†chun an bhrainse bunaidh a sheiceáil)" -#: wt-status.c msgid " (all conflicts fixed: run \"git rebase --continue\")" msgstr " (gach coinbhleacht socraithe: reáchtáil “git rebase --continueâ€)" -#: wt-status.c #, c-format msgid "" "You are currently splitting a commit while rebasing branch '%s' on '%s'." @@ -28965,164 +24347,128 @@ msgstr "" "Tá tiomantas á roinnt agat faoi láthair agus tú ag athbhunú brainse '%s' ar " "'%s'." -#: wt-status.c msgid "You are currently splitting a commit during a rebase." msgstr "Tá tú ag roinnt tiomantas faoi láthair le linn athbhunaithe." -#: wt-status.c msgid " (Once your working directory is clean, run \"git rebase --continue\")" msgstr "" " (Nuair a bheidh d'eolaire oibre glan, reáchtáil “git rebase --continueâ€)" -#: wt-status.c #, c-format msgid "You are currently editing a commit while rebasing branch '%s' on '%s'." msgstr "" "Tá tú ag eagarthóireacht faoi láthair agus tú ag athbhunú brainse '%s' ar " "'%s'." -#: wt-status.c msgid "You are currently editing a commit during a rebase." msgstr "Tá tú ag eagarthóireacht tiomanta faoi láthair le linn athbhunaithe." -#: wt-status.c msgid " (use \"git commit --amend\" to amend the current commit)" msgstr " (bain úsáid as “git commit --amend†chun an tiomantas reatha a leasú)" -#: wt-status.c msgid "" " (use \"git rebase --continue\" once you are satisfied with your changes)" msgstr "" " (bain úsáid as “git rebase --continue†nuair a bheidh tú sásta le " "d'athruithe)" -#: wt-status.c msgid "Cherry-pick currently in progress." msgstr "Cherry-pick atá ar siúl faoi láthair." -#: wt-status.c #, c-format msgid "You are currently cherry-picking commit %s." msgstr "Tá tiomantas %s ag piocadh silÃnà faoi láthair." -#: wt-status.c msgid " (fix conflicts and run \"git cherry-pick --continue\")" msgstr " (coinbhleachtaà a shocrú agus reáchtáil “git cherry-pick --continueâ€)" -#: wt-status.c msgid " (run \"git cherry-pick --continue\" to continue)" msgstr " (reáchtáil “git cherry-pick --continue †chun leanúint ar aghaidh)" -#: wt-status.c msgid " (all conflicts fixed: run \"git cherry-pick --continue\")" msgstr " (gach coinbhleacht socraithe: reáchtáil “git cherry-pick --continueâ€)" -#: wt-status.c msgid " (use \"git cherry-pick --skip\" to skip this patch)" msgstr "" " (bain úsáid as “git cherry-pick --skip†chun an paiste seo a scipeáil)" -#: wt-status.c msgid " (use \"git cherry-pick --abort\" to cancel the cherry-pick operation)" msgstr "" " (bain úsáid as “git cherry-pick --abort†chun an oibrÃocht pioc silÃnà a " "chealú)" -#: wt-status.c msgid "Revert currently in progress." msgstr "Ar ais atá ar siúl faoi láthair." -#: wt-status.c #, c-format msgid "You are currently reverting commit %s." msgstr "Tá tiomantas %s á chur ar ais faoi láthair." -#: wt-status.c msgid " (fix conflicts and run \"git revert --continue\")" msgstr " (déan coinbhleachtaà a shocrú agus rith “git revert --continueâ€)" -#: wt-status.c msgid " (run \"git revert --continue\" to continue)" msgstr " (reáchtáil “git revert --continue†chun leanúint ar aghaidh)" -#: wt-status.c msgid " (all conflicts fixed: run \"git revert --continue\")" msgstr " (gach coinbhleacht socraithe: reáchtáil “git revert --continueâ€)" -#: wt-status.c msgid " (use \"git revert --skip\" to skip this patch)" msgstr " (bain úsáid as “git revert --skip†chun an paiste seo a scipeáil)" -#: wt-status.c msgid " (use \"git revert --abort\" to cancel the revert operation)" msgstr "" " (bain úsáid as “git revert --abort†chun an oibrÃocht aisghabhála a chealú)" -#: wt-status.c #, c-format msgid "You are currently bisecting, started from branch '%s'." msgstr "Tá tú ag déileáil faoi láthair, tosaigh tú ó bhrainse '%s'." -#: wt-status.c msgid "You are currently bisecting." msgstr "Tá tú ag déileáil faoi láthair." -#: wt-status.c msgid " (use \"git bisect reset\" to get back to the original branch)" msgstr "" " (bain úsáid as “git bisect reset†chun filleadh ar an mbrainse bunaidh)" -#: wt-status.c msgid "You are in a sparse checkout." msgstr "Tá tú i seiceáil neamhchoitianta." -#: wt-status.c #, c-format msgid "You are in a sparse checkout with %d%% of tracked files present." msgstr "" "Tá tú i seiceáil neamhchoitianta le %d%% de na comhaid rianaithe i láthair." -#: wt-status.c msgid "On branch " msgstr "Ar bhrainse " -#: wt-status.c msgid "interactive rebase in progress; onto " msgstr "athbhunú idirghnÃomhach atá ar siúl; ar " -#: wt-status.c msgid "rebase in progress; onto " msgstr "athbhunú atá ar siúl; ar " -#: wt-status.c msgid "HEAD detached at " msgstr "HEAD scoite ag " -#: wt-status.c msgid "HEAD detached from " msgstr "CEANN scartha ó " -#: wt-status.c msgid "Not currently on any branch." msgstr "NÃl sé ar aon bhrainse faoi láthair." -#: wt-status.c msgid "Initial commit" msgstr "Tiomantas tosaigh" -#: wt-status.c msgid "No commits yet" msgstr "NÃl aon gealltanais fós" -#: wt-status.c msgid "Untracked files" msgstr "Comhaid neamhrianaithe" -#: wt-status.c msgid "Ignored files" msgstr "Comhaid neamhaird" -#: wt-status.c #, c-format msgid "" "It took %.2f seconds to enumerate untracked files,\n" @@ -29132,43 +24478,35 @@ msgstr "" "ach cuireadh na torthaà a chosc, agus d'fhéadfadh rith ina dhiaidh sin a " "bheith nÃos gasta." -#: wt-status.c #, c-format msgid "It took %.2f seconds to enumerate untracked files." msgstr "Thóg sé %.2f soicind comhaid gan rianú a áireamh." -#: wt-status.c msgid "See 'git help status' for information on how to improve this." msgstr "" "Féach 'git help status' le haghaidh faisnéise maidir le conas é seo a " "fheabhsú." -#: wt-status.c #, c-format msgid "Untracked files not listed%s" msgstr "Comhaid neamhrianaithe nár liostaÃodh %s" -#: wt-status.c msgid " (use -u option to show untracked files)" msgstr " (bain úsáid as an rogha -u chun comhaid neamhrianaithe a thaispeáint)" -#: wt-status.c msgid "No changes" msgstr "Gan aon athruithe" -#: wt-status.c #, c-format msgid "no changes added to commit (use \"git add\" and/or \"git commit -a\")\n" msgstr "" "nÃl aon athruithe curtha le tiomantas (bain úsáid as “git add†agus/nó “git " "commit -aâ€)\n" -#: wt-status.c #, c-format msgid "no changes added to commit\n" msgstr "nÃl aon athruithe curtha le tiomantas\n" -#: wt-status.c #, c-format msgid "" "nothing added to commit but untracked files present (use \"git add\" to " @@ -29177,76 +24515,61 @@ msgstr "" "nà chuirtear aon rud le tiomantas ach comhaid neamhrianaithe i láthair (bain " "úsáid as “git add†chun rianú)\n" -#: wt-status.c #, c-format msgid "nothing added to commit but untracked files present\n" msgstr "nà chuir aon rud le tiomantas ach comhaid neamhrianaithe i láthair\n" -#: wt-status.c #, c-format msgid "nothing to commit (create/copy files and use \"git add\" to track)\n" msgstr "" "aon rud le tiomantas (comhaid a chruthú/cóipeáil agus bain úsáid as “git " "add†chun rianú)\n" -#: wt-status.c #, c-format msgid "nothing to commit\n" msgstr "aon rud le tiomantas\n" -#: wt-status.c #, c-format msgid "nothing to commit (use -u to show untracked files)\n" msgstr "" "aon rud le tiomantas (bain úsáid as -u chun comhaid neamhrianaithe a " "thaispeáint)\n" -#: wt-status.c #, c-format msgid "nothing to commit, working tree clean\n" msgstr "aon rud le tiomantas, crann oibre glan\n" -#: wt-status.c msgid "No commits yet on " msgstr "NÃl aon gealltanas ar aghaidh go fóill " -#: wt-status.c msgid "HEAD (no branch)" msgstr "CEAD (gan aon bhrainse)" -#: wt-status.c msgid "different" msgstr "difriúil" -#: wt-status.c msgid "behind " msgstr "taobh thiar " -#: wt-status.c msgid "ahead " msgstr "chun tosaigh " #. TRANSLATORS: the action is e.g. "pull with rebase" -#: wt-status.c #, c-format msgid "cannot %s: You have unstaged changes." msgstr "nà féidir %s: Tá athruithe gan stáitse agat." -#: wt-status.c msgid "additionally, your index contains uncommitted changes." msgstr "ina theannta sin, tá athruithe neamhthiomanta i d'innéacs." -#: wt-status.c #, c-format msgid "cannot %s: Your index contains uncommitted changes." msgstr "nà féidir %s: Tá athruithe neamhthiomanta ag d'innéacs." -#: xdiff-interface.c #, c-format msgid "unknown style '%s' given for '%s'" msgstr "stÃl anaithnid '%s' a thugtar do '%s'" -#: git-merge-octopus.sh git-merge-resolve.sh msgid "" "Error: Your local changes to the following files would be overwritten by " "merge" @@ -29254,119 +24577,94 @@ msgstr "" "Earráid: Déanfaà d'athruithe áitiúla ar na comhaid seo a leanas a " "fhorscrÃobh trà chumasc" -#: git-merge-octopus.sh msgid "Automated merge did not work." msgstr "NÃor oibrigh cumaisc uathoibrithe." -#: git-merge-octopus.sh msgid "Should not be doing an octopus." msgstr "NÃor chóir go mbeadh sé ag déanamh ochtair." -#: git-merge-octopus.sh #, sh-format msgid "Unable to find common commit with $pretty_name" msgstr "Nà féidir tiomantas coiteann a fháil le $pretty_name" -#: git-merge-octopus.sh #, sh-format msgid "Already up to date with $pretty_name" msgstr "Cothrom le dáta cheana féin le $pretty_name" -#: git-merge-octopus.sh #, sh-format msgid "Fast-forwarding to: $pretty_name" msgstr "Seoladh go tapa chuig: $pretty_name" -#: git-merge-octopus.sh #, sh-format msgid "Trying simple merge with $pretty_name" msgstr "Ag iarraidh cumasc simplà le $pretty_name" -#: git-merge-octopus.sh msgid "Simple merge did not work, trying automatic merge." msgstr "" "NÃor oibrigh an cumasc simplÃ, táim ag iarraidh cumasc uathoibrÃoch a " "dhéanamh." -#: git-sh-setup.sh #, sh-format msgid "usage: $dashless $USAGE" msgstr "úsáid: $dashless $USAGE" -#: git-sh-setup.sh #, sh-format msgid "Cannot chdir to $cdup, the toplevel of the working tree" msgstr "Nà féidir a chdir go $cdup, barr an chrainn oibre" -#: git-sh-setup.sh #, sh-format msgid "fatal: $program_name cannot be used without a working tree." msgstr "marfach: nà féidir $program_name a úsáid gan crann oibre." -#: git-sh-setup.sh msgid "Cannot rewrite branches: You have unstaged changes." msgstr "Nà féidir brainsà a athscrÃobh: Tá athruithe gan stáitse agat." -#: git-sh-setup.sh #, sh-format msgid "Cannot $action: You have unstaged changes." msgstr "Nà féidir $action: Tá athruithe gan stáitse agat." -#: git-sh-setup.sh #, sh-format msgid "Cannot $action: Your index contains uncommitted changes." msgstr "Nà féidir $action: Tá athruithe neamhthiomanta i d'innéacs." -#: git-sh-setup.sh msgid "Additionally, your index contains uncommitted changes." msgstr "Ina theannta sin, tá athruithe neamhthiomanta i d'innéacs." -#: git-sh-setup.sh msgid "You need to run this command from the toplevel of the working tree." msgstr "Nà mór duit an t-ordú seo a reáchtáil ó bharr an chrainn oibre." -#: git-sh-setup.sh msgid "Unable to determine absolute path of git directory" msgstr "Nà féidir cosán iomlán eolaire git a chinneadh" -#: git-send-email.perl msgid "local zone differs from GMT by a non-minute interval\n" msgstr "tá eatramh neamh-nóiméid difriúil ón gcrios áitiúil\n" -#: git-send-email.perl msgid "local time offset greater than or equal to 24 hours\n" msgstr "" "fritháireamh ama áitiúil atá nÃos mó ná nó cothrom le 24 uair an chloig\n" -#: git-send-email.perl #, perl-format msgid "fatal: command '%s' died with exit code %d" msgstr "marfach: fuair an t-ordú '%s' bás le cód imeachta %d" -#: git-send-email.perl msgid "the editor exited uncleanly, aborting everything" msgstr "d’imigh an t-eagarthóir go neamhghlan, ag cur deireadh le gach rud" -#: git-send-email.perl #, perl-format msgid "" "'%s' contains an intermediate version of the email you were composing.\n" msgstr "Tá leagan idirmheánach den rÃomhphost a bhà á scrÃobh agat i '%s'.\n" -#: git-send-email.perl #, perl-format msgid "'%s.final' contains the composed email.\n" msgstr "CuimsÃonn '%s.final' an rÃomhphost comhdhéanta.\n" -#: git-send-email.perl msgid "--dump-aliases incompatible with other options\n" msgstr "--dump-aliases neamhoiriúnach le roghanna eile\n" -#: git-send-email.perl msgid "--dump-aliases and --translate-aliases are mutually exclusive\n" msgstr "Tá --dump-aliases agus --translate-aliases frithpháirteach\n" -#: git-send-email.perl msgid "" "fatal: found configuration options for 'sendmail'\n" "git-send-email is configured with the sendemail.* options - note the 'e'.\n" @@ -29378,11 +24676,9 @@ msgstr "" "Socraigh sendemail.forbidSendmailVariables go bréagach chun an seiceáil seo " "a dhÃchumasú.\n" -#: git-send-email.perl msgid "Cannot run git format-patch from outside a repository\n" msgstr "Nà féidir git format-patch a rith ó lasmuigh de stórlann\n" -#: git-send-email.perl msgid "" "`batch-size` and `relogin` must be specified together (via command-line or " "configuration option)\n" @@ -29390,37 +24686,30 @@ msgstr "" "Caithfear `méid baisce' agus `athlogán' a shonrú le chéile (trà lÃne " "ordaithe nó rogha cumraÃochta)\n" -#: git-send-email.perl #, perl-format msgid "Unknown --suppress-cc field: '%s'\n" msgstr "Réimse anaithnid --suppress-cc: '%s'\n" -#: git-send-email.perl #, perl-format msgid "Unknown --confirm setting: '%s'\n" msgstr "Socrú --confirm anaithnid: '%s'\n" -#: git-send-email.perl #, perl-format msgid "warning: sendmail alias with quotes is not supported: %s\n" msgstr "rabhadh: nà thacaÃtear le alias sendmail le luachana: %s\n" -#: git-send-email.perl #, perl-format msgid "warning: `:include:` not supported: %s\n" msgstr "rabhadh: `:include: `nÃl tacaÃocht: %s\n" -#: git-send-email.perl #, perl-format msgid "warning: `/file` or `|pipe` redirection not supported: %s\n" msgstr "rabhadh: Nà thacaÃtear le hathreorú `/comhad` nó `|pÃopa`: %s\n" -#: git-send-email.perl #, perl-format msgid "warning: sendmail line is not recognized: %s\n" msgstr "rabhadh: nà aithnÃtear lÃne sendmail: %s\n" -#: git-send-email.perl #, perl-format msgid "" "File '%s' exists but it could also be the range of commits\n" @@ -29437,12 +24726,10 @@ msgstr "" " * Ag ráâ€. /%s†má tá comhad i gceist agat; nó\n" " * Rogha --format-patch a thabhairt má tá raon i gceist agat.\n" -#: git-send-email.perl #, perl-format msgid "Failed to opendir %s: %s" msgstr "Theip ar %s a oscailt: %s" -#: git-send-email.perl msgid "" "\n" "No patch files specified!\n" @@ -29452,17 +24739,14 @@ msgstr "" "NÃl aon chomhaid paiste sonraithe!\n" "\n" -#: git-send-email.perl #, perl-format msgid "No subject line in %s?" msgstr "NÃl aon lÃne ábhair i %s?" -#: git-send-email.perl #, perl-format msgid "Failed to open for writing %s: %s" msgstr "Theip ar oscailt le haghaidh scrÃbhneoireachta %s: %s" -#: git-send-email.perl msgid "" "Lines beginning in \"GIT:\" will be removed.\n" "Consider including an overall diffstat or table of contents\n" @@ -29476,27 +24760,22 @@ msgstr "" "\n" "Glan ábhar an choirp mura dteastaÃonn uait achoimre a sheoladh.\n" -#: git-send-email.perl #, perl-format msgid "Failed to open %s.final: %s" msgstr "Theip ar %s.final a oscailt: %s" -#: git-send-email.perl #, perl-format msgid "Failed to open %s: %s" msgstr "Theip ar %s a oscailt: %s" -#: git-send-email.perl msgid "Summary email is empty, skipping it\n" msgstr "Tá rÃomhphost achoimre folamh, ag scipeáil é\n" #. TRANSLATORS: please keep [y/N] as is. -#: git-send-email.perl #, perl-format msgid "Are you sure you want to use <%s> [y/N]? " msgstr "An bhfuil tú cinnte gur mhaith leat <%s> [Y/n] a úsáid? " -#: git-send-email.perl msgid "" "The following files are 8bit, but do not declare a Content-Transfer-" "Encoding.\n" @@ -29504,11 +24783,9 @@ msgstr "" "Is iad na comhaid seo a leanas 8bit, ach ná dearbhaÃonn siad Ionchódú " "Aistrithe Ãbhar.\n" -#: git-send-email.perl msgid "Which 8bit encoding should I declare [UTF-8]? " msgstr "Cén ionchódú 8 giotán ba chóir dom a dhearbhú [UTF-8]? " -#: git-send-email.perl #, perl-format msgid "" "Refusing to send because the patch\n" @@ -29521,22 +24798,18 @@ msgstr "" "tá an teimpléad faoi réir an ábhair '*** ÃBHAR ANSEO ***'. Pasáil --force " "más mian leat a sheoladh i ndáirÃre.\n" -#: git-send-email.perl msgid "To whom should the emails be sent (if anyone)?" msgstr "Cé chuige ba chóir na rÃomhphoist a sheoladh (más duine ar bith)?" -#: git-send-email.perl #, perl-format msgid "fatal: alias '%s' expands to itself\n" msgstr "marfach: leathnaÃonn alias '%s' chuige féin\n" -#: git-send-email.perl msgid "Message-ID to be used as In-Reply-To for the first email (if any)? " msgstr "" "Aitheantas an Teachtaireachta le húsáid mar In-Reply-To don chéad rÃomhphost " "(más ann dó)? " -#: git-send-email.perl #, perl-format msgid "error: unable to extract a valid address from: %s\n" msgstr "earráid: nà féidir seoladh bailà a bhaint as: %s\n" @@ -29544,16 +24817,13 @@ msgstr "earráid: nà féidir seoladh bailà a bhaint as: %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 msgid "What to do with this address? ([q]uit|[d]rop|[e]dit): " msgstr "Cad atá le déanamh leis an seoladh seo? ([q]uit|[d]rop|[e]dit): " -#: git-send-email.perl #, perl-format msgid "CA path \"%s\" does not exist" msgstr "NÃl cosán CA “%s†ann" -#: git-send-email.perl msgid "" " The Cc list above has been expanded by additional\n" " addresses found in the patch commit message. By default\n" @@ -29582,132 +24852,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 msgid "Send this email? ([y]es|[n]o|[e]dit|[q]uit|[a]ll): " msgstr "" "An bhfuil tú ag iarraidh an rÃomhphost seo a sheoladh? ([y]es|[n]o|[e]dit|" "[q]uit|[a]ll): " -#: git-send-email.perl msgid "Send this email reply required" msgstr "Seol an freagra rÃomhphoist riachtanach" -#: git-send-email.perl +msgid "The destination IMAP folder is not properly defined." +msgstr "NÃl an fillteán IMAP ceann scrÃbe sainmhÃnithe i gceart." + msgid "The required SMTP server is not properly defined." msgstr "NÃl an freastalaà SMTP riachtanach sainmhÃnithe i gceart." -#: git-send-email.perl #, perl-format msgid "Server does not support STARTTLS! %s" msgstr "Nà thacaÃonn freastalaà le STARTTLS! %s" -#: git-send-email.perl #, perl-format msgid "STARTTLS failed! %s" msgstr "Theip ar STARTTLS! %s" -#: git-send-email.perl msgid "Unable to initialize SMTP properly. Check config and use --smtp-debug." msgstr "" "Nà féidir SMTP a thionscnamh i gceart. Seiceáil configà agus bain úsáid as --" "smtp-debug." -#: git-send-email.perl #, perl-format msgid "Outlook reassigned Message-ID to: %s\n" msgstr "Athshannaigh Outlook ID teachtaireachta chuig: %s\n" -#: git-send-email.perl msgid "Warning: Could not retrieve Message-ID from server response.\n" msgstr "" "Rabhadh: Nà fhéadfaà teachtaireachtaà ID a aisghabháil ó fhreagairt " "freastalaÃ.\n" -#: git-send-email.perl #, perl-format msgid "Failed to send %s\n" msgstr "Theip ar %s a sheoladh\n" -#: git-send-email.perl #, perl-format msgid "Dry-Sent %s" msgstr "Seoladh tirim %s" -#: git-send-email.perl #, perl-format msgid "Sent %s" msgstr "Seoladh %s" -#: git-send-email.perl msgid "Dry-OK. Log says:" msgstr "Tirim-ceart go leor. Log deir:" -#: git-send-email.perl msgid "OK. Log says:" msgstr "CEART GO LEOR. Log deir:" -#: git-send-email.perl msgid "Result: " msgstr "Toradh: " -#: git-send-email.perl msgid "Result: OK" msgstr "Toradh: Ceart go leor" -#: git-send-email.perl #, perl-format msgid "can't open file %s" msgstr "nà féidir comhad %s a oscailt" -#: git-send-email.perl #, perl-format msgid "(mbox) Adding cc: %s from line '%s'\n" msgstr "(mbox) Ag cur cc: %s ó lÃne '%s'\n" -#: git-send-email.perl #, perl-format msgid "(mbox) Adding to: %s from line '%s'\n" msgstr "(mbox) Ag cur le: %s ó lÃne '%s'\n" -#: git-send-email.perl #, perl-format msgid "(non-mbox) Adding cc: %s from line '%s'\n" msgstr "(non-mbox) Ag cur cc: %s ó lÃne '%s'\n" -#: git-send-email.perl #, perl-format msgid "(body) Adding cc: %s from line '%s'\n" msgstr "(corp) Ag cur cc: %s ó lÃne '%s'\n" -#: git-send-email.perl +#, perl-format +msgid "error: invalid SMTP port '%s'\n" +msgstr "earráid: port SMTP neamhbhailà '%s'\n" + #, perl-format msgid "(%s) Could not execute '%s'" msgstr "(%s) Nà raibh '%s' in ann a fhorghnÃomhú" -#: git-send-email.perl #, perl-format msgid "(%s) Malformed output from '%s'" msgstr "(%s) Aschur mÃfheidhmithe ó '%s'" -#: git-send-email.perl #, perl-format msgid "(%s) failed to close pipe to '%s'" msgstr "Theip ar (%s) pÃopa a dhúnadh chuig '%s'" -#: git-send-email.perl #, perl-format msgid "(%s) Adding %s: %s from: '%s'\n" msgstr "(%s) Ag cur %s leis: %s ó: '%s'\n" -#: git-send-email.perl msgid "cannot send message as 7bit" msgstr "nà féidir teachtaireacht a sheoladh mar 7bit" -#: git-send-email.perl msgid "invalid transfer encoding" msgstr "ionchódú aistrithe bailÃ" -#: git-send-email.perl #, perl-format msgid "" "fatal: %s: rejected by %s hook\n" @@ -29718,12 +24968,10 @@ msgstr "" "%s\n" "rabhadh: nÃor seoladh aon phaistÃ\n" -#: git-send-email.perl #, perl-format msgid "unable to open %s: %s\n" -msgstr "nach féidir %s a oscailt: %s\n" +msgstr "nà féidir %s a oscailt: %s\n" -#: git-send-email.perl #, perl-format msgid "" "fatal: %s:%d is longer than 998 characters\n" @@ -29732,17 +24980,104 @@ msgstr "" "marfach: %s: %d nÃos faide ná 998 carachtar\n" "rabhadh: nÃor seoladh aon phaistÃ\n" -#: git-send-email.perl #, perl-format msgid "Skipping %s with backup suffix '%s'.\n" -msgstr "Scaipeáil %s le hiarmhÃr cúltaca '%s'.\n" +msgstr "Ag scipeáil %s leis an iarmhÃr chúltaca '%s'.\n" #. TRANSLATORS: please keep "[y|N]" as is. -#: git-send-email.perl #, perl-format msgid "Do you really want to send %s? [y|N]: " msgstr "An bhfuil tú ag iarraidh %s a sheoladh i ndáirÃre? [y|N]: " +#~ msgid "No previous hunk" +#~ msgstr "NÃl aon hunk roimhe seo" + +#~ msgid "No next hunk" +#~ msgstr "NÃl aon chéad hunk eile" + +#, c-format +#~ msgid " (%s will become dangling)" +#~ msgstr " (beidh %s ag crochadh)" + +#, c-format +#~ msgid " (%s has become dangling)" +#~ msgstr " (%s has become dangling)" + +#~ msgid "git for-each-ref [<options>] [<pattern>]" +#~ msgstr "git for-each-ref [<options>] [<pattern>]" + +#~ msgid "git for-each-ref [--merged [<commit>]] [--no-merged [<commit>]]" +#~ msgstr "git for-each-ref [--merged [<commit>]] [--no-merged [<commit>]]" + +#~ msgid "git for-each-ref [--contains [<commit>]] [--no-contains [<commit>]]" +#~ msgstr "git for-each-ref [--contains [<commit>]] [--no-contains [<commit>]]" + +#~ msgid "use at most one of --auto and --schedule=<frequency>" +#~ msgstr "bain úsáid as --auto agus --schedule=<frequency> ar a mhéad" + +#, c-format +#~ msgid "Final output: %d %s\n" +#~ msgstr "Aschur deiridh: %d %s\n" + +#, c-format +#~ msgid "%d (FSCK_IGNORE?) should never trigger this callback" +#~ msgstr "%d (FSCK_IGNORE?) nÃor cheart go spreagfadh an t-aisghlaoch seo" + +#~ msgid "" +#~ "git pack-objects --stdout [<options>] [< <ref-list> | < <object-list>]" +#~ msgstr "" +#~ "git pack-objects --stdout [<options>] [< <ref-list> | < <object-list>]" + +#~ msgid "" +#~ "git pack-objects [<options>] <base-name> [< <ref-list> | < <object-list>]" +#~ msgstr "" +#~ "git pack-objects [<options>] <base-name> [< <ref-list> | < <object-list>]" + +#~ msgid "cannot use --stdin-packs with --cruft" +#~ msgstr "nà féidir --stdin-packs a úsáid le --cruft" + +#~ msgid "" +#~ "'git pack-redundant' is nominated for removal.\n" +#~ "If you still use this command, please add an extra\n" +#~ "option, '--i-still-use-this', on the command line\n" +#~ "and let us know you still use it by sending an e-mail\n" +#~ "to <git@vger.kernel.org>. Thanks.\n" +#~ msgstr "" +#~ "Tá 'git pack-redundant' ainmnithe le baint.\n" +#~ "Má úsáideann tú an t-ordú seo fós, cuir rogha b\n" +#~ "hreise, '--i-still-use-this', leis an lÃne ordaithe \n" +#~ "agus cuir in iúl dúinn go n-úsáideann tú fós é trà rÃomhphost \n" +#~ "a sheoladh chuig <git@vger.kernel.org>. Go raibh maith agat.\n" + +#~ msgid "" +#~ "git pack-refs [--all] [--no-prune] [--auto] [--include <pattern>] [--" +#~ "exclude <pattern>]" +#~ msgstr "" +#~ "<pattern><pattern>git pack-refs [--all] [--no-prunes] [--auto] [--" +#~ "include] [--eisiamh]" + +#, c-format +#~ msgid "deleting '%s' failed" +#~ msgstr "theip ar '%s' a scriosadh" + +#, c-format +#~ msgid "creating '%s' failed" +#~ msgstr "theip ar chruthú '%s'" + +#, c-format +#~ msgid "unreachable: invalid reference: %s" +#~ msgstr "unrochtana: tagairt neamhbhailÃ: %s" + +#, c-format +#~ msgid "could not open index for %s" +#~ msgstr "nà raibh in ann innéacs a oscailt do %s" + +#~ msgid "trying to write commit not in index" +#~ msgstr "ag iarraidh tiomantas a scrÃobh nà in innéacs" + +#~ msgid "cannot handle pushes this big" +#~ msgstr "nà féidir brú mór seo a láimhseáil" + #~ msgid "git cat-file (-t | -s) [--allow-unknown-type] <object>" #~ msgstr "git cat-file (-t | -s) [--leis-cineál gan eolas] <object>" @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: Git\n" "Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n" -"POT-Creation-Date: 2025-08-12 17:01+0000\n" -"PO-Revision-Date: 2025-08-15 17:33+0700\n" +"POT-Creation-Date: 2025-11-06 23:58+0000\n" +"PO-Revision-Date: 2025-11-13 08:58+0700\n" "Last-Translator: Bagas Sanjaya <bagasdotme@gmail.com>\n" "Language-Team: Indonesian\n" "Language: id\n" @@ -648,28 +648,28 @@ msgstr "Tidak ada yang diterapkan.\n" #: add-patch.c msgid "" -"j - leave this hunk undecided, see next undecided hunk\n" -"J - leave this hunk undecided, see next hunk\n" -"k - leave this hunk undecided, see previous undecided hunk\n" -"K - leave this hunk undecided, see previous hunk\n" +"j - go to the next undecided hunk, roll over at the bottom\n" +"J - go to the next hunk, roll over at the bottom\n" +"k - go to the previous undecided hunk, roll over at the top\n" +"K - go to the previous hunk, roll over at the top\n" "g - select a hunk to go to\n" "/ - search for a hunk matching the given regex\n" "s - split the current hunk into smaller hunks\n" "e - manually edit the current hunk\n" -"p - print the current hunk, 'P' to use the pager\n" +"p - print the current hunk\n" +"P - print the current hunk using the pager\n" "? - print help\n" msgstr "" -"j - biarkan bingkah ini tak diputuskan, lihat bingkah berikutnya yang belum " -"diputuskan\n" -"J - biarkan bingkah ini tak diputuskan, lihat bingkah berikutnya\n" -"k - biarkan bingkah ini tak diputuskan, lihat bingkah sebelumnya yang belum " -"diputuskan\n" -"K - biarkan bingkah ini tak diputuskan, lihat bingkah sebelumnya\n" +"j - pergi ke bingkah yang belum diputuskan selanjutnya, gulung ke bawah\n" +"J - pergi ke bingkah berikutnya, gulung ke bawah\n" +"k - pergi ke bingkah yang belum diputuskan sebelumnya, gulung ke atas\n" +"K - pergi ke bingkah sebelumnya, gulung ke atas\n" "g - pilih satu bingkah untuk dikunjungi\n" "/ - cari satu bingkah yang cocok dengan regex yang diberikan\n" "s - belah bingkah saat ini ke dalam bingkah yang lebih kecil\n" "e - sunting bingkah saat ini secara manual\n" -"p - lihat bingkah saat ini, 'P' untuk menggunakan pager\n" +"p - lihat bingkah saat ini\n" +"P - lihat bingkah saat ini menggunakan pager\n" "? - lihat bantuan\n" #: add-patch.c @@ -678,12 +678,12 @@ msgid "Only one letter is expected, got '%s'" msgstr "Hanya satu huruf yang diharapkan, dapat '%s'" #: add-patch.c -msgid "No previous hunk" -msgstr "Tidak ada bingkah sebelumnya" +msgid "No other hunk" +msgstr "Tidak ada bingkah lainnya" #: add-patch.c -msgid "No next hunk" -msgstr "Tidak ada bingkah selanjutnya" +msgid "No other undecided hunk" +msgstr "Tidak ada bingkah yang belum diputuskan lainnya" #: add-patch.c msgid "No other hunks to goto" @@ -936,7 +936,8 @@ msgid "unclosed quote" msgstr "tanda kutip tak ditutup" #: alias.c builtin/cat-file.c builtin/notes.c builtin/prune-packed.c -#: builtin/receive-pack.c builtin/refs.c builtin/tag.c t/helper/test-pkt-line.c +#: builtin/receive-pack.c builtin/refs.c builtin/repo.c builtin/tag.c +#: t/helper/test-pkt-line.c msgid "too many arguments" msgstr "terlalu banyak argumen" @@ -1261,7 +1262,7 @@ msgstr "%s: salah tipe" msgid "%s has type %o, expected %o" msgstr "%s bertipe %o, diharapkan %o" -#: apply.c read-cache.c +#: apply.c builtin/fast-import.c read-cache.c #, c-format msgid "invalid path '%s'" msgstr "jalur tidak valid '%s'" @@ -1644,7 +1645,7 @@ msgstr "" msgid "git archive --remote <repo> [--exec <cmd>] --list" msgstr "git archive --remote <repo> [--exec <perintah>] --list" -#: archive.c builtin/gc.c builtin/notes.c builtin/tag.c +#: archive.c builtin/fast-import.c builtin/gc.c builtin/notes.c builtin/tag.c #, c-format msgid "cannot read '%s'" msgstr "tidak dapat membaca '%s'" @@ -2005,9 +2006,9 @@ msgid "--reverse and --first-parent together require specified latest commit" msgstr "" "--reverse dan --first-parent bersama-sama butuh komit terbaru yang disebutkan" -#: blame.c builtin/bisect.c builtin/commit.c builtin/log.c builtin/merge.c -#: builtin/pack-objects.c builtin/shortlog.c midx-write.c pack-bitmap.c -#: remote.c sequencer.c submodule.c +#: blame.c builtin/bisect.c builtin/commit.c builtin/fast-export.c +#: builtin/log.c builtin/merge.c builtin/pack-objects.c builtin/shortlog.c +#: midx-write.c pack-bitmap.c remote.c sequencer.c submodule.c msgid "revision walk setup failed" msgstr "persiapan jalan revisi gagal" @@ -2260,7 +2261,7 @@ msgstr "Jalur berikut diabaikan oleh salah satu dari berkas .gitignore Anda:\n" #: builtin/add.c builtin/clean.c builtin/fetch.c builtin/mv.c #: builtin/prune-packed.c builtin/pull.c builtin/push.c builtin/remote.c -#: builtin/rm.c builtin/send-pack.c +#: builtin/rm.c builtin/send-pack.c builtin/sparse-checkout.c msgid "dry run" msgstr "latihan" @@ -2418,8 +2419,8 @@ msgid "bad action '%s' for '%s'" msgstr "tindakan jelek '%s' untuk '%s'" #: builtin/am.c builtin/blame.c builtin/fetch.c builtin/pack-objects.c -#: builtin/pull.c builtin/revert.c diff-merges.c environment.c gpg-interface.c -#: ls-refs.c parallel-checkout.c sequencer.c setup.c +#: builtin/pull.c builtin/revert.c diff-merges.c diff.c environment.c +#: gpg-interface.c ls-refs.c parallel-checkout.c sequencer.c setup.c #, c-format msgid "invalid value for '%s': '%s'" msgstr "nilai tidak valid untuk '%s': '%s'" @@ -2771,7 +2772,8 @@ msgstr "n" #: builtin/am.c builtin/branch.c builtin/bugreport.c builtin/cat-file.c #: builtin/clone.c builtin/diagnose.c builtin/for-each-ref.c builtin/init-db.c #: builtin/ls-files.c builtin/ls-tree.c builtin/refs.c builtin/replace.c -#: builtin/submodule--helper.c builtin/tag.c builtin/verify-tag.c +#: builtin/repo.c builtin/submodule--helper.c builtin/tag.c +#: builtin/verify-tag.c msgid "format" msgstr "format" @@ -2918,15 +2920,22 @@ msgstr "Batasi objek yang hilang ke sparse-checkout saat ini" #: builtin/bisect.c msgid "" -"git bisect start [--term-(new|bad)=<term> --term-(old|good)=<term>] [--no-" -"checkout] [--first-parent] [<bad> [<good>...]] [--] [<pathspec>...]" +"git bisect start [--term-(bad|new)=<term-new> --term-(good|old)=<term-old>]\n" +" [--no-checkout] [--first-parent] [<bad> [<good>...]] [--] " +"[<pathspec>...]" msgstr "" -"git bisect start [--term-(new,bad)=<istilah> --term-(old, good)=<istilah>] " -"[--no-checkout] [--first-parent] [<jelek> [<bagus>...]] [--] [<jalur>...]" +"git bisect start [--term-(new,bad)=<istilah baru> --term-(old, " +"good)=<istilah lama>]\n" +"[--no-checkout] [--first-parent] [<jelek> [<bagus>...]] [--] [<spek " +"jalur>...]" + +#: builtin/bisect.c +msgid "git bisect (bad|new|<term-new>) [<rev>]" +msgstr "git bisect (bad|new|<istilah baru>) [<revisi>]" #: builtin/bisect.c -msgid "git bisect (good|bad) [<rev>...]" -msgstr "git bisect (good|bad) [<revisi>...]" +msgid "git bisect (good|old|<term-old>) [<rev>...]" +msgstr "git bisect (good|old|<istilah lama>) [<revisi>...]" #: builtin/bisect.c msgid "git bisect skip [(<rev>|<range>)...]" @@ -4326,7 +4335,7 @@ msgstr "juga baca kontak dari masukan standar" msgid "read additional mailmap entries from file" msgstr "baca entri mailmap tambahan dari berkas" -#: builtin/check-mailmap.c +#: builtin/check-mailmap.c builtin/fast-import.c msgid "blob" msgstr "blob" @@ -4948,12 +4957,12 @@ msgstr "" "git clean [-d] [-f] [-i] [-n] [-q] [-e <pola>] [-x | -X] [--] [<spek " "jalur>...]" -#: builtin/clean.c +#: builtin/clean.c builtin/sparse-checkout.c #, c-format msgid "Removing %s\n" msgstr "Menghapus %s\n" -#: builtin/clean.c +#: builtin/clean.c builtin/sparse-checkout.c #, c-format msgid "Would remove %s\n" msgstr "Akan hapus %s\n" @@ -5077,7 +5086,7 @@ msgstr "Tidak ada lagi berkas untuk dibersihkan, keluar." msgid "do not print names of files removed" msgstr "jangan cetak nama berkas yang dihapus" -#: builtin/clean.c +#: builtin/clean.c builtin/sparse-checkout.c msgid "force" msgstr "paksa" @@ -5090,8 +5099,8 @@ msgid "remove whole directories" msgstr "hapus keseluruhan direktori" #: builtin/clean.c builtin/config.c builtin/describe.c builtin/grep.c -#: builtin/log.c builtin/ls-files.c builtin/name-rev.c builtin/pack-refs.c -#: builtin/show-ref.c ref-filter.h +#: builtin/log.c builtin/ls-files.c builtin/name-rev.c builtin/show-ref.c +#: pack-refs.c ref-filter.h msgid "pattern" msgstr "pola" @@ -6943,6 +6952,16 @@ msgstr "dapat %i tag; menyerah mencari pada %s\n" #: builtin/describe.c #, c-format +msgid "cannot search for blob '%s' on an unborn branch" +msgstr "tidak dapat mencari blob '%s' pada cabang yang belum lahir" + +#: builtin/describe.c +#, c-format +msgid "blob '%s' not reachable from HEAD" +msgstr "blob '%s' tidak dapat dijangkau dari HEAD" + +#: builtin/describe.c +#, c-format msgid "describe %s\n" msgstr "jelaskan %s\n" @@ -7122,6 +7141,10 @@ msgstr "opsi tidak valid: %s" msgid "%s...%s: no merge base" msgstr "%s...%s: tidak ada dasar penggabungan" +#: builtin/diff.c setup.c +msgid "cannot come back to cwd" +msgstr "tidak dapat kembali ke cwd" + #: builtin/diff.c msgid "Not a git repository" msgstr "bukan repositori git" @@ -7262,10 +7285,168 @@ msgid "git fast-export [<rev-list-opts>]" msgstr "git fast-export [<opsi rev-list>]" #: builtin/fast-export.c -msgid "Error: Cannot export nested tags unless --mark-tags is specified." +#, c-format +msgid "unknown %s mode: %s" +msgstr "mode %s tidak dikenal: %s" + +#: builtin/fast-export.c +#, c-format +msgid "unknown tag-of-filtered mode: %s" +msgstr "mode tag-of-filtered tidak dikenal: %s" + +#: builtin/fast-export.c +#, c-format +msgid "unknown reencoding mode: %s" +msgstr "mode pengkodean ulang tidak dikenal: %s" + +#: builtin/fast-export.c +#, c-format +msgid "could not read blob %s" +msgstr "tidak dapat membaca blob %s" + +#: builtin/fast-export.c +#, c-format +msgid "oid mismatch in blob %s" +msgstr "ketidakcocokan oid pada blob %s" + +#: builtin/fast-export.c +#, c-format +msgid "could not write blob '%s'" +msgstr "tidak dapat menulis blob '%s'" + +#: builtin/fast-export.c +#, c-format +msgid "unexpected comparison status '%c' for %s, %s" +msgstr "status perbandingan '%c' tidak diharapkan untuk %s, %s" + +#: builtin/fast-export.c +msgid "none" +msgstr "tidak ada" + +#: builtin/fast-export.c +#, c-format +msgid "could not find author in commit %s" +msgstr "tidak dapat menemukan pengarang pada komit %s" + +#: builtin/fast-export.c +#, c-format +msgid "could not find committer in commit %s" +msgstr "tidak dapat menemukan pengkomit pada komit %s" + +#: builtin/fast-export.c +#, c-format +msgid "" +"encountered commit-specific encoding %.*s in commit %s; use --reencode=[yes|" +"no] to handle it" +msgstr "" +"menemukan pengkodean komit-spesifik %.*s pada komit %s; gunakan --" +"reencode=[yes|no] untuk menanganinya" + +#: builtin/fast-export.c +#, c-format +msgid "encountered signed commit %s; use --signed-commits=<mode> to handle it" +msgstr "" +"menemukan komit bertandatangan %s; gunakan --signed-commits=<mode> untuk " +"menanganinya" + +#: builtin/fast-export.c +#, c-format +msgid "exporting %<PRIuMAX> signature(s) for commit %s" +msgstr "mengekspor %<PRIuMAX> tandatangan untuk komit %s" + +#: builtin/fast-export.c +#, c-format +msgid "stripping signature(s) from commit %s" +msgstr "mengupas tandatangan dari komit %s" + +#: builtin/fast-export.c +#, c-format +msgid "" +"omitting tag %s,\n" +"since tags of trees (or tags of tags of trees, etc.) are not supported." +msgstr "" +"melewatkan tag %s,\n" +"karena tag pohon (atau tag dari tag pohon, dsm.) tidak didukung." + +#: builtin/fast-export.c +#, c-format +msgid "could not read tag %s" +msgstr "tidak dapat membaca tag %s" + +#: builtin/fast-export.c +#, c-format +msgid "encountered signed tag %s; use --signed-tags=<mode> to handle it" +msgstr "" +"menemukan tag bertandatangan %s; gunakan --signed-tags=<mode> untuk " +"menanganinya" + +#: builtin/fast-export.c +#, c-format +msgid "exporting signed tag %s" +msgstr "mengekspor tag bertandatangan %s" + +#: builtin/fast-export.c +#, c-format +msgid "stripping signature from tag %s" +msgstr "mengupas tandatangan dari tag %s" + +#: builtin/fast-export.c +#, c-format +msgid "" +"tag %s tags unexported object; use --tag-of-filtered-object=<mode> to handle " +"it" msgstr "" -"Kesalahan: Tidak dapat mengekspor tag bersarang kecuali jika --mark-tags " -"disebutkan." +"tag %s mentag objek tak terekspor; gunakan --tag-of-filtered-object=<mode> " +"untuk menanganinya" + +#: builtin/fast-export.c +msgid "cannot export nested tags unless --mark-tags is specified." +msgstr "tidak dapat mengekspor tag bersarang kecuali --mark-tags dirincikan." + +#: builtin/fast-export.c +#, c-format +msgid "tag %s points nowhere?" +msgstr "tag %s tidak menunjuk kemana-mana?" + +#: builtin/fast-export.c +#, c-format +msgid "%s: unexpected object of type %s, skipping." +msgstr "%s: objek yang tak diharapkan bertipe %s, lewati." + +#: builtin/fast-export.c +#, c-format +msgid "tag points to object of unexpected type %s, skipping." +msgstr "tag menunjuk pada objek yang bertipe yang tidak diharapkan %s, lewati." + +#: builtin/fast-export.c +#, c-format +msgid "unable to open marks file %s for writing." +msgstr "tidak dapat membuka berkas tanda %s untuk ditulis." + +#: builtin/fast-export.c +#, c-format +msgid "unable to write marks file %s." +msgstr "tidak dapat menulis berkas tanda %s." + +#: builtin/fast-export.c builtin/fast-import.c +#, c-format +msgid "corrupt mark line: %s" +msgstr "baris tanda rusak: %s" + +#: builtin/fast-export.c builtin/fast-import.c fetch-pack.c +#, c-format +msgid "object not found: %s" +msgstr "object tidak ditemukan: %s" + +#: builtin/fast-export.c +#, c-format +msgid "not a commit? can't happen: %s" +msgstr "bukan sebuah komit? tidak bisa: %s" + +#: builtin/fast-export.c +#, c-format +msgid "object %s already has a mark" +msgstr "objek %s sudah bertanda" #: builtin/fast-export.c msgid "--anonymize-map token cannot be empty" @@ -7353,34 +7534,572 @@ msgstr "label tag dengan id tanda" #: builtin/fast-import.c #, c-format -msgid "Missing from marks for submodule '%s'" -msgstr "Kehilangan tanda dari untuk submodul '%s'" +msgid "can't write crash report %s" +msgstr "tidak dapat menulis laporan kerusakan %s" + +#: builtin/fast-import.c +#, c-format +msgid "fast-import: dumping crash report to %s\n" +msgstr "fast-import: membuang laporan kerusakan ke %s\n" + +#: builtin/fast-import.c +#, c-format +msgid "mark :%<PRIuMAX> not declared" +msgstr "tanda :%<PRIuMAX> tidak dirincikan" + +#: builtin/fast-import.c +#, c-format +msgid "invalid attempt to create duplicate branch: %s" +msgstr "percobaan tidak valid saat membuat cabang duplikat: %s" + +#: builtin/fast-import.c +#, c-format +msgid "branch name doesn't conform to Git standards: %s" +msgstr "nama cabang tidak sesuai dengan standar Git: %s" + +#: builtin/fast-import.c +msgid "internal consistency error creating the index" +msgstr "galat konsistensi internal saat membuat indeks" + +#: builtin/fast-import.c +msgid "cannot create keep file" +msgstr "tidak dapat membuat berkas jaga" + +#: builtin/fast-import.c +msgid "failed to write keep file" +msgstr "gagal menulis berkas jaga" + +#: builtin/fast-import.c +msgid "cannot store pack file" +msgstr "tidak dapat menyimpan berkas pak" + +#: builtin/fast-import.c +msgid "cannot store index file" +msgstr "tidak dapat menyimpan berkas indeks" + +#: builtin/fast-import.c +#, c-format +msgid "failed seeking to start of '%s'" +msgstr "gagal mengunjungi ke awal dari '%s'" + +#: builtin/fast-import.c +#, c-format +msgid "core Git rejected index %s" +msgstr "Git inti menolak indeks %s" + +#: builtin/fast-import.c +msgid "cannot truncate pack to skip duplicate" +msgstr "tidak dapat memotong pak untuk melewatkan duplikat" + +#: builtin/fast-import.c +#, c-format +msgid "EOF in data (%<PRIuMAX> bytes remaining)" +msgstr "EOF pada data (%<PRIuMAX> perintah tersisa):" + +#: builtin/fast-import.c +#, c-format +msgid "unexpected deflate failure: %d" +msgstr "kegagalan deflate yang tidak diharapkan: %d" + +#: builtin/fast-import.c +#, c-format +msgid "not a tree: %s" +msgstr "bukan sebuah pohon: %s" + +#: builtin/fast-import.c +#, c-format +msgid "can't load tree %s" +msgstr "tidak dapat memuat pohon %s" + +#: builtin/fast-import.c +#, c-format +msgid "corrupt mode in %s" +msgstr "mode rusak di %s" + +#: builtin/fast-import.c +msgid "root cannot be a non-directory" +msgstr "akar tidak dapat menjadi non-direktori" + +#: builtin/fast-import.c +msgid "empty path component found in input" +msgstr "komponen jalur kosong ditemukan di masukan" + +#: builtin/fast-import.c +msgid "non-directories cannot have subtrees" +msgstr "non-direktori tidak dapat mempunyai subpohon" + +#: builtin/fast-import.c +#, c-format +msgid "dropping %s since it would point to itself (i.e. to %s)" +msgstr "menjatuhkan %s karena akan menunjuk pada dirinya sendiri (yaitu ke %s)" + +#: builtin/fast-import.c +#, c-format +msgid "branch %s is missing commits." +msgstr "cabang %s kehilangan komit." + +#: builtin/fast-import.c +#, c-format +msgid "not updating %s (new tip %s does not contain %s)" +msgstr "tidak memperbarui %s (ujung baru %s tidak mempunyai %s)" + +#: builtin/fast-import.c builtin/sparse-checkout.c commit-graph.c midx-write.c +#: sequencer.c +#, c-format +msgid "unable to create leading directories of %s" +msgstr "tidak dapat membuat direktori utama dari %s" + +#: builtin/fast-import.c +#, c-format +msgid "unable to write marks file %s" +msgstr "tidak dapat menulis berkas tanda %s" + +#: builtin/fast-import.c +#, c-format +msgid "unable to write marks file %s: %s" +msgstr "tidak dapat menulis berkas tanda %s: %s" + +#: builtin/fast-import.c object-file.c +#, c-format +msgid "unable to write file %s" +msgstr "tidak dapat menulis berkas %s" + +#: builtin/fast-import.c +#, c-format +msgid "expected 'data n' command, found: %s" +msgstr "perintah 'data n' diharapkan, dapat: %s" + +#: builtin/fast-import.c +#, c-format +msgid "EOF in data (terminator '%s' not found)" +msgstr "EOF pada data (pengakhir '%s' tidak ditemukan)" + +#: builtin/fast-import.c +msgid "data is too large to use in this context" +msgstr "data terlalu besar untuk digunakan dalam konteks ini" + +#: builtin/fast-import.c +#, c-format +msgid "EOF in data (%lu bytes remaining)" +msgstr "EOF pada data (%lu bita tersisa)" + +#: builtin/fast-import.c +#, c-format +msgid "missing < in ident string: %s" +msgstr "< hilang di untai identitas: %s" + +#: builtin/fast-import.c +#, c-format +msgid "missing space before < in ident string: %s" +msgstr "spasi hilang sebelum < di untai identitas: %s" + +#: builtin/fast-import.c +#, c-format +msgid "missing > in ident string: %s" +msgstr "> hilang di untai identitas: %s" + +#: builtin/fast-import.c +#, c-format +msgid "missing space after > in ident string: %s" +msgstr "spasi hilang setalah > di untai identitas: %s" + +#: builtin/fast-import.c +#, c-format +msgid "invalid raw date \"%s\" in ident: %s" +msgstr "tanggal mentah \"%s\" tidak valid pada identitas: %s" + +#: builtin/fast-import.c +#, c-format +msgid "invalid rfc2822 date \"%s\" in ident: %s" +msgstr "tanggal rfc2822 \"%s\" tidak valid pada identitas: %s" + +#: builtin/fast-import.c +#, c-format +msgid "date in ident must be 'now': %s" +msgstr "tanggal di identitas harus 'now': %s" + +#: builtin/fast-import.c +#, c-format +msgid "too large fanout (%u)" +msgstr "kipas keluar terlalu besar (%u)" + +#: builtin/fast-import.c +#, c-format +msgid "failed to remove path %s" +msgstr "gagal menghapus jalur %s" + +#: builtin/fast-import.c +#, c-format +msgid "no value after ':' in mark: %s" +msgstr "tidak ada nilai setelah ':' pada tanda: %s" + +#: builtin/fast-import.c +#, c-format +msgid "garbage after mark: %s" +msgstr "sampah setelah tanda: %s" + +#: builtin/fast-import.c +#, c-format +msgid "missing space after mark: %s" +msgstr "spasi hilang setelah tanda: %s" + +#: builtin/fast-import.c +#, c-format +msgid "invalid %s: %s" +msgstr "%s tidak valid: %s" + +#: builtin/fast-import.c +#, c-format +msgid "NUL in %s: %s" +msgstr "NUL pada %s: %s" + +#: builtin/fast-import.c +#, c-format +msgid "garbage after %s: %s" +msgstr "sampah setelah %s: %s" + +#: builtin/fast-import.c +#, c-format +msgid "missing space after %s: %s" +msgstr "spasi hilang setelah %s: %s" + +#: builtin/fast-import.c +#, c-format +msgid "corrupt mode: %s" +msgstr "mode rusak: %s" + +#: builtin/fast-import.c +#, c-format +msgid "invalid dataref: %s" +msgstr "referensi data tidak valid: %s" + +#: builtin/fast-import.c +#, c-format +msgid "missing space after SHA1: %s" +msgstr "spasi hilang setelah SHA1: %s" + +#: builtin/fast-import.c +#, c-format +msgid "Git links cannot be specified 'inline': %s" +msgstr "Tautan Git tidak dapat dirincikan 'inline': %s" + +#: builtin/fast-import.c +#, c-format +msgid "not a commit (actually a %s): %s" +msgstr "bukan komit (sebenarnya %s): %s" + +#: builtin/fast-import.c +#, c-format +msgid "directories cannot be specified 'inline': %s" +msgstr "direktori tidak dapat dirincikan sebagai 'inline': %s" + +#: builtin/fast-import.c +#, c-format +msgid "%s not found: %s" +msgstr "%s tidak ditemukan: %s" + +#: builtin/fast-import.c +msgid "tree" +msgstr "pohon" + +#: builtin/fast-import.c +#, c-format +msgid "not a %s (actually a %s): %s" +msgstr "buakn sebuah %s (sebenarya %s): %s" + +#: builtin/fast-import.c +#, c-format +msgid "path %s not in branch" +msgstr "jalur %s bukan di dalam cabang" + +#: builtin/fast-import.c +msgid "can't add a note on empty branch." +msgstr "tidak dapat menambahkan catatan pada cabang kosong." + +#: builtin/fast-import.c +#, c-format +msgid "mark :%<PRIuMAX> not a commit" +msgstr "tanda :%<PRIuMAX> bukan sebuah komit" + +#: builtin/fast-import.c +#, c-format +msgid "not a valid commit: %s" +msgstr "bukan sebuah komit yang valid: %s" + +#: builtin/fast-import.c +#, c-format +msgid "invalid ref name or SHA1 expression: %s" +msgstr "nama referensi atau ekspresi SHA1 tidak valid: %s" + +#: builtin/fast-import.c +#, c-format +msgid "not a blob (actually a %s): %s" +msgstr "bukan sebuah blob (sebenarnya %s): %s" + +#: builtin/fast-import.c +#, c-format +msgid "blob not found: %s" +msgstr "blob tidak ditemukan: %s" + +#: builtin/fast-import.c +#, c-format +msgid "the commit %s is corrupt" +msgstr "komit %s rusak" #: builtin/fast-import.c #, c-format -msgid "Missing to marks for submodule '%s'" -msgstr "Kehilangan tanda ke untuk submodul '%s'" +msgid "can't create a branch from itself: %s" +msgstr "tidak dapat membuat caband dari dirinya sendiri: %s" #: builtin/fast-import.c #, c-format -msgid "Expected 'mark' command, got %s" -msgstr "Perintah 'mark' diharapkan, dapat %s" +msgid "" +"expected gpgsig format: 'gpgsig <hash-algo> <signature-format>', got 'gpgsig " +"%s'" +msgstr "" +"format gpgsig: 'gpgsig <algoritma hash> <format tandatangan>' diharapkan, " +"dapat 'gpgsig %s'" + +#: builtin/fast-import.c +#, c-format +msgid "unknown git hash algorithm in gpgsig: '%s'" +msgstr "algoritma git hash tidak dikenal di gpgsig: '%s'" #: builtin/fast-import.c #, c-format -msgid "Expected 'to' command, got %s" -msgstr "Perintah 'to' diharapkan, dapat %s" +msgid "invalid signature format in gpgsig: '%s'" +msgstr "format tandatangan tidak valid pada gpgsig: '%s'" + +#: builtin/fast-import.c +msgid "'unknown' signature format in gpgsig" +msgstr "format tandatangan 'tidak dikenal' di gpgsig" + +#: builtin/fast-import.c +#, c-format +msgid "multiple %s signatures found, ignoring additional signature" +msgstr "beberapa %s tandatangan ditemukan, abaikan tandatangan tambahan" + +#: builtin/fast-import.c +msgid "parse_one_signature() returned unknown hash algo" +msgstr "parse_one_signature() mengembalikan algoritma hash tak dikenal" + +#: builtin/fast-import.c +msgid "expected committer but didn't get one" +msgstr "pengkomit diharapkan tapi tidak mendapatkannya" + +#: builtin/fast-import.c +msgid "encountered signed commit; use --signed-commits=<mode> to handle it" +msgstr "" +"menemukan komit bertandatangan; gunakan --signed-commits=<mode> untuk " +"menanganinya" + +#: builtin/fast-import.c +msgid "stripping a commit signature" +msgstr "mengupas tandatangan komit" #: builtin/fast-import.c -msgid "Expected format name:filename for submodule rewrite option" +msgid "importing a commit signature verbatim" +msgstr "mengimpor tandatangan komit secara verbatim" + +#: builtin/fast-import.c +msgid "encountered signed tag; use --signed-tags=<mode> to handle it" msgstr "" -"Format nama:nama berkas diharapkan untuk operasi penulisan ulang submodul" +"menemukan tag bertandatangan; gunakan --signed-tags=<mode> untuk menanganinya" + +#: builtin/fast-import.c +#, c-format +msgid "importing a tag signature verbatim for tag '%s'" +msgstr "mengimpor tag secara verbatim untuk tag '%s'" + +#: builtin/fast-import.c +#, c-format +msgid "stripping a tag signature for tag '%s'" +msgstr "mengupas tandatangan tag untuk tag '%s'" + +#: builtin/fast-import.c +#, c-format +msgid "expected 'from' command, got '%s'" +msgstr "perintah 'from' diharapkan, dapat '%s'" + +#: builtin/fast-import.c +msgid "can't tag an empty branch." +msgstr "tidak dapat mentag sebuah cabang kosong." + +#: builtin/fast-import.c builtin/merge.c +#, c-format +msgid "not a valid object: %s" +msgstr "bukan objek valid: %s" + +#: builtin/fast-import.c +msgid "write to frontend failed" +msgstr "penulisan ke frontend gagal" + +#: builtin/fast-import.c +#, c-format +msgid "can't read object %s" +msgstr "tidak dapat membaca objek %s" + +#: builtin/fast-import.c +#, c-format +msgid "object %s is a %s but a blob was expected." +msgstr "objek %s adalah %s tapi blob diharapkan." + +#: builtin/fast-import.c +#, c-format +msgid "not a mark: %s" +msgstr "bukan sebuah tanda: %s" + +#: builtin/fast-import.c +#, c-format +msgid "unknown mark: %s" +msgstr "tanda tidak dikenal: %s" + +#: builtin/fast-import.c +#, c-format +msgid "garbage after SHA1: %s" +msgstr "sampah setelah SHA1: %s" + +#: builtin/fast-import.c +#, c-format +msgid "not a tree-ish: %s" +msgstr "bukan mirip-pohon: '%s'" + +#: builtin/fast-import.c +#, c-format +msgid "can't load object %s" +msgstr "tidak dapat memuat objek %s" + +#: builtin/fast-import.c +#, c-format +msgid "invalid SHA1 in tag: %s" +msgstr "SHA1 tidak valid pada tag: %s" + +#: builtin/fast-import.c +#, c-format +msgid "invalid SHA1 in commit: %s" +msgstr "SHA1 tidak valid pada komit: %s" + +#: builtin/fast-import.c +#, c-format +msgid "missing from marks for submodule '%s'" +msgstr "tanda dari hilang untuk submodul '%s'" + +#: builtin/fast-import.c +#, c-format +msgid "missing to marks for submodule '%s'" +msgstr "tanda ke hilang untuk submodul '%s'" + +#: builtin/fast-import.c +#, c-format +msgid "missing space after tree-ish: %s" +msgstr "spasi hilang setelah mirip-pohon: %s" + +#: builtin/fast-import.c +#, c-format +msgid "not in a commit: %s" +msgstr "bukan di dalam komit: %s" + +#: builtin/fast-import.c +#, c-format +msgid "expected 'mark' command, got %s" +msgstr "[erintah 'mark' diharapkan, dapat %s" + +#: builtin/fast-import.c +#, c-format +msgid "expected 'to' command, got %s" +msgstr "perintah 'to' diharapkan, dapat %s" + +#: builtin/fast-import.c +msgid "only one import-marks command allowed per stream" +msgstr "hanya satu perintah import-marks yang diperbolehkan per arus" + +#: builtin/fast-import.c +#, c-format +msgid "unknown --date-format argument %s" +msgstr "argumen --date-format tidak dikenal %s" + +#: builtin/fast-import.c +#, c-format +msgid "%s: argument must be a non-negative integer" +msgstr "%s: argumen harus bilangan bulat non-negatif" + +#: builtin/fast-import.c +#, c-format +msgid "--depth cannot exceed %u" +msgstr "--depth tidak dapat melebihi %u" + +#: builtin/fast-import.c +#, c-format +msgid "--cat-blob-fd cannot exceed %d" +msgstr "--cat-blob-fd tidak dapat melebihi %d" + +#: builtin/fast-import.c +msgid "expected format name:filename for submodule rewrite option" +msgstr "format nama:nama berkas diharapkan untuk opsi penulisan ulang submodul" + +#: builtin/fast-import.c +#, c-format +msgid "max-pack-size is now in bytes, assuming --max-pack-size=%lum" +msgstr "max-pack-size sekarang dalam bita, asumsikan --max-pack-size=%lum" + +#: builtin/fast-import.c +msgid "minimum max-pack-size is 1 MiB" +msgstr "max-pack-size minimal adalah 1 MiB" + +#: builtin/fast-import.c +#, c-format +msgid "unknown --signed-commits mode '%s'" +msgstr "mode --signed-commits tidak dikenal '%s'" + +#: builtin/fast-import.c +#, c-format +msgid "unknown --signed-tags mode '%s'" +msgstr "mode --signed-tags tidak dikenal: '%s'" #: builtin/fast-import.c #, c-format msgid "feature '%s' forbidden in input without --allow-unsafe-features" msgstr "fitur '%s' dilarang dalam input tanpa --allow-unsafe-features" +#: builtin/fast-import.c +#, c-format +msgid "got feature command '%s' after data command" +msgstr "dapat perintah fitur '%s' setelah perintah data" + +#: builtin/fast-import.c +#, c-format +msgid "this version of fast-import does not support feature %s." +msgstr "versi fast-import ini tidak mendukung fitur %s." + +#: builtin/fast-import.c +#, c-format +msgid "got option command '%s' after data command" +msgstr "dapat perintah opsi '%s' setelah perintah data" + +#: builtin/fast-import.c +#, c-format +msgid "this version of fast-import does not support option: %s" +msgstr "versi fast-import ini tidak mendukung opsi: %s" + +#: builtin/fast-import.c builtin/merge-recursive.c +#, c-format +msgid "unknown option %s" +msgstr "opsi tidak dikenal %s" + +#: builtin/fast-import.c +#, c-format +msgid "unknown option --%s" +msgstr "opsi tidak dikenal --%s" + +#: builtin/fast-import.c +#, c-format +msgid "unsupported command: %s" +msgstr "perintah tidak didukung: %s" + +#: builtin/fast-import.c +msgid "stream ends early" +msgstr "arus berakhir lebih awal" + #: builtin/fetch-pack.c #, c-format msgid "Lockfile created but not reported: %s" @@ -7553,6 +8272,36 @@ msgstr "" "mematikan peringatan ini sampai remote mengubah HEAD ke yang lain." #: builtin/fetch.c +msgid "" +"You're on a case-insensitive filesystem, and the remote you are\n" +"trying to fetch from has references that only differ in casing. It\n" +"is impossible to store such references with the 'files' backend. You\n" +"can either accept this as-is, in which case you won't be able to\n" +"store all remote references on disk. Or you can alternatively\n" +"migrate your repository to use the 'reftable' backend with the\n" +"following command:\n" +"\n" +" git refs migrate --ref-format=reftable\n" +"\n" +"Please keep in mind that not all implementations of Git support this\n" +"new format yet. So if you use tools other than Git to access this\n" +"repository it may not be an option to migrate to reftables.\n" +msgstr "" +"Anda berada dalam sistemberkas yang tidak peka huruf besar/kecil, dan\n" +"remote yang Anda coba untuk diambil ada referensi yang hanya berbeda pada\n" +"huruf besar/kecil. Tidak mungkin untuk menyimpan referensi tersebut dengan\n" +"backend 'files'. Anda dapat menerimanya sebagaimana mestinya, yang dimana\n" +"Anda tidak akan bisa menyimpan semua referensi remote pada disk; atau Anda\n" +"dapat memindahkan repositori Anda agar menggunakan backend 'reftable'\n" +"dengan perintah:\n" +"\n" +" git refs migrate --ref-format=reftable\n" +"\n" +"Perlu diingat bahwa belum semua implementasi Git mendukung format baru ini.\n" +"Jadi, jika Anda menggunakan alat selain git untuk mengakses repositori ini,\n" +"memindahkan ke reftables bisa jadi bukan sebuah opsi untuk Anda.\n" + +#: builtin/fetch.c #, c-format msgid "" "some local refs could not be updated; try running\n" @@ -7859,26 +8608,6 @@ msgid "file to read from" msgstr "berkas untuk dibaca" #: builtin/for-each-ref.c -msgid "git for-each-ref [<options>] [<pattern>]" -msgstr "git for-each-ref [<opsi>] [<pola>]" - -#: builtin/for-each-ref.c -msgid "git for-each-ref [--points-at <object>]" -msgstr "git for-each-ref [--points-at <objek>]" - -#: builtin/for-each-ref.c -msgid "git for-each-ref [--merged [<commit>]] [--no-merged [<commit>]]" -msgstr "git for-each-ref [--merged [<komit>]] [--no-merged [<komit>]]" - -#: builtin/for-each-ref.c -msgid "git for-each-ref [--contains [<commit>]] [--no-contains [<commit>]]" -msgstr "git for-each-ref [--contains [<komit>]] [--no-contains [<komit>]]" - -#: builtin/for-each-ref.c -msgid "git for-each-ref [--start-after <marker>]" -msgstr "git for-each-ref [--start-after <penanda>]" - -#: builtin/for-each-ref.c msgid "quote placeholders suitably for shells" msgstr "kutip tempat penampung yang sesuai untuk cangkang" @@ -7950,6 +8679,10 @@ msgstr "argumen tidak dikenal diberikan dengan --stdin" msgid "cannot use --start-after with patterns" msgstr "tidak dapat menggunakan --start-after dengan pola" +#: builtin/for-each-ref.c +msgid "git for-each-ref " +msgstr "git for-each-ref " + #: builtin/for-each-repo.c msgid "git for-each-repo --config=<config> [--] <arguments>" msgstr "git for-each-repo --config=<konfigurasi> [--] <argumen perintah>" @@ -8239,7 +8972,7 @@ msgstr "aktifkan pemeriksaan lebih ketat" msgid "write dangling objects in .git/lost-found" msgstr "tulis objek teruntai dalam .git/lost-found" -#: builtin/fsck.c builtin/prune.c +#: builtin/fsck.c builtin/prune.c builtin/repo.c msgid "show progress" msgstr "perlihatkan perkembangan" @@ -8546,6 +9279,10 @@ msgstr "" "melewatkan tugas pengepakan tambahan karena core.multiPackIndex dinonaktifkan" #: builtin/gc.c +msgid "failed to perform geometric repack" +msgstr "gagal melakukan pak ulang geometri" + +#: builtin/gc.c #, c-format msgid "task '%s' failed" msgstr "tugas '%s' gagal" @@ -8557,6 +9294,11 @@ msgstr "berkas kunci '%s' ada, melewatkan pemeliharaan" #: builtin/gc.c #, c-format +msgid "unknown maintenance strategy: '%s'" +msgstr "strategi pemeliharaan tidak dikenal: '%s'" + +#: builtin/gc.c +#, c-format msgid "'%s' is not a valid task" msgstr "'%s' bukan tugas yang valid" @@ -9659,6 +10401,35 @@ msgstr "--trailer dengan --only-input tidak masuk akal" msgid "no input file given for in-place editing" msgstr "tidak ada berkas masukan yang diberikan untuk penyuntingan di tempat" +#: builtin/last-modified.c +msgid "last-modified can only operate on one tree at a time" +msgstr "last-modified hanya dapat beroperasi pada satu pohon pada satu waktu" + +#: builtin/last-modified.c +#, c-format +msgid "unknown last-modified argument: %s" +msgstr "argumen last-modified tidak dikenal: %s" + +#: builtin/last-modified.c +msgid "unable to setup last-modified" +msgstr "tidak dapat mensetup last-modified" + +#: builtin/last-modified.c +msgid "" +"git last-modified [--recursive] [--show-trees] [<revision-range>] [[--] " +"<path>...]" +msgstr "" +"git last-modified [--recursive] [--show-trees] [<rentang revisi>] [[--] " +"<jalur>...]" + +#: builtin/last-modified.c builtin/ls-tree.c +msgid "recurse into subtrees" +msgstr "rekursi ke dalam subpohon" + +#: builtin/last-modified.c +msgid "show tree entries when recursing into subtrees" +msgstr "perlihatkan entri pohon ketika mengulangi ke dalam subpohon" + #: builtin/log.c msgid "git log [<options>] [<revision-range>] [[--] <path>...]" msgstr "git log [<opsi>] [<rentang revisi>] [[--] <jalur>...]" @@ -9709,6 +10480,23 @@ msgid "-L<range>:<file> cannot be used with pathspec" msgstr "-L<rentang>:<berkas> tidak dapat digunakan dengan spek jalur" #: builtin/log.c +msgid "" +"\n" +"hint: You can replace 'git whatchanged <opts>' with:\n" +"hint:\tgit log <opts> --raw --no-merges\n" +"hint: Or make an alias:\n" +"hint:\tgit config set --global alias.whatchanged 'log --raw --no-merges'\n" +"\n" +msgstr "" +"\n" +"petunjuk: Anda dapat mengganti 'git whatchanged <opsi>' dengan:\n" +"petunjuk:\tgit log <opsi> --raw --no-merges\n" +"petunjuk: Atau buat alias:\n" +"petunjuk:\tgit config set --global alias.whatchanged 'log --raw --no-" +"merges'\n" +"\n" + +#: builtin/log.c #, c-format msgid "git show %s: bad file" msgstr "git show %s: berkas jelek" @@ -10281,10 +11069,6 @@ msgid "only show trees" msgstr "hanya perlihatkan pohon" #: builtin/ls-tree.c -msgid "recurse into subtrees" -msgstr "rekursi ke dalam subpohon" - -#: builtin/ls-tree.c msgid "show trees when recursing" msgstr "perlihatkan pohon ketika rekursi" @@ -10479,11 +11263,6 @@ msgstr "Tidak dapat menulis berkas objek" #: builtin/merge-recursive.c #, c-format -msgid "unknown option %s" -msgstr "opsi tidak dikenal %s" - -#: builtin/merge-recursive.c -#, c-format msgid "could not parse object '%s'" msgstr "tidak dapat menguraikan objek '%s'" @@ -10702,11 +11481,6 @@ msgid "stash failed" msgstr "stase gagal" #: builtin/merge.c -#, c-format -msgid "not a valid object: %s" -msgstr "bukan objek valid: %s" - -#: builtin/merge.c msgid "read-tree failed" msgstr "read-tree gagal" @@ -11164,7 +11938,7 @@ msgstr "tidak dapat memindahkan baik '%s' dan direktori induknya '%s'" msgid "Renaming %s to %s\n" msgstr "Mengganti nama %s ke %s\n" -#: builtin/mv.c builtin/remote.c +#: builtin/mv.c #, c-format msgid "renaming '%s' failed" msgstr "gagal mengganti nama '%s'" @@ -11729,7 +12503,7 @@ msgstr "offset dasar delta meluap di dalam pak untuk %s" msgid "delta base offset out of bound for %s" msgstr "offset dasar delta di luar batas untuk %s" -#: builtin/pack-objects.c +#: builtin/pack-objects.c builtin/repo.c msgid "Counting objects" msgstr "Menghitung objek" @@ -12148,32 +12922,8 @@ msgstr "" "%<PRIu32>), pak yang digunakan ulang %<PRIu32> (dari %<PRIuMAX>)" #: builtin/pack-refs.c -msgid "" -"git pack-refs [--all] [--no-prune] [--auto] [--include <pattern>] [--exclude " -"<pattern>]" -msgstr "" -"git pack-refs [--all] [--no-prune] [--auto] [--include <pola>][--exclude " -"<pola>]" - -#: builtin/pack-refs.c -msgid "pack everything" -msgstr "pak semuanya" - -#: builtin/pack-refs.c -msgid "prune loose refs (default)" -msgstr "pangkas referensi longgar (asali)" - -#: builtin/pack-refs.c -msgid "auto-pack refs as needed" -msgstr "otomatis pak referensi jika dibutuhkan" - -#: builtin/pack-refs.c -msgid "references to include" -msgstr "referensi untuk ditambahkan" - -#: builtin/pack-refs.c -msgid "references to exclude" -msgstr "referensi untuk dikecualikan" +msgid "git pack-refs " +msgstr "git pack-refs " #: builtin/patch-id.c msgid "git patch-id [--stable | --unstable | --verbatim]" @@ -12784,6 +13534,11 @@ msgid "git range-diff [<options>] <base> <old-tip> <new-tip>" msgstr "git range-diff [<opsi>] <dasar> <ujung lama> <ujung baru>" #: builtin/range-diff.c +#, c-format +msgid "invalid max-memory value: %s" +msgstr "nilai max-memory tidak valid: %s" + +#: builtin/range-diff.c msgid "use simple diff colors" msgstr "gunakan warna diff sederhana" @@ -12796,6 +13551,14 @@ msgid "passed to 'git log'" msgstr "lewatkan ke 'git log'" #: builtin/range-diff.c +msgid "size" +msgstr "ukuran" + +#: builtin/range-diff.c +msgid "maximum memory for cost matrix (default 4G)" +msgstr "memoi maksimum untuk matriks biaya (asali 40)" + +#: builtin/range-diff.c msgid "only emit output related to the first range" msgstr "hanya keluarkan keluaran relatif terhadap rentang pertama" @@ -13471,16 +14234,12 @@ msgid "git reflog list" msgstr "git reflog list" #: builtin/reflog.c -msgid "" -"git reflog expire [--expire=<time>] [--expire-unreachable=<time>]\n" -" [--rewrite] [--updateref] [--stale-fix]\n" -" [--dry-run | -n] [--verbose] [--all [--single-worktree] | " -"<refs>...]" -msgstr "" -"git reflog expire [--expire=<waktu>] [--expire-unreachable=<waktu>]\n" -" [--rewrite] [--updateref] [--stale-fix]\n" -" [--dry-run | -n] [--verbose] [--all [--single-worktree] | " -"<referensi>...]" +msgid "git reflog exists <ref>" +msgstr "git reflog exists <referensi>" + +#: builtin/reflog.c +msgid "git reflog write <ref> <old-oid> <new-oid> <message>" +msgstr "git reflog write <referensi> <oid lama> <oid baru> <pesan>" #: builtin/reflog.c msgid "" @@ -13491,14 +14250,22 @@ msgstr "" " [--dry-run | -n] [--verbose] <referensi>@{<penyebut>}..." #: builtin/reflog.c -msgid "git reflog exists <ref>" -msgstr "git reflog exists <referensi>" - -#: builtin/reflog.c msgid "git reflog drop [--all [--single-worktree] | <refs>...]" msgstr "git reflog drop [--all [--single-worktee] | <referensi>...]" #: builtin/reflog.c +msgid "" +"git reflog expire [--expire=<time>] [--expire-unreachable=<time>]\n" +" [--rewrite] [--updateref] [--stale-fix]\n" +" [--dry-run | -n] [--verbose] [--all [--single-worktree] | " +"<refs>...]" +msgstr "" +"git reflog expire [--expire=<waktu>] [--expire-unreachable=<waktu>]\n" +" [--rewrite] [--updateref] [--stale-fix]\n" +" [--dry-run | -n] [--verbose] [--all [--single-worktree] | " +"<referensi>...]" + +#: builtin/reflog.c #, c-format msgid "invalid timestamp '%s' given to '--%s'" msgstr "stempel waktu tidak valid '%s' diberikan ke '--%s'" @@ -13584,6 +14351,46 @@ msgstr "hanya jatuhkan log referensi dari pohon kerja saat ini" msgid "references specified along with --all" msgstr "referensi yang dirincikan bersamaan dengan --all" +#: builtin/reflog.c +#, c-format +msgid "invalid reference name: %s" +msgstr "nama referensi tidak valid: %s" + +#: builtin/reflog.c +#, c-format +msgid "invalid old object ID: '%s'" +msgstr "ID objek lama tidak valid: '%s'" + +#: builtin/reflog.c +#, c-format +msgid "old object '%s' does not exist" +msgstr "objek lama '%s' tidak ada" + +#: builtin/reflog.c +#, c-format +msgid "invalid new object ID: '%s'" +msgstr "ID objek baru tidak valid: '%s'" + +#: builtin/reflog.c +#, c-format +msgid "new object '%s' does not exist" +msgstr "objek baru '%s' tidak ada" + +#: builtin/reflog.c +#, c-format +msgid "cannot start transaction: %s" +msgstr "tidak dapat memulai transaksi: %s" + +#: builtin/reflog.c +#, c-format +msgid "cannot queue reflog update: %s" +msgstr "tidak dapat mengantrikan pembaruan log referensi: %s" + +#: builtin/reflog.c +#, c-format +msgid "cannot commit reflog update: %s" +msgstr "tidak dapat mengkomit pembaruan log referensi: %s" + #: builtin/refs.c msgid "git refs migrate --ref-format=<format> [--no-reflog] [--dry-run]" msgstr "git refs migrate --ref-format=<format> [--no-reflog] [--dry-run]" @@ -13593,6 +14400,14 @@ msgid "git refs verify [--strict] [--verbose]" msgstr "git refs verify [--strict] [---verbose]" #: builtin/refs.c +msgid "git refs exists <ref>" +msgstr "git refs exists <referensi>" + +#: builtin/refs.c +msgid "git refs optimize " +msgstr "git refs optimize " + +#: builtin/refs.c msgid "specify the reference format to convert to" msgstr "sebutkan format referensi untuk dikonversi" @@ -13621,6 +14436,22 @@ msgstr "aktifkan pemeriksaan lebih ketat" msgid "'git refs verify' takes no arguments" msgstr "'git refs verify' tidak mengambil argumen" +#: builtin/refs.c +msgid "git refs list " +msgstr "git refs list" + +#: builtin/refs.c +msgid "'git refs exists' requires a reference" +msgstr "'git refs exists' butuh sebuah referensi" + +#: builtin/refs.c builtin/show-ref.c +msgid "reference does not exist" +msgstr "referensi tidak ada" + +#: builtin/refs.c builtin/show-ref.c +msgid "failed to look up reference" +msgstr "gagal mencari referensi" + #: builtin/remote.c msgid "" "git remote add [-t <branch>] [-m <master>] [-f] [--tags | --no-tags] [--" @@ -13819,6 +14650,25 @@ msgstr "" "sekarang menamai remote yang tiada '%s'" #: builtin/remote.c +msgid "" +"The remote you are trying to rename has conflicting references in the\n" +"new target refspec. This is most likely caused by you trying to nest\n" +"a remote into itself, e.g. by renaming 'parent' into 'parent/child'\n" +"or by unnesting a remote, e.g. the other way round.\n" +"\n" +"If that is the case, you can address this by first renaming the\n" +"remote to a different name.\n" +msgstr "" +"Remote yang Anda coba untuk dinamai punya referensi yang berkonflik di " +"dalam\n" +"spek referensi taget baru. Kemungkinan besar dikarenakan Anda mencoba untuk\n" +"menumpuk remote pada dirinya sendiri, misalnya dengan menamai ulang " +"'parent'\n" +"ke 'parent/child' atau dengan menirnumpuk remote (yaitu sebaliknya).\n" +"Jika demikian, Anda dapat mengatasinya dengan cara menamai ulang remote ke\n" +"nama yang berbeda terlebih dahulu.\n" + +#: builtin/remote.c #, c-format msgid "No such remote: '%s'" msgstr "Tidak ada remote seperti: '%s'" @@ -13829,6 +14679,15 @@ msgid "Could not rename config section '%s' to '%s'" msgstr "Tidak dapat menamai ulang bagian konfigurasi '%s' ke '%s'" #: builtin/remote.c +msgid "Renaming remote references" +msgstr "Menamai ulang referensi remote" + +#: builtin/remote.c +#, c-format +msgid "queueing remote ref renames failed: %s" +msgstr "gagal mengantrikan penamaan ulang referensi remote: %s" + +#: builtin/remote.c #, c-format msgid "" "Not updating non-default fetch refspec\n" @@ -13840,18 +14699,9 @@ msgstr "" "\tMohon perbarui konfigurasi secara manual bila diperlukan." #: builtin/remote.c -msgid "Renaming remote references" -msgstr "Menamai ulang referensi remote" - -#: builtin/remote.c -#, c-format -msgid "deleting '%s' failed" -msgstr "menghapus '%s' gagal" - -#: builtin/remote.c #, c-format -msgid "creating '%s' failed" -msgstr "membuat '%s' gagal" +msgid "renaming remote refs failed: %s" +msgstr "penaman ulang referensi remote gagal: %s" #: builtin/remote.c msgid "" @@ -14203,57 +15053,6 @@ msgstr "" " --no-write-bitmap-index atau nonaktifkan konfigurasi pack.writeBitmaps." #: builtin/repack.c -msgid "could not start pack-objects to repack promisor objects" -msgstr "tidak dapat memulai pack-objects untuk mengepak ulang objek pejanji" - -#: builtin/repack.c -msgid "failed to feed promisor objects to pack-objects" -msgstr "gagal mengumpan objek penjanji ke pack-objects" - -#: builtin/repack.c -msgid "repack: Expecting full hex object ID lines only from pack-objects." -msgstr "repack: Mengharapkan baris ID objek hex penuh hanya dari pack-objects." - -#: builtin/repack.c -msgid "could not finish pack-objects to repack promisor objects" -msgstr "" -"tidak dapat menyelesaikan pack-objects untuk mengepak ulang objek pejanji" - -#: builtin/repack.c -#, c-format -msgid "cannot open index for %s" -msgstr "tidak dapat membuka indeks untuk %s" - -#: builtin/repack.c -#, c-format -msgid "pack %s too large to consider in geometric progression" -msgstr "pak %s terlalu besar untuk dipertimbangkan dalam deret geometri" - -#: builtin/repack.c -#, c-format -msgid "pack %s too large to roll up" -msgstr "pak %s terlalu besar untuk digulung" - -#: builtin/repack.c -#, c-format -msgid "could not open tempfile %s for writing" -msgstr "tidak dapat membuka berkas sementara '%s' untuk ditulis" - -#: builtin/repack.c -msgid "could not close refs snapshot tempfile" -msgstr "tidak dapat menutup berkas sementara jepretan referensi" - -#: builtin/repack.c -#, c-format -msgid "could not remove stale bitmap: %s" -msgstr "tidak dapt memindahkan bitmap basi: %s" - -#: builtin/repack.c -#, c-format -msgid "pack prefix %s does not begin with objdir %s" -msgstr "nama berkas paket %s tidak diawali dengan %s" - -#: builtin/repack.c msgid "pack everything in a single pack" msgstr "pak semuanya dalam satu pak" @@ -14383,21 +15182,6 @@ msgstr "opsi '%s' tidak dapat digunakan bersamaan dengan '%s'" msgid "Nothing new to pack." msgstr "Tidak ada yang baru untuk dipak." -#: builtin/repack.c -#, c-format -msgid "renaming pack to '%s' failed" -msgstr "gagal mengganti nama pak ke '%s'" - -#: builtin/repack.c -#, c-format -msgid "pack-objects did not write a '%s' file for pack %s-%s" -msgstr "pack-objects tidak menulis berkas '%s' untuk pak %s-%s" - -#: builtin/repack.c sequencer.c -#, c-format -msgid "could not unlink: %s" -msgstr "tidak dapat membatal taut: %s" - #: builtin/replace.c msgid "git replace [-f] <object> <replacement>" msgstr "git replace [-f] <objek> <pengganti>" @@ -14720,6 +15504,80 @@ msgstr "memainkan ulang ke komit akar belum didukung!" msgid "replaying merge commits is not supported yet!" msgstr "memainkan ulang komit penggabungan belum didukung!" +#: builtin/repo.c +#, c-format +msgid "key '%s' not found" +msgstr "kunci '%s' tidak ditemukan" + +#: builtin/repo.c +#, c-format +msgid "invalid format '%s'" +msgstr "format '%s' tidak valid" + +#: builtin/repo.c +msgid "output format" +msgstr "format keluaran" + +#: builtin/repo.c +msgid "synonym for --format=nul" +msgstr "sinonim untuk --format=nul" + +#: builtin/repo.c +msgid "unsupported output format" +msgstr "format keluaran tidak didukung" + +#: builtin/repo.c +msgid "References" +msgstr "Referensi" + +#: builtin/repo.c +msgid "Count" +msgstr "Hitungan" + +#: builtin/repo.c +msgid "Branches" +msgstr "Cabang" + +#: builtin/repo.c +msgid "Tags" +msgstr "Tag" + +#: builtin/repo.c +msgid "Remotes" +msgstr "Remote" + +#: builtin/repo.c +msgid "Others" +msgstr "Lainnya" + +#: builtin/repo.c +msgid "Reachable objects" +msgstr "Objek yang dapat dijangkau" + +#: builtin/repo.c +msgid "Commits" +msgstr "Komit" + +#: builtin/repo.c +msgid "Trees" +msgstr "Pohon" + +#: builtin/repo.c +msgid "Blobs" +msgstr "Blob" + +#: builtin/repo.c +msgid "Repository structure" +msgstr "Struktur repositori" + +#: builtin/repo.c +msgid "Value" +msgstr "Nilai" + +#: builtin/repo.c +msgid "Counting references" +msgstr "Menghitung referensi" + #: builtin/rerere.c msgid "" "git rerere [clear | forget <pathspec>... | diff | status | remaining | gc]" @@ -15462,14 +16320,6 @@ msgid "git show-ref --exists <ref>" msgstr "git show-ref --exists <referensi>" #: builtin/show-ref.c -msgid "reference does not exist" -msgstr "referensi tidak ada" - -#: builtin/show-ref.c -msgid "failed to look up reference" -msgstr "gagal mencari referensi" - -#: builtin/show-ref.c msgid "only show tags (can be combined with --branches)" msgstr "hanya perlihatkan tag (bisa dikombinasikan dengan --branches)" @@ -15510,10 +16360,10 @@ msgstr "" #: builtin/sparse-checkout.c msgid "" "git sparse-checkout (init | list | set | add | reapply | disable | check-" -"rules) [<options>]" +"rules | clean) [<options>]" msgstr "" "git sparse-checkout (init | list | set | add | reapply | disable | check-" -"rules) [<opsi>]" +"rules | clean) [<opsi>]" #: builtin/sparse-checkout.c msgid "this worktree is not sparse" @@ -15562,11 +16412,6 @@ msgstr "inisialisasi checkout tipis dalam mode kerucut" msgid "toggle the use of a sparse index" msgstr "gunakan indeks tipis" -#: builtin/sparse-checkout.c commit-graph.c midx-write.c sequencer.c -#, c-format -msgid "unable to create leading directories of %s" -msgstr "tidak dapat membuat direktori utama dari %s" - #: builtin/sparse-checkout.c #, c-format msgid "failed to open '%s'" @@ -15666,6 +16511,42 @@ msgstr "" "harus berada di dalam checkout tipis untuk menerapkan ulang pola kejarangan" #: builtin/sparse-checkout.c +msgid "report each affected file, not just directories" +msgstr "laporkan setiap berkas terdampak, bukan hanya direktori" + +#: builtin/sparse-checkout.c +msgid "must be in a sparse-checkout to clean directories" +msgstr "harus berada di dalam checkout tipis untuk membersihkan direktori" + +#: builtin/sparse-checkout.c +msgid "must be in a cone-mode sparse-checkout to clean directories" +msgstr "" +"harus berada di mode checkout tipis kerucut untuk membersihkan direktori" + +#: builtin/sparse-checkout.c +msgid "for safety, refusing to clean without one of --force or --dry-run" +msgstr "" +"demi keamanan, menolak membersihkan tanpa salah satu dari --force atau --dry-" +"run" + +#: builtin/sparse-checkout.c +msgid "failed to read index" +msgstr "gagal membaca indeks" + +#: builtin/sparse-checkout.c +msgid "" +"failed to convert index to a sparse index; resolve merge conflicts and try " +"again" +msgstr "" +"gagal mengkonversikan indeks ke indeks tipis; selesaikan konflik " +"penggabungan dan coba lagi" + +#: builtin/sparse-checkout.c +#, c-format +msgid "failed to remove '%s'" +msgstr "gagal menghapus '%s'" + +#: builtin/sparse-checkout.c msgid "error while refreshing working directory" msgstr "kesalahan saat menyegarkan direktori kerja" @@ -17783,10 +18664,6 @@ msgstr "tulis objek pohon untuk subdirektori <prefiks>" msgid "only useful for debugging" msgstr "hanya berguna untuk penirkutuan" -#: bulk-checkin.c -msgid "core.fsyncMethod = batch is unsupported on this platform" -msgstr "core.fsyncMethod = batch tidak didukung pada platform ini" - #: bundle-uri.c #, c-format msgid "could not parse bundle list key %s with value '%s'" @@ -18299,6 +19176,10 @@ msgid "Add or parse structured information in commit messages" msgstr "Tambah atau urai informasi terstruktur di dalam pesan komit" #: command-list.h +msgid "EXPERIMENTAL: Show when files were last modified" +msgstr "EKSPERIMENTAL: Perlihatkan kapan berkas terakhir diubah" + +#: command-list.h msgid "Show commit logs" msgstr "Perlihatkan log komit" @@ -18464,6 +19345,10 @@ msgstr "" "repositori bare" #: command-list.h +msgid "Retrieve information about the repository" +msgstr "Ambil informasi tentang repositori" + +#: command-list.h msgid "Generates a summary of pending changes" msgstr "Buat ringkasan perubahan tertunda" @@ -18572,9 +19457,8 @@ msgid "Read, modify and delete symbolic refs" msgstr "Baca, ubah dan hapus referensi simbolik" #: command-list.h -msgid "Create, list, delete or verify a tag object signed with GPG" -msgstr "" -"Buat, daftar, hapus atau verifikasi objek tag yang ditandatangani dengan GPG" +msgid "Create, list, delete or verify tags" +msgstr "Buat, daftar, hapus, atau verifikasi tag" #: command-list.h msgid "Creates a temporary file with a blob's contents" @@ -19632,6 +20516,50 @@ msgid "unable to parse command-line config" msgstr "gagal menguraikan konfigurasi baris perintah" #: config.c +#, c-format +msgid "" +"\n" +"To use the default comment string (#) please run\n" +"\n" +"%s" +msgstr "" +"\n" +"Untuk gunakan untai komentar bawaan (#) mohon jalankan\n" +"\n" +"%s" + +#: config.c +msgid "<comment string>" +msgstr "<untai komentar>" + +#: config.c +#, c-format +msgid "" +"\n" +"To set a custom comment string please run\n" +"\n" +"%s\n" +"where '%s' is the string you wish to use.\n" +msgstr "" +"\n" +"Untuk menyetel untai komentar khusus mohon jalankan\n" +"\n" +"%s\n" +"dengan '%s' adalah untai yang Anda ingin gunakan.\n" + +#: config.c +#, c-format +msgid "Support for '%s=auto' has been removed in Git 3.0" +msgstr "Dukungan untuk '%s=auto' sudah dihapus dari Git 3.0" + +#: config.c +#, c-format +msgid "Support for '%s=auto' is deprecated and will be removed in Git 3.0" +msgstr "" +"Dukungan untuk '%s=auto' sudah tidak berlaku lagi dan akan dihapus dari Git " +"3.0" + +#: config.c msgid "unknown error occurred while reading the configuration files" msgstr "error tidak diketahui ketika membaca berkas konfigurasi" @@ -20223,6 +21151,14 @@ msgid "failed to write archive" msgstr "gagal menulis arsip" #: diff-lib.c +msgid "max-depth is not supported for worktree diffs" +msgstr "max-depth tidak didukung untuk diff pohon kerja" + +#: diff-lib.c +msgid "max-depth is not supported for index diffs" +msgstr "max-depth tidak didukung untuk diff indeks" + +#: diff-lib.c msgid "--merge-base does not work with ranges" msgstr "--merge-base tidak bekerja dengan rentang" @@ -20872,6 +21808,14 @@ msgid "select files by diff type" msgstr "pilih berkas oleh tipe diff" #: diff.c +msgid "<depth>" +msgstr "<kedalaman>" + +#: diff.c +msgid "maximum tree depth to recurse" +msgstr "kedalaman pohon maksimal untuk diselami" + +#: diff.c msgid "<file>" msgstr "<berkas>" @@ -21114,11 +22058,6 @@ msgstr "baris dangkal-balik tidak valid: %s" #: fetch-pack.c #, c-format -msgid "object not found: %s" -msgstr "object tidak ditemukan: %s" - -#: fetch-pack.c -#, c-format msgid "error in object: %s" msgstr "kesalahan dalam objek: %s" @@ -21465,6 +22404,11 @@ msgid "recursive alias: %s" msgstr "alias rekursif: %s" #: git.c +#, c-format +msgid "alias loop detected: expansion of '%s' does not terminate:%s" +msgstr "putaran alias terdeteksi: perluasan '%s' tidak berhenti:%s" + +#: git.c msgid "write failure on standard output" msgstr "kegagalan menulis pada keluaran standar" @@ -21478,11 +22422,6 @@ msgstr "penutupan gagal pada keluaran standar" #: git.c #, c-format -msgid "alias loop detected: expansion of '%s' does not terminate:%s" -msgstr "putaran alias terdeteksi: perluasan '%s' tidak berhenti:%s" - -#: git.c -#, c-format msgid "cannot handle %s as a builtin" msgstr "tidak dapat menangani %s sebagai bawaan" @@ -21547,6 +22486,11 @@ msgid "failed to get the ssh fingerprint for key '%s'" msgstr "gagal mendapatkan sidik jari ssh untuk kunci '%s'" #: gpg-interface.c +#, c-format +msgid "failed to get the ssh fingerprint for key %s" +msgstr "gagal mendapatkan tandatangan ssh untuk kunci %s" + +#: gpg-interface.c msgid "" "either user.signingkey or gpg.ssh.defaultKeyCommand needs to be configured" msgstr "" @@ -21554,6 +22498,11 @@ msgstr "" #: gpg-interface.c #, c-format +msgid "malformed build-time gpg.ssh.defaultKeyCommand: %s" +msgstr "gpg.ssh.defaultKeyCommand waktu pembuatan cacat: %s" + +#: gpg-interface.c +#, c-format msgid "gpg.ssh.defaultKeyCommand succeeded but returned no keys: %s %s" msgstr "gpg.ssh.defaultKeyCommand sukses tapi tidak mengembalikan kunci: %s %s" @@ -21866,6 +22815,14 @@ msgstr "" " diminta: %s\n" " pengalihan: %s" +#: http.h +#, c-format +msgid "" +"number too large to represent as curl_off_t on this platform: %<PRIuMAX>" +msgstr "" +"angka terlalu besar untuk diwakili sebagai curl_off_t pada platform ini: " +"%<PRIuMAX>" + #: ident.c msgid "Author identity unknown\n" msgstr "Identitas pengarang tidak dikenal\n" @@ -22412,11 +23369,6 @@ msgstr "tidak dapat memuat pak" #: midx-write.c #, c-format -msgid "could not open index for %s" -msgstr "tidak dapat membuka indeks untuk %s" - -#: midx-write.c -#, c-format msgid "unable to link '%s' to '%s'" msgstr "tidak dapat mentautkan '%s' ke '%s'" @@ -22445,6 +23397,11 @@ msgstr "pak yang disukai tidak dikenal: '%s'" #: midx-write.c #, c-format +msgid "failed to open preferred pack %s" +msgstr "gagal membuka pak yang disukai '%s'" + +#: midx-write.c +#, c-format msgid "cannot select preferred pack %s with no objects" msgstr "tidak dapat memilih pak yang disukai %s tanpa objek" @@ -22475,6 +23432,10 @@ msgid "could not write multi-pack bitmap" msgstr "tidak dapat menulis bitmap multipak" #: midx-write.c +msgid "too many multi-pack-indexes" +msgstr "terlalu banyak indeks multipak" + +#: midx-write.c msgid "unable to open multi-pack-index chain file" msgstr "tidak dapat membuka berkas rantai indeks multipak" @@ -22810,11 +23771,6 @@ msgstr "berkas '%s' dan '%s' berbeda konteks" #: object-file.c #, c-format -msgid "unable to write file %s" -msgstr "tidak dapat menulis berkas %s" - -#: object-file.c -#, c-format msgid "unable to write repeatedly vanishing file %s" msgstr "tidak dapat menulis berkas yang menghilang %s terus-menerus" @@ -22824,6 +23780,10 @@ msgid "unable to set permission to '%s'" msgstr "tidak dapat menyetel perizinan ke '%s'" #: object-file.c +msgid "core.fsyncMethod = batch is unsupported on this platform" +msgstr "core.fsyncMethod = batch tidak didukung pada platform ini" + +#: object-file.c msgid "error when closing loose object file" msgstr "kesalahan saat menutup berkas objek longgar" @@ -23434,6 +24394,26 @@ msgstr "berkas mtimes %s punya id hash tidak didukung %<PRIu32>" msgid "mtimes file %s is corrupt" msgstr "berkas mtimes %s rusak" +#: pack-refs.c +msgid "pack everything" +msgstr "pak semuanya" + +#: pack-refs.c +msgid "prune loose refs (default)" +msgstr "pangkas referensi longgar (asali)" + +#: pack-refs.c +msgid "auto-pack refs as needed" +msgstr "otomatis pak referensi jika dibutuhkan" + +#: pack-refs.c +msgid "references to include" +msgstr "referensi untuk ditambahkan" + +#: pack-refs.c +msgid "references to exclude" +msgstr "referensi untuk dikecualikan" + #: pack-revindex.c #, c-format msgid "reverse-index file %s is too small" @@ -23959,6 +24939,11 @@ msgstr "tidak dapat mengambil %s dari remote penjanji" #: promisor-remote.c #, c-format +msgid "unsupported field '%s' in '%s' config" +msgstr "bidang '%s' tidak didukung pada konfiugrasi '%s'" + +#: promisor-remote.c +#, c-format msgid "no or empty URL advertised for remote '%s'" msgstr "tidak ada URL atau URL kosong yang diiklankan untuk remote '%s'" @@ -23969,13 +24954,18 @@ msgstr "remote yang terkenal bernama '%s' tapi dengan URL '%s' daripada '%s'" #: promisor-remote.c #, c-format -msgid "unknown '%s' value for '%s' config option" -msgstr "nilai '%s' tidak dikenal untuk opsi konfigurasi '%s'" +msgid "invalid element '%s' from remote info" +msgstr "elemen '%s' invalid dari info remote" #: promisor-remote.c #, c-format -msgid "unknown element '%s' from remote info" -msgstr "elemen '%s' dari info remote tidak dikenal" +msgid "server advertised a promisor remote without a name or URL: %s" +msgstr "peladen mengiklankan remote pejanji tanpa nama atau URL: %s" + +#: promisor-remote.c +#, c-format +msgid "unknown '%s' value for '%s' config option" +msgstr "nilai '%s' tidak dikenal untuk opsi konfigurasi '%s'" #: promisor-remote.c #, c-format @@ -24100,6 +25090,17 @@ msgstr "gagal membuat diff" #: range-diff.c #, c-format +msgid "" +"range-diff: unable to compute the range-diff, since it exceeds the maximum " +"memory for the cost matrix: %s (%<PRIuMAX> bytes) needed, limited to %s " +"(%<PRIuMAX> bytes)" +msgstr "" +"range-diff: tidak dapat menghitung range-diff, oleh karena melebihi memori " +"maksimum untuk matriks biaya: %s (%<PRIuMAX> bita) diperlukan, terbatas pada " +"%s (%<PRIuMAX> bita)" + +#: range-diff.c +#, c-format msgid "could not parse log for '%s'" msgstr "tidak dapat menguraikan log untuk '%s'" @@ -24736,6 +25737,10 @@ msgid "no reflog for '%s'" msgstr "tidak ada log referensi untuk '%s'" #: refs.c +msgid "Checking references consistency" +msgstr "Memeriksa konsistensi referensi" + +#: refs.c #, c-format msgid "%s does not point to a valid object!" msgstr "%s tidak menunjuk ke sebuah objek valid!" @@ -24754,8 +25759,9 @@ msgstr "%s%s telah menjadi teruntai setelah %s dihapus\n" #, c-format msgid "" "Using '%s' as the name for the initial branch. This default branch name\n" -"is subject to change. To configure the initial branch name to use in all\n" -"of your new repositories, which will suppress this warning, call:\n" +"will change to \"main\" in Git 3.0. To configure the initial branch name\n" +"to use in all of your new repositories, which will suppress this warning,\n" +"call:\n" "\n" "\tgit config --global init.defaultBranch <name>\n" "\n" @@ -24764,21 +25770,36 @@ msgid "" "\n" "\tgit branch -m <name>\n" msgstr "" -"Menggunakan '%s' sebagai nama cabang awal. Nama cabang asali ini dapat\n" -"berubah. Untuk menyetel nama cabang awal untuk digunakan pada semua\n" -"repositori baru Anda, dimana akan mematikan peringatan ini, panggil:\n" +"Menggunakan '%s' sebagai nama cabang awal. Nama cabang asali akan\n" +"berubah menjadi \"main\" pada Git 3.0. Untuk menyetel nama cabang awal\n" +"untuk digunakan pada semua repositori baru Anda, dimana akan mematikan\n" +"peringatan ini, panggil:\n" "\n" "\tgit config --global init.defaultBranch <nama>\n" "\n" "Nama-nama yang umumnya dipilih selain 'master' adalah 'main', 'trunk' dan\n" -"'development'. Cabang yang baru saja dibuat bisa dinamai ulang lewat " -"perintah\n" -"ini:\n" +"'development'. Cabang yang baru saja dibuat bisa dinamai ulang lewat\n" +"perintah ini:\n" "\n" "\tgit branch -m <nama>\n" #: refs.c #, c-format +msgid "" +"Using '%s' as the name for the initial branch since Git 3.0.\n" +"If you expected Git to create 'master', the just-created\n" +"branch can be renamed via this command:\n" +"\n" +"\tgit branch -m master\n" +msgstr "" +"Menggunakan '%s' sebagai nama untuk cabang awal sejak Git 3.0.\n" +"Jika Anda mengharapkan Git untuk membuat 'master', cabang yang baru saja\n" +"dibuat dapat dinamai ulang lewat perintah ini:\n" +"\n" +"\tgit branch -m master\n" + +#: refs.c +#, c-format msgid "could not retrieve `%s`" msgstr "tidak dapat mengambil `%s`" @@ -24884,6 +25905,29 @@ msgstr "tidak dapat menamai ulang direktori migrasi sementara '%s'" msgid "migrated refs can be found at '%s'" msgstr "referensi termigrasi dapat ditemukan pada '%s'" +#: refs/files-backend.c +msgid "" +"'core.preferSymlinkRefs=true' is nominated for removal.\n" +"hint: The use of symbolic links for symbolic refs is deprecated\n" +"hint: and will be removed in Git 3.0. The configuration that\n" +"hint: tells Git to use them is thus going away. You can unset\n" +"hint: it with:\n" +"hint:\n" +"hint:\tgit config unset core.preferSymlinkRefs\n" +"hint:\n" +"hint: Git will then use the textual symref format instead." +msgstr "" +"'core.preferSymlinkRefs=true' dinominasikan untuk dihapus.\n" +"petunjuk: Penggunaan tautan simbolik untuk referensi simbolik sudah tidak\n" +"petunjuk: didukung dan akan dihapus di Git 3.0; dengan demikian konfigurasi\n" +"petunjuk: yang memberitahu Git untuk menggunakanya akan menghilang. Anda\n" +"petunjuk: dapat menghapus setelannya dengan:\n" +"petunjuk:\n" +"petunjuk:\tgit config unset core.preferSymlinkRefs\n" +"petunjuk:\n" +"petunjuk: Lalu Git akan menggunakan format referensi simbolik tekstual\n" +"petunjuk: sebagai gantinya." + #: refs/files-backend.c refs/reftable-backend.c #, c-format msgid "" @@ -24892,6 +25936,12 @@ msgstr "" "tidak dapat mengunci referensi '%s': diharapkan referensi simbolik dengan " "target '%s': tetapi bukan referensi reguler" +#: refs/files-backend.c refs/reftable-backend.c +#, c-format +msgid "trying to write reflog for '%s' with incomplete values" +msgstr "" +"mencoba menulis log referensi untuk '%s' dengan nilai yang tidak lengkap" + #: refs/files-backend.c #, c-format msgid "cannot read ref file '%s'" @@ -24902,10 +25952,6 @@ msgstr "tidak dapat membaca berkas referensi '%s'" msgid "cannot open directory %s" msgstr "tidak dapat membuka direktori %s" -#: refs/files-backend.c -msgid "Checking references consistency" -msgstr "Memeriksa konsistensi referensi" - #: refs/packed-backend.c #, c-format msgid "unable to open '%s'" @@ -24955,6 +26001,12 @@ msgstr "" #: refs/reftable-backend.c #, c-format +msgid "cannot lock ref '%s': dangling symref already exists" +msgstr "" +"tidak dapat mengunci referensi '%s' refernsi simbolik menggantung sudah ada" + +#: refs/reftable-backend.c +#, c-format msgid "cannot lock ref '%s': reference already exists" msgstr "tidak dapat mengunci referensi '%s': referensi sudah ada" @@ -25082,10 +26134,6 @@ msgid "RPC failed; %s" msgstr "RPC gagal; %s" #: remote-curl.c -msgid "cannot handle pushes this big" -msgstr "tidak dapat menangani dorongan sebesar ini" - -#: remote-curl.c #, c-format msgid "cannot deflate request; zlib deflate error %d" msgstr "tidak dapat mengempiskan permintaan; kesalahan mengempiskan zlib %d" @@ -25306,6 +26354,14 @@ msgstr "" #: remote.c #, c-format +msgid "" +"The <src> part of the refspec ('%s') is an object ID that doesn't exist.\n" +msgstr "" +"Bagian <sumber> dari spek referensi ('%s') merupakan ID objek yang tidak\n" +"ada.\n" + +#: remote.c +#, c-format msgid "%s cannot be resolved to branch" msgstr "%s tidak dapat diselesaikan ke cabang" @@ -25457,6 +26513,72 @@ msgstr "tidak dapat mengurai nama object yang diharapkan '%s'" msgid "cannot strip one component off url '%s'" msgstr "tidak dapat mencopot satu komponen dari url '%s'" +#: repack-geometry.c +#, c-format +msgid "cannot open index for %s" +msgstr "tidak dapat membuka indeks untuk %s" + +#: repack-geometry.c +#, c-format +msgid "pack %s too large to consider in geometric progression" +msgstr "pak %s terlalu besar untuk dipertimbangkan dalam deret geometri" + +#: repack-geometry.c +#, c-format +msgid "pack %s too large to roll up" +msgstr "pak %s terlalu besar untuk digulung" + +#: repack-midx.c +#, c-format +msgid "could not open tempfile %s for writing" +msgstr "tidak dapat membuka berkas sementara '%s' untuk ditulis" + +#: repack-midx.c +msgid "could not close refs snapshot tempfile" +msgstr "tidak dapat menutup berkas sementara jepretan referensi" + +#: repack-midx.c +#, c-format +msgid "could not remove stale bitmap: %s" +msgstr "tidak dapt memindahkan bitmap basi: %s" + +#: repack-promisor.c +msgid "could not start pack-objects to repack promisor objects" +msgstr "tidak dapat memulai pack-objects untuk mengepak ulang objek pejanji" + +#: repack-promisor.c +msgid "failed to feed promisor objects to pack-objects" +msgstr "gagal mengumpan objek penjanji ke pack-objects" + +#: repack-promisor.c repack.c +msgid "repack: Expecting full hex object ID lines only from pack-objects." +msgstr "repack: Mengharapkan baris ID objek hex penuh hanya dari pack-objects." + +#: repack-promisor.c +msgid "could not finish pack-objects to repack promisor objects" +msgstr "" +"tidak dapat menyelesaikan pack-objects untuk mengepak ulang objek pejanji" + +#: repack.c +#, c-format +msgid "pack prefix %s does not begin with objdir %s" +msgstr "nama berkas paket %s tidak diawali dengan %s" + +#: repack.c +#, c-format +msgid "renaming pack to '%s' failed" +msgstr "gagal mengganti nama pak ke '%s'" + +#: repack.c +#, c-format +msgid "pack-objects did not write a '%s' file for pack %s-%s" +msgstr "pack-objects tidak menulis berkas '%s' untuk pak %s-%s" + +#: repack.c sequencer.c +#, c-format +msgid "could not unlink: %s" +msgstr "tidak dapat membatal taut: %s" + #: replace-object.c #, c-format msgid "bad replace ref name: %s" @@ -27059,10 +28181,6 @@ msgid "cannot chdir to '%s'" msgstr "tidak dapat chdir ke '%s'" #: setup.c -msgid "cannot come back to cwd" -msgstr "tidak dapat kembali ke cwd" - -#: setup.c #, c-format msgid "failed to stat '%*s%s%s'" msgstr "gagal men-stat '%*s%s%s'" @@ -28353,18 +29471,33 @@ msgstr "peringatan: " #: usage.c #, c-format +msgid "'%s' is nominated for removal.\n" +msgstr "'%s' diajukan untuk dihapus.\n" + +#: usage.c +#, c-format msgid "" -"'%s' is nominated for removal.\n" -"If you still use this command, please add an extra\n" -"option, '--i-still-use-this', on the command line\n" -"and let us know you still use it by sending an e-mail\n" -"to <git@vger.kernel.org>. Thanks.\n" +"If you still use this command, here's what you can do:\n" +"\n" +"- read https://git-scm.com/docs/BreakingChanges.html\n" +"- check if anyone has discussed this on the mailing\n" +" list and if they came up with something that can\n" +" help you: https://lore.kernel.org/git/?q=%s\n" +"- send an email to <git@vger.kernel.org> to let us\n" +" know that you still use this command and were unable\n" +" to determine a suitable replacement\n" +"\n" msgstr "" -"'%s' dinominasikan untuk dihapus.\n" -"Jika Anda masih menggunakan perintah ini, mohon tambahkan sebuah opsi\n" -"tambahan, '--i-still-use-this', pada baris perintah dan beri tahu kami jika\n" -"Anda masih menggunakannya dengan mengirimkan surel ke\n" -"<git@vger.kernel.org>. Terima kasih.\n" +"Jika Anda masih menggunakan perintah ini, beginilah yang dapat Anda " +"lakukan:\n" +"\n" +"- lihat https://git-scm.com/docs/BreakingChanges.html\n" +"- periksa apakah ada yang sudah membahas ini pada milis dan jika mereka\n" +" ada sesuatu yang dapat membantu Anda: https://lore.kernel.org/git?q=%s\n" +"- kirimkan email ke <git@vger.kernel.org> untuk memberitahu kami bahwa\n" +" Anda masih menggunakan perintah ini dan tidak dapat menemukan pengganti\n" +" yang cocok.\n" +"\n" #: usage.c msgid "refusing to run without --i-still-use-this" @@ -29433,6 +30566,10 @@ msgid "Send this email reply required" msgstr "Balasan kirim surel ini diperlukan" #: git-send-email.perl +msgid "The destination IMAP folder is not properly defined." +msgstr "Folder IMAP tujuan tidak didefinisikan dengan benar." + +#: git-send-email.perl msgid "The required SMTP server is not properly defined." msgstr "Peladen SMTP yang diperlukan tidak dijelaskan dengan baik." @@ -5,10 +5,10 @@ # msgid "" msgstr "" -"Project-Id-Version: git 2.51.0\n" +"Project-Id-Version: git 2.52.0\n" "Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n" -"POT-Creation-Date: 2025-08-14 09:52+0100\n" -"PO-Revision-Date: 2025-08-14 09:53+0100\n" +"POT-Creation-Date: 2025-11-06 23:58+0000\n" +"PO-Revision-Date: 2025-11-07 15:54+0100\n" "Last-Translator: Peter Krefting <peter@softwolves.pp.se>\n" "Language-Team: Svenska <tp-sv@listor.tp-sv.se>\n" "Language: sv\n" @@ -16,7 +16,6 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -"X-Generator: Gtranslator 42.0\n" #, c-format msgid "%s cannot be negative" @@ -538,37 +537,39 @@ msgid "Nothing was applied.\n" msgstr "Ingenting applicerades.\n" msgid "" -"j - leave this hunk undecided, see next undecided hunk\n" -"J - leave this hunk undecided, see next hunk\n" -"k - leave this hunk undecided, see previous undecided hunk\n" -"K - leave this hunk undecided, see previous hunk\n" +"j - go to the next undecided hunk, roll over at the bottom\n" +"J - go to the next hunk, roll over at the bottom\n" +"k - go to the previous undecided hunk, roll over at the top\n" +"K - go to the previous hunk, roll over at the top\n" "g - select a hunk to go to\n" "/ - search for a hunk matching the given regex\n" "s - split the current hunk into smaller hunks\n" "e - manually edit the current hunk\n" -"p - print the current hunk, 'P' to use the pager\n" +"p - print the current hunk\n" +"P - print the current hunk using the pager\n" "? - print help\n" msgstr "" -"j - lämna stycket obestämt, se nästa obestämda stycke\n" -"J - lämna stycket obestämt, se nästa stycke\n" -"k - lämna stycket obestämt, se föregÃ¥ende obestämda stycke\n" -"K - lämna stycket obestämt, se föregÃ¥ende stycke\n" +"j - gÃ¥ till nästa obestämda stycke, börja om vid slutet\n" +"J - gÃ¥ till nästa stycke, börja om vid slutet\n" +"k - gÃ¥ till föregÃ¥ende obestämda stycke, börja om vid början\n" +"K - gÃ¥ till föregÃ¥ende styckem, börja om vid början\n" "g - välj ett stycke att gÃ¥ till\n" "/ - sök efter stycke som motsvarar angivet reguljärt uttryck\n" "s - dela aktuellt stycke i mindre styckens\n" "e - redigera aktuellt stycke manuellt\n" -"p - visa aktuellt stycke, â€P†för att använda bläddrare\n" +"p - visa aktuellt stycke\n" +"P - visa aktuellt stycke i bläddrare\n" "? - visa hjälp\n" #, c-format msgid "Only one letter is expected, got '%s'" msgstr "Förväntade endast en bokstav, fick â€%sâ€" -msgid "No previous hunk" -msgstr "Inget föregÃ¥ende stycke" +msgid "No other hunk" +msgstr "Inget annat stycke" -msgid "No next hunk" -msgstr "Inget följande stycke" +msgid "No other undecided hunk" +msgstr "Inget annat obestämt stycke" msgid "No other hunks to goto" msgstr "Inga andra stycken att gÃ¥ till" @@ -2337,14 +2338,20 @@ msgid "Restrict the missing objects to the current sparse-checkout" msgstr "Begränsa saknade objekt till befintlig â€sparse-checkoutâ€" msgid "" -"git bisect start [--term-(new|bad)=<term> --term-(old|good)=<term>] [--no-" -"checkout] [--first-parent] [<bad> [<good>...]] [--] [<pathspec>...]" +"git bisect start [--term-(bad|new)=<term-new> --term-(good|old)=<term-old>]\n" +" [--no-checkout] [--first-parent] [<bad> [<good>...]] [--] " +"[<pathspec>...]" msgstr "" -"git bisect start [--term-(new|bad)=<term> --term-(old|good)=<term>] [--no-" -"checkout] [--first-parent] [<dÃ¥lig> [<bra>...]] [--] [<sökvägar>...]" +"git bisect start [--term-(bad|new)=<term-ny> --term-(good|old)=<term-" +"gammal>]\n" +" [--no-checkout] [--first-parent] [<dÃ¥lig> [<bra>...]] [--] " +"[<sökvägsspecar>...]" + +msgid "git bisect (bad|new|<term-new>) [<rev>]" +msgstr "git bisect (bad|new|<term-ny>) [<incheckning>]" -msgid "git bisect (good|bad) [<rev>...]" -msgstr "git bisect (good|bad) [<incheckning>...]" +msgid "git bisect (good|old|<term-old>) [<rev>...]" +msgstr "git bisect (good|old|<term-gammal>) [<incheckning>...]" msgid "git bisect skip [(<rev>|<range>)...]" msgstr "git bisect skip [(<incheckning>|<intervall>)...]" @@ -3001,11 +3008,11 @@ msgid "HEAD not found below refs/heads!" msgstr "HEAD hittades inte under refs/heads!" msgid "" -"branch with --recurse-submodules can only be used if submodule." -"propagateBranches is enabled" +"branch with --recurse-submodules can only be used if " +"submodule.propagateBranches is enabled" msgstr "" -"gren med --recurse-submodules kan endast användas om submodule." -"propagateBranches har aktiverats" +"gren med --recurse-submodules kan endast användas om " +"submodule.propagateBranches har aktiverats" msgid "--recurse-submodules can only be used to create branches" msgstr "--recurse-submodules kan endast användas för att skapa grenar" @@ -5519,6 +5526,14 @@ msgid "found %i tags; gave up search at %s\n" msgstr "hittade %i taggar; gav upp sökning vid %s\n" #, c-format +msgid "cannot search for blob '%s' on an unborn branch" +msgstr "kan inte leta efter â€%s†pÃ¥ en ofödd gren" + +#, c-format +msgid "blob '%s' not reachable from HEAD" +msgstr "blob:en â€%s†kan inte nÃ¥s frÃ¥n HEAD" + +#, c-format msgid "describe %s\n" msgstr "beskriva %s\n" @@ -5658,6 +5673,9 @@ msgstr "ogiltig flagga: %s" msgid "%s...%s: no merge base" msgstr "%s...%s: ingen sammanslagningsbas" +msgid "cannot come back to cwd" +msgstr "kan inte gÃ¥ tillbaka till arbetskatalogen (cwd)" + msgid "Not a git repository" msgstr "Inte ett git-arkiv" @@ -5768,8 +5786,139 @@ msgstr "inget <kommando> angavs för --extcmd=<kommando>" msgid "git fast-export [<rev-list-opts>]" msgstr "git fast-export [<rev-list-flaggor>]" -msgid "Error: Cannot export nested tags unless --mark-tags is specified." -msgstr "Fel: Kan inte exportera nästlade taggar sÃ¥vida inte --mark-tags anges." +#, c-format +msgid "unknown %s mode: %s" +msgstr "okänd läge för %s: %s" + +#, c-format +msgid "unknown tag-of-filtered mode: %s" +msgstr "okänt läge för tag-of-filtered: %s" + +#, c-format +msgid "unknown reencoding mode: %s" +msgstr "okänt läge för reencode: %s" + +#, c-format +msgid "could not read blob %s" +msgstr "kunde inte läsa blob:en %s" + +#, c-format +msgid "oid mismatch in blob %s" +msgstr "oid stämmer inte överens i blob:en %s" + +#, c-format +msgid "could not write blob '%s'" +msgstr "kunde inte skriva blob:en â€%sâ€" + +#, c-format +msgid "unexpected comparison status '%c' for %s, %s" +msgstr "jämförelsesstatus â€%c†förväntades inte för %s, %s" + +msgid "none" +msgstr "ingen" + +#, c-format +msgid "could not find author in commit %s" +msgstr "kunde inte hitta författare i incheckningen %s" + +#, c-format +msgid "could not find committer in commit %s" +msgstr "kunde inte hitta incheckare i incheckningen %s" + +#, c-format +msgid "" +"encountered commit-specific encoding %.*s in commit %s; use --reencode=[yes|" +"no] to handle it" +msgstr "" +"pÃ¥träffade incheckningsspecifik teckenkodning %.*s i incheckningen %s; " +"använd --reencode=[yes|no] för att hantera den" + +#, c-format +msgid "encountered signed commit %s; use --signed-commits=<mode> to handle it" +msgstr "" +"pÃ¥träffade en signerad incheckning %s; använd --signed-commits=<läge> för " +"att hantera den" + +#, c-format +msgid "exporting %<PRIuMAX> signature(s) for commit %s" +msgstr "exporterar %<PRIuMAX> signatur(er) för incheckningen %s" + +#, c-format +msgid "stripping signature(s) from commit %s" +msgstr "tar bort signatur(er) frÃ¥n incheckning %s" + +#, c-format +msgid "" +"omitting tag %s,\n" +"since tags of trees (or tags of tags of trees, etc.) are not supported." +msgstr "" +"utelämnar taggen %s,\n" +"eftersom taggar för träd (eller taggar för taggar för träd, osv.) inte stöds." + +#, c-format +msgid "could not read tag %s" +msgstr "kunde inte läsa taggen %s" + +#, c-format +msgid "encountered signed tag %s; use --signed-tags=<mode> to handle it" +msgstr "" +"pÃ¥träffade signerade taggen %s; använd --signed-tags=<läge> för att hantera " +"den" + +#, c-format +msgid "exporting signed tag %s" +msgstr "exporterar signerad tagg %s" + +#, c-format +msgid "stripping signature from tag %s" +msgstr "tar bort signatur frÃ¥n taggen %s" + +#, c-format +msgid "" +"tag %s tags unexported object; use --tag-of-filtered-object=<mode> to handle " +"it" +msgstr "" +"taggen %s taggar et oexporterat objekt; använd --tag-of-filtered-" +"object=<läge> för att hantera det" + +msgid "cannot export nested tags unless --mark-tags is specified." +msgstr "kan inte exportera nästlade taggar sÃ¥vida inte --mark-tags anges." + +#, c-format +msgid "tag %s points nowhere?" +msgstr "taggen %s pekar ingenstans?" + +#, c-format +msgid "%s: unexpected object of type %s, skipping." +msgstr "%s: förväntade inte objekt av typen %s, hoppar över." + +#, c-format +msgid "tag points to object of unexpected type %s, skipping." +msgstr "taggen pekar pÃ¥ objekt av typ som inte förväntades %s, hoppar över." + +#, c-format +msgid "unable to open marks file %s for writing." +msgstr "kan inte öppna märkesfilen %s för skrivning" + +#, c-format +msgid "unable to write marks file %s." +msgstr "kan inte skriva märkesfilen %s" + +#, c-format +msgid "corrupt mark line: %s" +msgstr "trasig märkesrad: %s" + +#, c-format +msgid "object not found: %s" +msgstr "objektet hittades inte: %s" + +#, c-format +msgid "not a commit? can't happen: %s" +msgstr "inte en incheckning? kan inte hända: %s" + +#, c-format +msgid "object %s already has a mark" +msgstr "objektet %s har redan ett märke" msgid "--anonymize-map token cannot be empty" msgstr "symbolen för --anonymize-map kan inte vara tom" @@ -5835,29 +5984,456 @@ msgid "label tags with mark ids" msgstr "märk taggar med märke-id" #, c-format -msgid "Missing from marks for submodule '%s'" -msgstr "Saknar frÃ¥n-märken för undermodulen â€%sâ€" +msgid "can't write crash report %s" +msgstr "kan inte skriva kraschrapporten %s" + +#, c-format +msgid "fast-import: dumping crash report to %s\n" +msgstr "fast-import: skriver kraschrapport till %s\n" + +#, c-format +msgid "mark :%<PRIuMAX> not declared" +msgstr "märket :%<PRIuMAX> har inte deklarerats" + +#, c-format +msgid "invalid attempt to create duplicate branch: %s" +msgstr "ogiltigt försök att skapa duplicerad gren: %s" + +#, c-format +msgid "branch name doesn't conform to Git standards: %s" +msgstr "grenens namn är inte giltigt i Git: %s" + +msgid "internal consistency error creating the index" +msgstr "internt konsistensfel när indexet skulle skapas" + +msgid "cannot create keep file" +msgstr "kan skapa â€keepâ€-fil" + +msgid "failed to write keep file" +msgstr "misslyckade skriva â€keepâ€-fil" + +msgid "cannot store pack file" +msgstr "kan inte lagra paketfil" + +msgid "cannot store index file" +msgstr "kan inte lagra indexfil" + +#, c-format +msgid "failed seeking to start of '%s'" +msgstr "misslyckades söka till början pÃ¥ â€%sâ€" + +#, c-format +msgid "core Git rejected index %s" +msgstr "kärn-Git refuserade indexet %s" + +msgid "cannot truncate pack to skip duplicate" +msgstr "kan inte trunkera paketfil för att hoppa över duplikat" + +#, c-format +msgid "EOF in data (%<PRIuMAX> bytes remaining)" +msgstr "Filslut i data (%<PRIuMAX> byte Ã¥terstÃ¥r):" + +#, c-format +msgid "unexpected deflate failure: %d" +msgstr "oväntat fel i â€deflateâ€: %d" + +#, c-format +msgid "not a tree: %s" +msgstr "inte ett träd: %s" + +#, c-format +msgid "can't load tree %s" +msgstr "kan inte läsa träd %s" + +#, c-format +msgid "corrupt mode in %s" +msgstr "trasigt läge i %s" + +msgid "root cannot be a non-directory" +msgstr "roten mÃ¥ste vara en katalog" + +msgid "empty path component found in input" +msgstr "fick tom sökvägskomponent i indata" + +msgid "non-directories cannot have subtrees" +msgstr "endast kataloger kan ha underträd" + +#, c-format +msgid "dropping %s since it would point to itself (i.e. to %s)" +msgstr "kastar %s eftersom det skulle peka pÃ¥ sig självt (dvs. till %s)" + +#, c-format +msgid "branch %s is missing commits." +msgstr "grenen %s saknar incheckningar." + +#, c-format +msgid "not updating %s (new tip %s does not contain %s)" +msgstr "uppdaterar inte %s (ny ändpunkt %s innehÃ¥ller inte %s)" + +#, c-format +msgid "unable to create leading directories of %s" +msgstr "kan inte skapa inledande kataloger för %s" + +#, c-format +msgid "unable to write marks file %s" +msgstr "kan inte skriva märkesfilen %s" + +#, c-format +msgid "unable to write marks file %s: %s" +msgstr "kan inte skriva märkesfilen %s: %s" + +#, c-format +msgid "unable to write file %s" +msgstr "kan inte skriva filen %s" + +#, c-format +msgid "expected 'data n' command, found: %s" +msgstr "förväntade â€data nâ€-kommando, hittade: %s" + +#, c-format +msgid "EOF in data (terminator '%s' not found)" +msgstr "Filslut i data (avslutningsmarkören â€%s†hittades inte)" + +msgid "data is too large to use in this context" +msgstr "data är för stort för att använda i denna kontext" + +#, c-format +msgid "EOF in data (%lu bytes remaining)" +msgstr "Filslut i data (%lu byte Ã¥terstÃ¥r)" + +#, c-format +msgid "missing < in ident string: %s" +msgstr "saknad < i ident-sträng: %s" + +#, c-format +msgid "missing space before < in ident string: %s" +msgstr "saknat blanksteg före < i ident-sträng: %s" + +#, c-format +msgid "missing > in ident string: %s" +msgstr "saknad > i ident-sträng: %s" + +#, c-format +msgid "missing space after > in ident string: %s" +msgstr "saknat blanksteg efter > i ident-sträng: %s" + +#, c-format +msgid "invalid raw date \"%s\" in ident: %s" +msgstr "ogiltigt rÃ¥tt datum â€%s†i ident: %s" + +#, c-format +msgid "invalid rfc2822 date \"%s\" in ident: %s" +msgstr "ogiltigt rfc2822-datum â€%s†i ident: %s" + +#, c-format +msgid "date in ident must be 'now': %s" +msgstr "datum i ident mÃ¥ste vara â€nuâ€: %s" + +#, c-format +msgid "too large fanout (%u)" +msgstr "för stor utbredning (%u)" + +#, c-format +msgid "failed to remove path %s" +msgstr "misslyckades ta bort sökvägen %s" + +#, c-format +msgid "no value after ':' in mark: %s" +msgstr "inget värde efter â€:†i märke: %s" + +#, c-format +msgid "garbage after mark: %s" +msgstr "skräp efter märke: %s" + +#, c-format +msgid "missing space after mark: %s" +msgstr "saknat blanksteg efter märke: %s" + +#, c-format +msgid "invalid %s: %s" +msgstr "ogiltig %s: %s" + +#, c-format +msgid "NUL in %s: %s" +msgstr "NUL i %s: %s" + +#, c-format +msgid "garbage after %s: %s" +msgstr "skräp efter %s: %s" + +#, c-format +msgid "missing space after %s: %s" +msgstr "saknat blanksteg efter %s: %s" + +#, c-format +msgid "corrupt mode: %s" +msgstr "trasigt läge: %s" + +#, c-format +msgid "invalid dataref: %s" +msgstr "ogiltig datareferens: %s" + +#, c-format +msgid "missing space after SHA1: %s" +msgstr "saknat blanksteg efter SHA1: %s" + +#, c-format +msgid "Git links cannot be specified 'inline': %s" +msgstr "Git-länkar kan inte anges som â€inlineâ€: %s" + +#, c-format +msgid "not a commit (actually a %s): %s" +msgstr "inte en incheckning (faktiskt %s): %s" #, c-format -msgid "Missing to marks for submodule '%s'" -msgstr "Saknar till-märken för undermodulen â€%sâ€" +msgid "directories cannot be specified 'inline': %s" +msgstr "kataloger kan inte anges som â€inlineâ€: %s" #, c-format -msgid "Expected 'mark' command, got %s" -msgstr "Förväntade â€markâ€-kommando, fick %s" +msgid "%s not found: %s" +msgstr "hittar inte %s: %s" + +msgid "tree" +msgstr "träd" + +#, c-format +msgid "not a %s (actually a %s): %s" +msgstr "inte %s (faktiskt %s): %s" + +#, c-format +msgid "path %s not in branch" +msgstr "sökvägen %s inte pÃ¥ grenen" + +msgid "can't add a note on empty branch." +msgstr "kan inte lägga till en anteckning pÃ¥ en tom gren." + +#, c-format +msgid "mark :%<PRIuMAX> not a commit" +msgstr "märket :%<PRIuMAX> är inte en incheckning" + +#, c-format +msgid "not a valid commit: %s" +msgstr "inte en giltig incheckning: %s" + +#, c-format +msgid "invalid ref name or SHA1 expression: %s" +msgstr "ogiltig referensnamn eller SHA1-uttryck: %s" + +#, c-format +msgid "not a blob (actually a %s): %s" +msgstr "inte en blob (faktiskt %s): %s" + +#, c-format +msgid "blob not found: %s" +msgstr "blob:en hittades inte: %s" + +#, c-format +msgid "the commit %s is corrupt" +msgstr "incheckningen %s är trasig" + +#, c-format +msgid "can't create a branch from itself: %s" +msgstr "kan inte skapa gren frÃ¥n sig själv: %s" + +#, c-format +msgid "" +"expected gpgsig format: 'gpgsig <hash-algo> <signature-format>', got 'gpgsig " +"%s'" +msgstr "" +"förväntade gpgsig-format: â€gpgsig <hashningsalgo> <signaturformat>â€, fick " +"â€gpgsig %sâ€" + +#, c-format +msgid "unknown git hash algorithm in gpgsig: '%s'" +msgstr "okänd git-hashningsalgoritm i gpgsig: â€%sâ€" + +#, c-format +msgid "invalid signature format in gpgsig: '%s'" +msgstr "felaktigt signaturformat i gpgsig: â€%sâ€" + +msgid "'unknown' signature format in gpgsig" +msgstr "â€okänt†signaturformat i gpgsig" + +#, c-format +msgid "multiple %s signatures found, ignoring additional signature" +msgstr "multipla %s-signaturer hittade, ignorerar ytterligare signatur" + +msgid "parse_one_signature() returned unknown hash algo" +msgstr "parse_one_signature() returnerade okänd hashningsalgoritm" + +msgid "expected committer but didn't get one" +msgstr "förväntade incheckare men fick ingen" + +msgid "encountered signed commit; use --signed-commits=<mode> to handle it" +msgstr "" +"pÃ¥träffade en signerad incheckning; använd --signed-commits=<läge> för att " +"hantera den" + +msgid "stripping a commit signature" +msgstr "tar bort en incheckningssignatur" + +msgid "importing a commit signature verbatim" +msgstr "importerar en incheckningssignatur oförändrad" + +msgid "encountered signed tag; use --signed-tags=<mode> to handle it" +msgstr "" +"upptäckte en signerad tagg; använd --signed-tags=<läge> för att hantera den" + +#, c-format +msgid "importing a tag signature verbatim for tag '%s'" +msgstr "importerar en taggsignatur oförändrad för taggen â€%sâ€" + +#, c-format +msgid "stripping a tag signature for tag '%s'" +msgstr "tar bort en taggsignatur för taggen â€%sâ€" + +#, c-format +msgid "expected 'from' command, got '%s'" +msgstr "förväntade â€fromâ€-kommando, fick %s" + +msgid "can't tag an empty branch." +msgstr "kan inte tagga en tom gren." + +#, c-format +msgid "not a valid object: %s" +msgstr "inte ett giltigt objekt: %s" + +msgid "write to frontend failed" +msgstr "skrivning till framändan misslyckades" + +#, c-format +msgid "can't read object %s" +msgstr "kan inte läsa objektet %s" + +#, c-format +msgid "object %s is a %s but a blob was expected." +msgstr "objektet %s är en %s, men förväntade en blob." + +#, c-format +msgid "not a mark: %s" +msgstr "inte ett märke: %s" + +#, c-format +msgid "unknown mark: %s" +msgstr "okänt märke: %s" + +#, c-format +msgid "garbage after SHA1: %s" +msgstr "skräp efter SHA1: %s" + +#, c-format +msgid "not a tree-ish: %s" +msgstr "inte ett träd-igt: %s" + +#, c-format +msgid "can't load object %s" +msgstr "kan inte läsa in objektet %s" + +#, c-format +msgid "invalid SHA1 in tag: %s" +msgstr "ogiltigt SHA1 i tagg: %s" + +#, c-format +msgid "invalid SHA1 in commit: %s" +msgstr "ogiltigt SHA1 i incheckning: %s" + +#, c-format +msgid "missing from marks for submodule '%s'" +msgstr "saknade frÃ¥n-märken i undermodulen â€%sâ€" + +#, c-format +msgid "missing to marks for submodule '%s'" +msgstr "saknade till-märken i undermodulen â€%sâ€" + +#, c-format +msgid "missing space after tree-ish: %s" +msgstr "saknat blanksteg efter träd-igt: %s" + +#, c-format +msgid "not in a commit: %s" +msgstr "inte en incheckning: %s" + +#, c-format +msgid "expected 'mark' command, got %s" +msgstr "förväntade â€markâ€-kommando, fick %s" + +#, c-format +msgid "expected 'to' command, got %s" +msgstr "förväntade â€toâ€-kommando, fick %s" + +msgid "only one import-marks command allowed per stream" +msgstr "endast ett import-marks-kommando tillÃ¥ts per ström" + +#, c-format +msgid "unknown --date-format argument %s" +msgstr "okänt argument till --date-format: %s" + +#, c-format +msgid "%s: argument must be a non-negative integer" +msgstr "%s: argumentet mÃ¥ste vara ett icke-negativt heltal" + +#, c-format +msgid "--depth cannot exceed %u" +msgstr "--depth kan inte överstiga %u" + +#, c-format +msgid "--cat-blob-fd cannot exceed %d" +msgstr "--cat-blob-fd kan inte överstiga %d" + +msgid "expected format name:filename for submodule rewrite option" +msgstr "förväntade formatet namn:filnamn för undermodul-omskrivningsflaggan" #, c-format -msgid "Expected 'to' command, got %s" -msgstr "Förväntade â€toâ€-kommando, fick %s" +msgid "max-pack-size is now in bytes, assuming --max-pack-size=%lum" +msgstr "max-pack-size är nu i byte, antar --max-pack-size=%lum" + +msgid "minimum max-pack-size is 1 MiB" +msgstr "minsta max-pack-size är 1 MiB" -msgid "Expected format name:filename for submodule rewrite option" -msgstr "Förväntade formatet namn:filnamn för undermodul-omskrivningsflaggan" +#, c-format +msgid "unknown --signed-commits mode '%s'" +msgstr "okänt läge â€%s†för --signed-commits" + +#, c-format +msgid "unknown --signed-tags mode '%s'" +msgstr "okänt läge â€%s†för --signed-tags" #, c-format msgid "feature '%s' forbidden in input without --allow-unsafe-features" msgstr "funktionen â€%s†förbjuden i indata utan --allow-unsafe-features" #, c-format +msgid "got feature command '%s' after data command" +msgstr "fick funktionskommando â€%s†efter datakommando" + +#, c-format +msgid "this version of fast-import does not support feature %s." +msgstr "den här versionen av fast-import stöder inte funktionen %s." + +#, c-format +msgid "got option command '%s' after data command" +msgstr "fick tillvalskommando â€%s†efter datakommando" + +#, c-format +msgid "this version of fast-import does not support option: %s" +msgstr "den här versionen av fast-import stöder inte tillvalet: %s" + +#, c-format +msgid "unknown option %s" +msgstr "okänd flagga %s" + +#, c-format +msgid "unknown option --%s" +msgstr "okänd flagga --%s" + +#, c-format +msgid "unsupported command: %s" +msgstr "kommando stöds ej: %s" + +msgid "stream ends early" +msgstr "strömmen slutade för tidigt" + +#, c-format msgid "Lockfile created but not reported: %s" msgstr "LÃ¥sfil skapad men inte rapporterad: %s" @@ -5993,6 +6569,35 @@ msgstr "" "varningen till fjärren ändrar HEAD till nÃ¥got annat genom att köra\n" "â€git config set remote %s.followRemoteHEAD warn-if-not-branch-%sâ€." +msgid "" +"You're on a case-insensitive filesystem, and the remote you are\n" +"trying to fetch from has references that only differ in casing. It\n" +"is impossible to store such references with the 'files' backend. You\n" +"can either accept this as-is, in which case you won't be able to\n" +"store all remote references on disk. Or you can alternatively\n" +"migrate your repository to use the 'reftable' backend with the\n" +"following command:\n" +"\n" +" git refs migrate --ref-format=reftable\n" +"\n" +"Please keep in mind that not all implementations of Git support this\n" +"new format yet. So if you use tools other than Git to access this\n" +"repository it may not be an option to migrate to reftables.\n" +msgstr "" +"Du är pÃ¥ ett skiftlägesokänsligt filsystem och fjärren du försöker\n" +"hämta frÃ¥n har referenser vars namn bara varierar i smÃ¥ och stora\n" +"bokstäver. Det är inte möjligt att spara sÃ¥dana referenser med\n" +"â€filesâ€-bakändan. Du kan antingen godta det som det är, i vilket\n" +"fall du inte kommer kunna lagra alla fjärr-referenser pÃ¥ disken.\n" +"Eller sÃ¥ kan du migrera ditt arkiv till att använda bakändan\n" +"â€reftable†med hjälp av följande kommando:\n" +"\n" +" git refs migrate --ref-format=reftable\n" +"\n" +"Tänk pÃ¥ att alla implementationer av Git ännu inte stöder detta\n" +"format. SÃ¥ om du använder andra verktyg än Git för att läsa detta\n" +"arkiv är migrering till referenstabeller kanske inte ett alternativ.\n" + #, c-format msgid "" "some local refs could not be updated; try running\n" @@ -6196,11 +6801,11 @@ msgid "protocol does not support --negotiate-only, exiting" msgstr "protokollet stöder inte --negotiate-only, avslutar" msgid "" -"--filter can only be used with the remote configured in extensions." -"partialclone" +"--filter can only be used with the remote configured in " +"extensions.partialclone" msgstr "" -"--filter kan endast användas med fjärren konfigurerad i extensions." -"partialclone" +"--filter kan endast användas med fjärren konfigurerad i " +"extensions.partialclone" msgid "--atomic can only be used when fetching from one remote" msgstr "--atomic kan bara användas vid hämtning frÃ¥n en fjärr" @@ -6231,23 +6836,6 @@ msgstr "använd <namn> istället för den verkliga mÃ¥lgrenen" msgid "file to read from" msgstr "fil att läsa frÃ¥n" -msgid "git for-each-ref [<options>] [<pattern>]" -msgstr "git for-each-ref [<flaggor>] [<mönster>]" - -msgid "git for-each-ref [--points-at <object>]" -msgstr "git for-each-ref [--points-at <objekt>]" - -msgid "git for-each-ref [--merged [<commit>]] [--no-merged [<commit>]]" -msgstr "" -"git for-each-ref [--merged [<incheckning>]] [--no-merged <incheckning>]]" - -msgid "git for-each-ref [--contains [<commit>]] [--no-contains [<commit>]]" -msgstr "" -"git for-each-ref [--contains [<incheckning>]] [--no-contains [<incheckning>]]" - -msgid "git for-each-ref [--start-after <marker>]" -msgstr "git for-each-ref [--start-after <markör>]" - msgid "quote placeholders suitably for shells" msgstr "citera platshÃ¥llare passande för skal" @@ -6302,6 +6890,9 @@ msgstr "okända argument angavs tillsammans med --stdin" msgid "cannot use --start-after with patterns" msgstr "kan inte använda --start-after med mönster" +msgid "git for-each-ref " +msgstr "git for-each-ref " + msgid "git for-each-repo --config=<config> [--] <arguments>" msgstr "git for-each-repo --config=<konfig> [--] <argument>" @@ -6777,6 +7368,9 @@ msgstr "" "hoppar över â€incremental-repackâ€-uppgift eftersom core.multiPackIndex är " "inaktiverat" +msgid "failed to perform geometric repack" +msgstr "misslyckades att utföra geometrisk ompackning" + #, c-format msgid "task '%s' failed" msgstr "uppgiften â€%s†misslyckades" @@ -6786,6 +7380,10 @@ msgid "lock file '%s' exists, skipping maintenance" msgstr "lÃ¥sfilen â€%s†finns, hoppar över underhÃ¥ll" #, c-format +msgid "unknown maintenance strategy: '%s'" +msgstr "okänd underhÃ¥llsstrategi: â€%sâ€" + +#, c-format msgid "'%s' is not a valid task" msgstr "â€%s†är inte en giltig uppgift" @@ -7644,6 +8242,29 @@ msgstr "--trailer med --only-input ger ingen mening" msgid "no input file given for in-place editing" msgstr "ingen indatafil angiven för redigering pÃ¥ plats" +msgid "last-modified can only operate on one tree at a time" +msgstr "last-modified kan bara användas pÃ¥ ett träd Ã¥t gÃ¥ngen" + +#, c-format +msgid "unknown last-modified argument: %s" +msgstr "okänt argument till last-modified: %s" + +msgid "unable to setup last-modified" +msgstr "kan inte ställa in last-modified" + +msgid "" +"git last-modified [--recursive] [--show-trees] [<revision-range>] [[--] " +"<path>...]" +msgstr "" +"git last-modified [--recursive] [--show-trees] [<versionsintervall>] [[--] " +"<sökväg>...]" + +msgid "recurse into subtrees" +msgstr "rekursera ner i underträd" + +msgid "show tree entries when recursing into subtrees" +msgstr "visa trädposter under rekursering in i underträd" + msgid "git log [<options>] [<revision-range>] [[--] <path>...]" msgstr "git log [<flaggor>] [<versionsintervall>] [[--] <sökväg>...]" @@ -7682,6 +8303,20 @@ msgstr "" msgid "-L<range>:<file> cannot be used with pathspec" msgstr "-L<intervall>:<fil> kan inte användas med sökvägsspecifikation" +msgid "" +"\n" +"hint: You can replace 'git whatchanged <opts>' with:\n" +"hint:\tgit log <opts> --raw --no-merges\n" +"hint: Or make an alias:\n" +"hint:\tgit config set --global alias.whatchanged 'log --raw --no-merges'\n" +"\n" +msgstr "" +"\n" +"tips: du kan ersätta â€git whatchanged <flaggor>†med:\n" +"tips:\tgit log <flaggor> --raw --no-merges\n" +"tips: Eller skapa ett alias:\n" +"tips:\tgit config set --global alias.whatchanged 'log --raw --no-merges'\n" + #, c-format msgid "git show %s: bad file" msgstr "git show %s: felaktig fil" @@ -8112,11 +8747,8 @@ msgstr "git ls-tree [<flaggor>] <träd-igt> [<sökväg>...]" msgid "only show trees" msgstr "visa endast träd" -msgid "recurse into subtrees" -msgstr "rekursera ner i underträd" - msgid "show trees when recursing" -msgstr "visa träd medan rekursering" +msgstr "visa träd under rekursering" msgid "terminate entries with NUL byte" msgstr "terminera poster med NUL-byte" @@ -8261,10 +8893,6 @@ msgid "Could not write object file" msgstr "Kunde inte skriva objektfilen" #, c-format -msgid "unknown option %s" -msgstr "okänd flagga %s" - -#, c-format msgid "could not parse object '%s'" msgstr "kunde inte tolka objektet â€%sâ€" @@ -8431,10 +9059,6 @@ msgstr "kunde köra stash." msgid "stash failed" msgstr "stash misslyckades" -#, c-format -msgid "not a valid object: %s" -msgstr "inte ett giltigt objekt: %s" - msgid "read-tree failed" msgstr "read-tree misslyckades" @@ -9569,27 +10193,8 @@ msgstr "" "Totalt %<PRIu32> (delta %<PRIu32>), Ã¥teranvände %<PRIu32> (delta %<PRIu32>), " "paket-Ã¥teranvända %<PRIu32> (frÃ¥n %<PRIuMAX>)" -msgid "" -"git pack-refs [--all] [--no-prune] [--auto] [--include <pattern>] [--exclude " -"<pattern>]" -msgstr "" -"git pack-refs [--all] [--no-prune] [--auto] [--include <mönster>] [--exclude " -"<mönster>]" - -msgid "pack everything" -msgstr "packa allt" - -msgid "prune loose refs (default)" -msgstr "ta bort lösa referenser (standard)" - -msgid "auto-pack refs as needed" -msgstr "packa referenser automatiskt om nödvändigt" - -msgid "references to include" -msgstr "referenser att ta med" - -msgid "references to exclude" -msgstr "referenser att utesluta" +msgid "git pack-refs " +msgstr "git pack-refs " msgid "git patch-id [--stable | --unstable | --verbatim]" msgstr "git patch-id [--stable | --unstable | --verbatim]" @@ -9831,8 +10436,8 @@ msgid "" msgstr "" "\n" "För att undvika att en uppströmsgren automatiskt konfigureras när dess namn\n" -"inte motsvarar den lokala grenen, se värdet â€simple†i branch." -"autoSetupMerge\n" +"inte motsvarar den lokala grenen, se värdet â€simple†i " +"branch.autoSetupMerge\n" "i â€git help configâ€.\n" #, c-format @@ -10095,6 +10700,10 @@ msgstr "git range-diff [<flaggor>] <gammal-bas>..<ny-ända>" msgid "git range-diff [<options>] <base> <old-tip> <new-tip>" msgstr "git range-diff [<flaggor>] <bas> <gammal-ända> <ny-ända>" +#, c-format +msgid "invalid max-memory value: %s" +msgstr "felaktigt värde för max-memory: %s" + msgid "use simple diff colors" msgstr "använd enkla diff-färger" @@ -10104,6 +10713,12 @@ msgstr "anteckningar" msgid "passed to 'git log'" msgstr "sänds till â€git logâ€" +msgid "size" +msgstr "storlek" + +msgid "maximum memory for cost matrix (default 4G)" +msgstr "maximalt minne för kostnadsmatris (förval 4G)" + msgid "only emit output related to the first range" msgstr "visa endast utdata för det första intervallet" @@ -10653,16 +11268,11 @@ msgstr "git reflog [show] [<log-flaggor>] [<ref>]" msgid "git reflog list" msgstr "git reflog list" -msgid "" -"git reflog expire [--expire=<time>] [--expire-unreachable=<time>]\n" -" [--rewrite] [--updateref] [--stale-fix]\n" -" [--dry-run | -n] [--verbose] [--all [--single-worktree] | " -"<refs>...]" -msgstr "" -"git reflog expire [--expire=<time>] [--expire-unreachable=<time>]\n" -" [--rewrite] [--updateref] [--stale-fix]\n" -" [--dry-run | -n] [--verbose] [--all [--single-worktree] | " -"<referenser>...]" +msgid "git reflog exists <ref>" +msgstr "git reflog exists <referens>" + +msgid "git reflog write <ref> <old-oid> <new-oid> <message>" +msgstr "git reflog write <ref> <gammalt-oid> <nytt-oi> <meddelande>" msgid "" "git reflog delete [--rewrite] [--updateref]\n" @@ -10671,12 +11281,20 @@ msgstr "" "git reflog delete [--rewrite] [--updateref]\n" " [--dry-run | -n] [--verbose] <ref>@{<specificering>}..." -msgid "git reflog exists <ref>" -msgstr "git reflog exists <referens>" - msgid "git reflog drop [--all [--single-worktree] | <refs>...]" msgstr "git reflog drop [--all [--single-worktree] | <referenser>...]" +msgid "" +"git reflog expire [--expire=<time>] [--expire-unreachable=<time>]\n" +" [--rewrite] [--updateref] [--stale-fix]\n" +" [--dry-run | -n] [--verbose] [--all [--single-worktree] | " +"<refs>...]" +msgstr "" +"git reflog expire [--expire=<time>] [--expire-unreachable=<time>]\n" +" [--rewrite] [--updateref] [--stale-fix]\n" +" [--dry-run | -n] [--verbose] [--all [--single-worktree] | " +"<referenser>...]" + #, c-format msgid "invalid timestamp '%s' given to '--%s'" msgstr "ogiltig tidsstämpel â€%s†given i â€--%sâ€" @@ -10744,12 +11362,50 @@ msgstr "kasta referensloggar endast för aktuell arbetskatalog" msgid "references specified along with --all" msgstr "referenser angivna tillsammans med --all" +#, c-format +msgid "invalid reference name: %s" +msgstr "felaktigt referensnamn: %s" + +#, c-format +msgid "invalid old object ID: '%s'" +msgstr "ogiltigt gammalt objekt-ID: â€%sâ€" + +#, c-format +msgid "old object '%s' does not exist" +msgstr "gammalt objekt â€%s†finns inte" + +#, c-format +msgid "invalid new object ID: '%s'" +msgstr "ogiltigt nytt objekt-ID: â€%sâ€" + +#, c-format +msgid "new object '%s' does not exist" +msgstr "nytt objekt â€%s†finns inte" + +#, c-format +msgid "cannot start transaction: %s" +msgstr "kan inte starta transaktionen: %s" + +#, c-format +msgid "cannot queue reflog update: %s" +msgstr "kan inte köa referenslogguppdatering: %s" + +#, c-format +msgid "cannot commit reflog update: %s" +msgstr "kan inte spara referenslogguppdatering: %s" + msgid "git refs migrate --ref-format=<format> [--no-reflog] [--dry-run]" msgstr "git refs migrate --ref-format=<format> [--no-reflog] [--dry-run]" msgid "git refs verify [--strict] [--verbose]" msgstr "git refs verify [--strict] [--verbose]" +msgid "git refs exists <ref>" +msgstr "git refs exists <referens>" + +msgid "git refs optimize " +msgstr "git refs optimize " + msgid "specify the reference format to convert to" msgstr "ange referensformatet att konvertera till" @@ -10772,6 +11428,18 @@ msgstr "aktivera strikt kontroll" msgid "'git refs verify' takes no arguments" msgstr "â€git refs verify†tar inget argument" +msgid "git refs list " +msgstr "git refs list" + +msgid "'git refs exists' requires a reference" +msgstr "â€git refs exists†kräver en referens" + +msgid "reference does not exist" +msgstr "referensen existerar inte" + +msgid "failed to look up reference" +msgstr "misslyckades slÃ¥ upp referensen" + msgid "" "git remote add [-t <branch>] [-m <master>] [-f] [--tags | --no-tags] [--" "mirror=<fetch|push>] <name> <url>" @@ -10928,6 +11596,24 @@ msgstr "" "\t%s:%d\n" "anger nu den icke-existerande fjärren â€%sâ€" +msgid "" +"The remote you are trying to rename has conflicting references in the\n" +"new target refspec. This is most likely caused by you trying to nest\n" +"a remote into itself, e.g. by renaming 'parent' into 'parent/child'\n" +"or by unnesting a remote, e.g. the other way round.\n" +"\n" +"If that is the case, you can address this by first renaming the\n" +"remote to a different name.\n" +msgstr "" +"Fjärren du försöker byta namn pÃ¥ har motstridiga referenser i det\n" +"nya mÃ¥lets referensspecifikationer. Det beror antagligen pÃ¥ att du\n" +"försöker nästla en fjärr in i sig själv, t.ex. genom att namnändra\n" +"â€förälder†till â€förälder/barn†eller att avnästlar en, t.ex. Ã¥t\n" +"andra hÃ¥llet.\n" +"\n" +"Om sÃ¥ är fallet kan du du lösa det genom att första byta namnet pÃ¥\n" +"fjärren mot ett annat namn.\n" + #, c-format msgid "No such remote: '%s'" msgstr "Ingen sÃ¥dan fjärr: â€%sâ€" @@ -10936,6 +11622,13 @@ msgstr "Ingen sÃ¥dan fjärr: â€%sâ€" msgid "Could not rename config section '%s' to '%s'" msgstr "Kunde inte byta namn pÃ¥ konfigurationssektionen â€%s†till â€%sâ€" +msgid "Renaming remote references" +msgstr "Byter namn pÃ¥ fjärreferenser" + +#, c-format +msgid "queueing remote ref renames failed: %s" +msgstr "misslyckades köa namnändring av fjärr-referenser: %s" + #, c-format msgid "" "Not updating non-default fetch refspec\n" @@ -10946,16 +11639,9 @@ msgstr "" "\t%s\n" "\tUppdatera konfigurationen manuellt om nödvändigt." -msgid "Renaming remote references" -msgstr "Byter namn pÃ¥ fjärreferenser" - #, c-format -msgid "deleting '%s' failed" -msgstr "misslyckades ta bort â€%sâ€" - -#, c-format -msgid "creating '%s' failed" -msgstr "misslyckades skapa â€%sâ€" +msgid "renaming remote refs failed: %s" +msgstr "misslyckades namnändra fjärr-referenser: %s" msgid "" "Note: A branch outside the refs/remotes/ hierarchy was not removed;\n" @@ -11235,46 +11921,6 @@ msgstr "" "Använd --no-write-bitmap-index eller inaktivera inställningen\n" "pack.writeBitmaps." -msgid "could not start pack-objects to repack promisor objects" -msgstr "kunde inte starta pack-objects för att packa om kontraktsobjekt" - -msgid "failed to feed promisor objects to pack-objects" -msgstr "misslyckades sända kontraktsobjekt till pack-objects" - -msgid "repack: Expecting full hex object ID lines only from pack-objects." -msgstr "" -"repack: Förväntar kompletta hex-objekt-id-rader endast frÃ¥n pack-objects." - -msgid "could not finish pack-objects to repack promisor objects" -msgstr "kunde inte avsluta pack-objects för att packa om kontraktsobjekt" - -#, c-format -msgid "cannot open index for %s" -msgstr "kunde inte öppna indexet för %s" - -#, c-format -msgid "pack %s too large to consider in geometric progression" -msgstr "paketet %s för stort för att tas med i geometriskt förlopp" - -#, c-format -msgid "pack %s too large to roll up" -msgstr "paketet %s för stort att rulla upp" - -#, c-format -msgid "could not open tempfile %s for writing" -msgstr "kunde inte öppna temporär fil %s för skrivning" - -msgid "could not close refs snapshot tempfile" -msgstr "kunde inte stänga temporär fil för refs-ögonblicksbild" - -#, c-format -msgid "could not remove stale bitmap: %s" -msgstr "kunde inte ta bort gammal bitkarta: %s" - -#, c-format -msgid "pack prefix %s does not begin with objdir %s" -msgstr "paketprefixet %s börjar inte med objkat %s" - msgid "pack everything in a single pack" msgstr "packa allt i ett enda paket" @@ -11372,18 +12018,6 @@ msgstr "flaggan â€%s†kan inte användas med â€%sâ€" msgid "Nothing new to pack." msgstr "Inget nytt att packa." -#, c-format -msgid "renaming pack to '%s' failed" -msgstr "misslyckades byta namn pÃ¥ paket till â€%sâ€" - -#, c-format -msgid "pack-objects did not write a '%s' file for pack %s-%s" -msgstr "pack-objects skrev inte en â€%sâ€-fil för paketet %s-%s" - -#, c-format -msgid "could not unlink: %s" -msgstr "kunde inte ta bort: â€%sâ€" - msgid "git replace [-f] <object> <replacement>" msgstr "git replace [-f] <objekt> <ersättning>" @@ -11639,6 +12273,62 @@ msgstr "kan ännu inte spela om hela vägen ned till rotincheckningen!" msgid "replaying merge commits is not supported yet!" msgstr "kan ännu inte spela om sammanslagningsincheckningar!" +#, c-format +msgid "key '%s' not found" +msgstr "nyckeln â€%s†hittades inte" + +#, c-format +msgid "invalid format '%s'" +msgstr "ogiltigt format â€%sâ€" + +msgid "output format" +msgstr "utdataformat" + +msgid "synonym for --format=nul" +msgstr "synonym till --format=nul" + +msgid "unsupported output format" +msgstr "utdataformatet stöds ej" + +msgid "References" +msgstr "Referenser" + +msgid "Count" +msgstr "Antal" + +msgid "Branches" +msgstr "Grenar" + +msgid "Tags" +msgstr "Taggar" + +msgid "Remotes" +msgstr "Fjärrar" + +msgid "Others" +msgstr "Andra" + +msgid "Reachable objects" +msgstr "NÃ¥bara objekt" + +msgid "Commits" +msgstr "Incheckningar" + +msgid "Trees" +msgstr "Träd" + +msgid "Blobs" +msgstr "Blob:ar" + +msgid "Repository structure" +msgstr "Arkivstruktur" + +msgid "Value" +msgstr "Värde" + +msgid "Counting references" +msgstr "Räknar referenser" + msgid "" "git rerere [clear | forget <pathspec>... | diff | status | remaining | gc]" msgstr "" @@ -12224,12 +12914,6 @@ msgstr "git show-ref --exclude-existing[=<mönster>]" msgid "git show-ref --exists <ref>" msgstr "git show-ref --exists <ref>" -msgid "reference does not exist" -msgstr "referensen existerar inte" - -msgid "failed to look up reference" -msgstr "misslyckades slÃ¥ upp referensen" - msgid "only show tags (can be combined with --branches)" msgstr "visa endast taggar (kan kombineras med --branches)" @@ -12259,10 +12943,10 @@ msgstr "visa referenser frÃ¥n standard in som inte finns i lokalt arkiv" msgid "" "git sparse-checkout (init | list | set | add | reapply | disable | check-" -"rules) [<options>]" +"rules | clean) [<options>]" msgstr "" "git sparse-checkout (init | list | set | add | reapply | disable | check-" -"rules) <flaggor>" +"rules | clean) <flaggor>" msgid "this worktree is not sparse" msgstr "arbetskatalogen är inte gren" @@ -12303,10 +12987,6 @@ msgid "toggle the use of a sparse index" msgstr "slÃ¥ pÃ¥/av användning av glest index" #, c-format -msgid "unable to create leading directories of %s" -msgstr "kan inte skapa inledande kataloger för %s" - -#, c-format msgid "failed to open '%s'" msgstr "misslyckades öppna â€%sâ€" @@ -12386,6 +13066,32 @@ msgid "must be in a sparse-checkout to reapply sparsity patterns" msgstr "" "mÃ¥ste vara i en gles utcheckning för att tillämpa gleshetsmönster pÃ¥ nytt" +msgid "report each affected file, not just directories" +msgstr "rapportera varje pÃ¥verkad fil, inte bara kataloger" + +msgid "must be in a sparse-checkout to clean directories" +msgstr "mÃ¥ste vara i en gles utcheckning för städa kataloger" + +msgid "must be in a cone-mode sparse-checkout to clean directories" +msgstr "mÃ¥ste vara i en gles utcheckning i konläge för att städa kataloger" + +msgid "for safety, refusing to clean without one of --force or --dry-run" +msgstr "för säkerhets skull, vägrar rensa utan en av --force eller --dry-run" + +msgid "failed to read index" +msgstr "misslyckades läsa index" + +msgid "" +"failed to convert index to a sparse index; resolve merge conflicts and try " +"again" +msgstr "" +"misslyckades konvertera indexet till ett glest index; lös " +"sammanslagningskonflikter och försök igen" + +#, c-format +msgid "failed to remove '%s'" +msgstr "misslyckades ta bort â€%sâ€" + msgid "error while refreshing working directory" msgstr "fel vid uppdatering av arbetskatalog" @@ -14072,9 +14778,6 @@ msgstr "visa trädobjekt för underkatalogen <prefix>" msgid "only useful for debugging" msgstr "endast användbart vid felsökning" -msgid "core.fsyncMethod = batch is unsupported on this platform" -msgstr "core.fsyncMethod = batch stöds inte pÃ¥ denna plattform" - #, c-format msgid "could not parse bundle list key %s with value '%s'" msgstr "kunde inte tolka listnyckeln %s med värdet â€%sâ€" @@ -14465,6 +15168,9 @@ msgid "Add or parse structured information in commit messages" msgstr "" "Lägg till eller tolka strukturerad information i incheckningsmeddelanden" +msgid "EXPERIMENTAL: Show when files were last modified" +msgstr "EXPERIMENTELLT: Visa när filer sist ändrades" + msgid "Show commit logs" msgstr "Visa incheckningsloggar" @@ -14587,6 +15293,9 @@ msgstr "" "EXPERIMENTELLT: Spela om incheckningar ovanpÃ¥ en ny bas, fungerar även med " "nakna arkiv" +msgid "Retrieve information about the repository" +msgstr "Hämta information om arkivet" + msgid "Generates a summary of pending changes" msgstr "Skapar en sammanfattning av väntande ändringar" @@ -14668,8 +15377,8 @@ msgstr "Byt gren" msgid "Read, modify and delete symbolic refs" msgstr "Läs, modifiera eller ta bort symbolisk referens" -msgid "Create, list, delete or verify a tag object signed with GPG" -msgstr "Skapa, visa, ta bort eller verifiera GPG-signerat taggobjekt" +msgid "Create, list, delete or verify tags" +msgstr "Skapa, visa, ta bort eller verifiera taggar" msgid "Creates a temporary file with a blob's contents" msgstr "Skapar temporära filer med innehÃ¥llet frÃ¥n en blob" @@ -15011,11 +15720,11 @@ msgstr "" #, c-format msgid "" -"attempting to write a commit-graph, but 'commitGraph." -"changedPathsVersion' (%d) is not supported" +"attempting to write a commit-graph, but 'commitGraph.changedPathsVersion' " +"(%d) is not supported" msgstr "" -"försöker skriva en incheckningsgraf, men â€commitGraph." -"changedPathsVersion†(%d) stöds inte" +"försöker skriva en incheckningsgraf, men â€commitGraph.changedPathsVersion†" +"(%d) stöds inte" msgid "too many commits to write graph" msgstr "för mÃ¥nga incheckningar för att skriva graf" @@ -15514,6 +16223,43 @@ msgstr "kan inte slÃ¥ upp konfigurerings-blob:en â€%sâ€" msgid "unable to parse command-line config" msgstr "kan inte tolka kommandoradskonfiguration" +#, c-format +msgid "" +"\n" +"To use the default comment string (#) please run\n" +"\n" +"%s" +msgstr "" +"\n" +"För att använda standardkommentarssträngen (#), kör\n" +"\n" +"%s" + +msgid "<comment string>" +msgstr "<kommentarssträng>" + +#, c-format +msgid "" +"\n" +"To set a custom comment string please run\n" +"\n" +"%s\n" +"where '%s' is the string you wish to use.\n" +msgstr "" +"\n" +"För att ange en skräddarsydd kommentarssträng, kör\n" +"\n" +"%s\n" +"där â€%s†är strängen du vill använda.\n" + +#, c-format +msgid "Support for '%s=auto' has been removed in Git 3.0" +msgstr "Stöd för â€%s=auto†har tagits bort i Git 3.0" + +#, c-format +msgid "Support for '%s=auto' is deprecated and will be removed in Git 3.0" +msgstr "Stöd för â€%s=auto†är förÃ¥ldrat och kommer tas bort i Git 3.0" + msgid "unknown error occurred while reading the configuration files" msgstr "okänt fel uppstod vid läsning av konfigurationsfilerna" @@ -15989,6 +16735,12 @@ msgstr "kunde inte lägga till katalogen â€%s†till arkiveraren" msgid "failed to write archive" msgstr "misslyckades skriva arkiv" +msgid "max-depth is not supported for worktree diffs" +msgstr "max-depth stöds inte för diffar i arbetskatalog" + +msgid "max-depth is not supported for index diffs" +msgstr "max-depth stöds inte för index-diffar" + msgid "--merge-base does not work with ranges" msgstr "--merge-base fungerar inte med intervall" @@ -16492,6 +17244,12 @@ msgstr "[(A|C|D|M|R|T|U|X|B)...[*]]" msgid "select files by diff type" msgstr "välj filter efter diff-typ" +msgid "<depth>" +msgstr "<djup>" + +msgid "maximum tree depth to recurse" +msgstr "maximal träddjup att rekursera" + msgid "<file>" msgstr "<fil>" @@ -16687,10 +17445,6 @@ msgid "invalid unshallow line: %s" msgstr "ogiltig â€unshallowâ€-rad: %s" #, c-format -msgid "object not found: %s" -msgstr "objektet hittades inte: %s" - -#, c-format msgid "error in object: %s" msgstr "fel i objekt: %s" @@ -16973,6 +17727,10 @@ msgstr "tomt alias för %s" msgid "recursive alias: %s" msgstr "rekursivt alias: %s" +#, c-format +msgid "alias loop detected: expansion of '%s' does not terminate:%s" +msgstr "alias-slinga detekterades: expansionen av â€%s†avslutas aldrig:%s" + msgid "write failure on standard output" msgstr "skrivfel pÃ¥ standard ut" @@ -16983,10 +17741,6 @@ msgid "close failed on standard output" msgstr "stäng misslyckades pÃ¥ standard ut" #, c-format -msgid "alias loop detected: expansion of '%s' does not terminate:%s" -msgstr "alias-slinga detekterades: expansionen av â€%s†avslutas aldrig:%s" - -#, c-format msgid "cannot handle %s as a builtin" msgstr "kan inte hantera %s som inbyggd" @@ -17040,12 +17794,20 @@ msgstr "felaktig/inkompatibel signatur â€%sâ€" msgid "failed to get the ssh fingerprint for key '%s'" msgstr "misslyckades hämta ssh-fingeravtrycket för nyckeln â€%sâ€" +#, c-format +msgid "failed to get the ssh fingerprint for key %s" +msgstr "misslyckades hämta ssh-fingeravtrycket för nyckeln %s" + msgid "" "either user.signingkey or gpg.ssh.defaultKeyCommand needs to be configured" msgstr "" "mÃ¥ste konfigurera antingen user.signingkey eller gpg.ssh.defaultKeyCommand" #, c-format +msgid "malformed build-time gpg.ssh.defaultKeyCommand: %s" +msgstr "fel format pÃ¥ gpg.ssh.defaultKeyCommand frÃ¥n byggtiden: %s" + +#, c-format msgid "gpg.ssh.defaultKeyCommand succeeded but returned no keys: %s %s" msgstr "gpg.ssh.defaultKeyCommand lyckades men gav inga nycklar: %s %s" @@ -17091,8 +17853,8 @@ msgid "" "given pattern contains NULL byte (via -f <file>). This is only supported " "with -P under PCRE v2" msgstr "" -"angivet mönster innehÃ¥ller NULL-byte (via -f <fil>). Detta stöds endast med -" -"P under PCRE v2" +"angivet mönster innehÃ¥ller NULL-byte (via -f <fil>). Detta stöds endast med " +"-P under PCRE v2" #, c-format msgid "'%s': unable to read %s" @@ -17298,6 +18060,13 @@ msgstr "" " bad om: %s\n" " omdirigering: %s" +#, c-format +msgid "" +"number too large to represent as curl_off_t on this platform: %<PRIuMAX>" +msgstr "" +"värdet för stort för att representeras som curl_off_t pÃ¥ denna plattform: " +"%<PRIuMAX>" + msgid "Author identity unknown\n" msgstr "Författar-identitet okänd\n" @@ -17755,10 +18524,6 @@ msgid "could not load pack" msgstr "kunde inte läsa paket{" #, c-format -msgid "could not open index for %s" -msgstr "kunde inte öppna indexet för %s" - -#, c-format msgid "unable to link '%s' to '%s'" msgstr "kan inte länka â€%s†till â€%sâ€" @@ -17781,6 +18546,10 @@ msgid "unknown preferred pack: '%s'" msgstr "okänt föredraget paket: %s" #, c-format +msgid "failed to open preferred pack %s" +msgstr "misslyckades öppna föredraget paket %s" + +#, c-format msgid "cannot select preferred pack %s with no objects" msgstr "kan inte välja föredraget paket %s som inte har nÃ¥gra objekt" @@ -17804,6 +18573,9 @@ msgstr "kan inte skapa temporärt MIDX-lager" msgid "could not write multi-pack bitmap" msgstr "kunde inte skriva fler-paketsbitkarta" +msgid "too many multi-pack-indexes" +msgstr "för mÃ¥nga multi-pack-index" + msgid "unable to open multi-pack-index chain file" msgstr "kan inte öppna kedjefil för multi-pack-index" @@ -18070,10 +18842,6 @@ msgid "files '%s' and '%s' differ in contents" msgstr "filerna â€%s†och â€%s†har olika innehÃ¥ll" #, c-format -msgid "unable to write file %s" -msgstr "kan inte skriva filen %s" - -#, c-format msgid "unable to write repeatedly vanishing file %s" msgstr "kan inte skriva till filen %s som hela tiden försvinner" @@ -18081,6 +18849,9 @@ msgstr "kan inte skriva till filen %s som hela tiden försvinner" msgid "unable to set permission to '%s'" msgstr "kan inte sätta behörigheten till â€%sâ€" +msgid "core.fsyncMethod = batch is unsupported on this platform" +msgstr "core.fsyncMethod = batch stöds inte pÃ¥ denna plattform" + msgid "error when closing loose object file" msgstr "fel vid stängning av fil för löst objekt" @@ -18578,6 +19349,21 @@ msgstr "mtimes-filen %s har hash-ID %<PRIu32> som inte stöds" msgid "mtimes file %s is corrupt" msgstr "mtimes-filen %s är trasig" +msgid "pack everything" +msgstr "packa allt" + +msgid "prune loose refs (default)" +msgstr "ta bort lösa referenser (standard)" + +msgid "auto-pack refs as needed" +msgstr "packa referenser automatiskt om nödvändigt" + +msgid "references to include" +msgstr "referenser att ta med" + +msgid "references to exclude" +msgstr "referenser att utesluta" + #, c-format msgid "reverse-index file %s is too small" msgstr "reverse-index-filen %s är för liten" @@ -18999,6 +19785,10 @@ msgid "could not fetch %s from promisor remote" msgstr "kunde inte hämta %s frÃ¥n kontraktsfjärr" #, c-format +msgid "unsupported field '%s' in '%s' config" +msgstr "fältet â€%s†i inställningen â€%s†stöds ej" + +#, c-format msgid "no or empty URL advertised for remote '%s'" msgstr "ingen eller tom URL tillkännagavs för fjärren â€%sâ€" @@ -19007,12 +19797,16 @@ msgid "known remote named '%s' but with URL '%s' instead of '%s'" msgstr "känd fjärr som heter â€%s†men med URL:en â€%s†istället för â€%sâ€" #, c-format -msgid "unknown '%s' value for '%s' config option" -msgstr "okänt värde â€%s†för inställningen â€%sâ€" +msgid "invalid element '%s' from remote info" +msgstr "ogiltigt element â€%s†frÃ¥n fjärrinformation" + +#, c-format +msgid "server advertised a promisor remote without a name or URL: %s" +msgstr "servern deklarerade en kontraktsfjärr utan namn eller URL: %s" #, c-format -msgid "unknown element '%s' from remote info" -msgstr "okänt värde â€%s†frÃ¥n fjärrinformation" +msgid "unknown '%s' value for '%s' config option" +msgstr "okänt värde â€%s†för inställningen â€%sâ€" #, c-format msgid "accepted promisor remote '%s' not found" @@ -19114,6 +19908,16 @@ msgid "failed to generate diff" msgstr "misslyckades skapa diff" #, c-format +msgid "" +"range-diff: unable to compute the range-diff, since it exceeds the maximum " +"memory for the cost matrix: %s (%<PRIuMAX> bytes) needed, limited to %s " +"(%<PRIuMAX> bytes)" +msgstr "" +"range-diff: kan inte beräkna intervalldiff, eftersom den överstiger maximalt " +"minne för konstnadsmatrisen: %s (%<PRIuMAX> bytes) krävs, begränsat till %s " +"(%<PRIuMAX> bytes)" + +#, c-format msgid "could not parse log for '%s'" msgstr "kunde inte tolka loggen för â€%sâ€" @@ -19642,6 +20446,9 @@ msgstr "inte en referenslogg: %s" msgid "no reflog for '%s'" msgstr "ingen referenslogg för â€%sâ€" +msgid "Checking references consistency" +msgstr "Kontrollerar konsistens för referenser" + #, c-format msgid "%s does not point to a valid object!" msgstr "â€%s†pekar inte pÃ¥ ett giltigt objekt!" @@ -19657,8 +20464,9 @@ msgstr "%s%s har blivit dinglande efter att %s togs bort\n" #, c-format msgid "" "Using '%s' as the name for the initial branch. This default branch name\n" -"is subject to change. To configure the initial branch name to use in all\n" -"of your new repositories, which will suppress this warning, call:\n" +"will change to \"main\" in Git 3.0. To configure the initial branch name\n" +"to use in all of your new repositories, which will suppress this warning,\n" +"call:\n" "\n" "\tgit config --global init.defaultBranch <name>\n" "\n" @@ -19668,7 +20476,8 @@ msgid "" "\tgit branch -m <name>\n" msgstr "" "Använder â€%s†som namn för den inledande grenen. Detta förvalda grennamn\n" -"kan ändras i framtiden. För att välja vilket namn som ska användas pÃ¥\n" +"kommer ändras till â€main†i Git 3.0. För att välja vilket namn som ska " +"användas pÃ¥\n" "den inledande grenen i alla nya arkiv, och dölja denna varning, kör du:\n" "\n" "\tgit config --global init.defaultBranch <namn>\n" @@ -19679,6 +20488,20 @@ msgstr "" "\tgit branch -m <namn>\n" #, c-format +msgid "" +"Using '%s' as the name for the initial branch since Git 3.0.\n" +"If you expected Git to create 'master', the just-created\n" +"branch can be renamed via this command:\n" +"\n" +"\tgit branch -m master\n" +msgstr "" +"Använder â€%s†som namn för den första grenen sedan Git 3.0.\n" +"Om du förväntade att Git skulle skapa â€master†kan grenen\n" +"som just skapades namnändras med det här kommandot:\n" +"\n" +"\tgit branch -m master\n" + +#, c-format msgid "could not retrieve `%s`" msgstr "kunde inte hämta â€%sâ€" @@ -19763,6 +20586,26 @@ msgstr "kunde ta bort temporär migreringskatalog â€%sâ€" msgid "migrated refs can be found at '%s'" msgstr "migrerade referenser hittas vid â€%sâ€" +msgid "" +"'core.preferSymlinkRefs=true' is nominated for removal.\n" +"hint: The use of symbolic links for symbolic refs is deprecated\n" +"hint: and will be removed in Git 3.0. The configuration that\n" +"hint: tells Git to use them is thus going away. You can unset\n" +"hint: it with:\n" +"hint:\n" +"hint:\tgit config unset core.preferSymlinkRefs\n" +"hint:\n" +"hint: Git will then use the textual symref format instead." +msgstr "" +"'core.preferSymlinkRefs=true' har nominerats för borttagning.\n" +"tips: Användningen av symboliska länkar för symboliska referenser\n" +"tips: avrÃ¥ds frÃ¥n och kommer tas bort i Git 3.0. Konfigurationen\n" +"tips: som säger till Git att använda dem kommer därför försvinna.\n" +"tips: Du kan ta bort den med:tips:\n" +"tips:\tgit config unset core.preferSymlinkRefs\n" +"tips:\n" +"tips: Git kommer dÃ¥ använda textformat för symboliska referenser." + #, c-format msgid "" "cannot lock ref '%s': expected symref with target '%s': but is a regular ref" @@ -19771,6 +20614,10 @@ msgstr "" "men är en vanlig referens" #, c-format +msgid "trying to write reflog for '%s' with incomplete values" +msgstr "försöker skriva referensloggen â€%s†med ofullständiga värden" + +#, c-format msgid "cannot read ref file '%s'" msgstr "kan inte läsa ref-fil â€%sâ€" @@ -19778,9 +20625,6 @@ msgstr "kan inte läsa ref-fil â€%sâ€" msgid "cannot open directory %s" msgstr "kunde inte öppna katalogen %s" -msgid "Checking references consistency" -msgstr "Kontrollerar konsistens för referenser" - #, c-format msgid "unable to open '%s'" msgstr "kan inte öppna â€%sâ€" @@ -19820,6 +20664,10 @@ msgstr "" "flera uppdateringar för â€%s†(inklusive en via symrefen â€%sâ€) tillÃ¥ts inte" #, c-format +msgid "cannot lock ref '%s': dangling symref already exists" +msgstr "kan inte lÃ¥sa referensen â€%sâ€: hängande symbolisk referens finns redan" + +#, c-format msgid "cannot lock ref '%s': reference already exists" msgstr "kan inte lÃ¥sa referensen â€%sâ€: referensen finns redan" @@ -19918,9 +20766,6 @@ msgstr "remote-curl: oväntat svarsavslutningspaketet" msgid "RPC failed; %s" msgstr "RPC misslyckades; %s" -msgid "cannot handle pushes this big" -msgstr "kan inte hantera sÃ¥ stora sändningar" - #, c-format msgid "cannot deflate request; zlib deflate error %d" msgstr "kan inte packa upp anrop; zlib-deflate-fel %d" @@ -20108,6 +20953,11 @@ msgstr "" "till â€%s:refs/tags/%sâ€?" #, c-format +msgid "" +"The <src> part of the refspec ('%s') is an object ID that doesn't exist.\n" +msgstr "<Källa>-delen av ref.spec-en (â€%sâ€) är ett objekt-ID som inte finns.\n" + +#, c-format msgid "%s cannot be resolved to branch" msgstr "%s kan inte slÃ¥s upp till en gren" @@ -20231,6 +21081,58 @@ msgid "cannot strip one component off url '%s'" msgstr "kan inte ta bort en komponent frÃ¥n url:en â€%sâ€" #, c-format +msgid "cannot open index for %s" +msgstr "kunde inte öppna indexet för %s" + +#, c-format +msgid "pack %s too large to consider in geometric progression" +msgstr "paketet %s för stort för att tas med i geometriskt förlopp" + +#, c-format +msgid "pack %s too large to roll up" +msgstr "paketet %s för stort att rulla upp" + +#, c-format +msgid "could not open tempfile %s for writing" +msgstr "kunde inte öppna temporär fil %s för skrivning" + +msgid "could not close refs snapshot tempfile" +msgstr "kunde inte stänga temporär fil för refs-ögonblicksbild" + +#, c-format +msgid "could not remove stale bitmap: %s" +msgstr "kunde inte ta bort gammal bitkarta: %s" + +msgid "could not start pack-objects to repack promisor objects" +msgstr "kunde inte starta pack-objects för att packa om kontraktsobjekt" + +msgid "failed to feed promisor objects to pack-objects" +msgstr "misslyckades sända kontraktsobjekt till pack-objects" + +msgid "repack: Expecting full hex object ID lines only from pack-objects." +msgstr "" +"repack: Förväntar kompletta hex-objekt-id-rader endast frÃ¥n pack-objects." + +msgid "could not finish pack-objects to repack promisor objects" +msgstr "kunde inte avsluta pack-objects för att packa om kontraktsobjekt" + +#, c-format +msgid "pack prefix %s does not begin with objdir %s" +msgstr "paketprefixet %s börjar inte med objkat %s" + +#, c-format +msgid "renaming pack to '%s' failed" +msgstr "misslyckades byta namn pÃ¥ paket till â€%sâ€" + +#, c-format +msgid "pack-objects did not write a '%s' file for pack %s-%s" +msgstr "pack-objects skrev inte en â€%sâ€-fil för paketet %s-%s" + +#, c-format +msgid "could not unlink: %s" +msgstr "kunde inte ta bort: â€%sâ€" + +#, c-format msgid "bad replace ref name: %s" msgstr "felaktig ersättningsreferensnamn: %s" @@ -21535,9 +22437,6 @@ msgstr "inte ett git-arkiv: â€%sâ€" msgid "cannot chdir to '%s'" msgstr "kan inte byta katalog (chdir) till â€%sâ€" -msgid "cannot come back to cwd" -msgstr "kan inte gÃ¥ tillbaka till arbetskatalogen (cwd)" - #, c-format msgid "failed to stat '%*s%s%s'" msgstr "misslyckades ta status pÃ¥ â€%*ss%s%sâ€" @@ -22601,18 +23500,32 @@ msgid "warning: " msgstr "varning: " #, c-format +msgid "'%s' is nominated for removal.\n" +msgstr "â€%s†har nominerats för borttagning.\n" + +#, c-format msgid "" -"'%s' is nominated for removal.\n" -"If you still use this command, please add an extra\n" -"option, '--i-still-use-this', on the command line\n" -"and let us know you still use it by sending an e-mail\n" -"to <git@vger.kernel.org>. Thanks.\n" +"If you still use this command, here's what you can do:\n" +"\n" +"- read https://git-scm.com/docs/BreakingChanges.html\n" +"- check if anyone has discussed this on the mailing\n" +" list and if they came up with something that can\n" +" help you: https://lore.kernel.org/git/?q=%s\n" +"- send an email to <git@vger.kernel.org> to let us\n" +" know that you still use this command and were unable\n" +" to determine a suitable replacement\n" +"\n" msgstr "" -"â€%s†har nominerats för borttagning.\n" -"Om du fortfarande använder kommandot, lägg till flaggan\n" -"â€--i-still-use-this†pÃ¥ kommandoraden och berätta för\n" -"oss att du fortfarande använder det pÃ¥ e-post till\n" -"<git@vger.kernel.org>. Tack.\n" +"Om du fortfarande använder det här kommandot kan du:\n" +"\n" +"- läsa https://git-scm.com/docs/BreakingChanges.html\n" +"- se om nÃ¥gon har diskuterat det här pÃ¥ sändlistan\n" +" och se om de kommit pÃ¥ nÃ¥got som kan hjälpa dig:\n" +" https://lore.kernel.org/git/?q=%s\n" +"- sända en e-post till <git@vger.kernel.org> för att\n" +" berätta för oss att du fortfarande använder kommandot\n" +" för att komma fram till en lämplig ersättning\n" +"\n" msgid "refusing to run without --i-still-use-this" msgstr "vägrar köra utan --i-still-use-this" @@ -23458,6 +24371,9 @@ msgstr "Sända brevet? (y=ja, n=nej, e=redigera, q=avsluta, a=alla): " msgid "Send this email reply required" msgstr "Svar krävs pÃ¥ frÃ¥gan â€Sända brevet?â€" +msgid "The destination IMAP folder is not properly defined." +msgstr "MÃ¥l-IMAP-mappen har inte angivits korrekt." + msgid "The required SMTP server is not properly defined." msgstr "Nödvändig SMTP-server har inte angivits korrekt." @@ -1,6 +1,6 @@ # Turkish translations for Git # Git Türkçe çevirileri -# Copyright (C) 2020-2024 Emir SARI <emir_sari@icloud.com> +# SPDX-FileCopyrightText: 2020-2024, 2025 Emir SARI <emir_sari@icloud.com> # This file is distributed under the same license as the Git package. # Emir SARI <emir_sari@icloud.com>, 2020-2025 # @@ -49,6 +49,7 @@ # pathspec | yol belirteci # # pattern | dizgi # # porcelain | okunabilir # +# promisor | vaatçi # # prune | buda(mak) # # pseudoref | yalancı baÅŸvuru # # pull | çek(mek) # @@ -96,15 +97,16 @@ 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: 2025-08-14 16:38+0300\n" -"PO-Revision-Date: 2025-08-14 16:45+0300\n" +"POT-Creation-Date: 2025-11-15 01:30+0300\n" +"PO-Revision-Date: 2025-11-15 02:00+0300\n" "Last-Translator: Emir SARI <emir_sari@icloud.com>\n" -"Language-Team: Turkish (https://github.com/bitigchi/git-po/)\n" +"Language-Team: Turkish <kde-i18n-doc@kde.org>\n" "Language: tr\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: Lokalize 25.07.70\n" #, c-format msgid "%s cannot be negative" @@ -628,15 +630,16 @@ msgid "Nothing was applied.\n" msgstr "Hiçbir ÅŸey uygulanmadı.\n" msgid "" -"j - leave this hunk undecided, see next undecided hunk\n" -"J - leave this hunk undecided, see next hunk\n" -"k - leave this hunk undecided, see previous undecided hunk\n" -"K - leave this hunk undecided, see previous hunk\n" +"j - go to the next undecided hunk, roll over at the bottom\n" +"J - go to the next hunk, roll over at the bottom\n" +"k - go to the previous undecided hunk, roll over at the top\n" +"K - go to the previous hunk, roll over at the top\n" "g - select a hunk to go to\n" "/ - search for a hunk matching the given regex\n" "s - split the current hunk into smaller hunks\n" "e - manually edit the current hunk\n" -"p - print the current hunk, 'P' to use the pager\n" +"p - print the current hunk\n" +"P - print the current hunk using the pager\n" "? - print help\n" msgstr "" "j - bu parça için sonra karar ver, bir sonraki karar verilmemiÅŸ parçayı gör\n" @@ -647,18 +650,19 @@ msgstr "" "/ - verilen düzenli ifade ile eÅŸleÅŸen bir parça ara\n" "s - geçerli parçayı daha ufak parçalara böl\n" "e - geçerli parçayı elle düzenle\n" -"p - geçerli parçalı yazdır, sayfalayıcı için 'P' kullan\n" +"p - geçerli parçayı yazdır\n" +"P - geçerli sayfayı sayfalayıcı kullanarak yazdır\n" "? - yardımı yazdır\n" #, c-format msgid "Only one letter is expected, got '%s'" msgstr "Yalnızca bir harf bekleniyordu, '%s' alındı" -msgid "No previous hunk" -msgstr "Öncesinde parça yok" +msgid "No other hunk" +msgstr "BaÅŸka parça yok" -msgid "No next hunk" -msgstr "Sonrasında parça yok" +msgid "No other undecided hunk" +msgstr "BaÅŸka karar verilmemiÅŸ parça yok" msgid "No other hunks to goto" msgstr "Gidilecek baÅŸka bir parça yok" @@ -2429,17 +2433,22 @@ msgid "Restrict the missing objects to the current sparse-checkout" msgstr "Eksik nesneleri geçerli aralıklı çıkışa sınırla" msgid "" -"git bisect start [--term-(new|bad)=<term> --term-(old|good)=<term>] [--no-" -"checkout] [--first-parent] [<bad> [<good>...]] [--] [<pathspec>...]" +"git bisect start [--term-(bad|new)=<term-new> --term-(good|old)=<term-old>]\n" +" [--no-checkout] [--first-parent] [<bad> [<good>...]] [--] " +"[<pathspec>...]" msgstr "" -"git bisect start [--term-(new|bad)=<uçbirim> --term-(old|good)=<uçbirim>] " -"[--no-checkout] [--first-parent] [<kötü> [<iyi>...]] [--] [<yol-blrtç>...]" +"git bisect start [--term-(bad|new)=<yeni> --term-(good|old)=<eski>]\n" +" [--no-checkout] [--first-parent] [<kötü> [<iyi>...]] [--]\n" +" [<yol-belirteci>...]" + +msgid "git bisect (bad|new|<term-new>) [<rev>]" +msgstr "git bisect (bad|new|<yeni-terim>) [<revizyon>]" -msgid "git bisect (good|bad) [<rev>...]" -msgstr "git bisect (good|bad) [<rev>...]" +msgid "git bisect (good|old|<term-old>) [<rev>...]" +msgstr "git bisect (good|old|<eski-terim>) [<revizyon>...]" msgid "git bisect skip [(<rev>|<range>)...]" -msgstr "git bisect skip [(<rev>|<erim>)...]" +msgstr "git bisect skip [(<revizyon>|<erim>)...]" msgid "git bisect reset [<commit>]" msgstr "git bisect reset [<iÅŸleme>]" @@ -5417,7 +5426,7 @@ msgid "--fixed-value only applies with 'value-pattern'" msgstr "--fixed-value yalnızca 'deÄŸer-dizgisi' ile uygulanır" msgid "--default= cannot be used with --all or --url=" -msgstr "--default=, --all veya --url= ile kullanılamaz" +msgstr "--default= bayrağı, --all veya --url= ile kullanılamaz" msgid "--url= cannot be used with --all, --regexp or --value" msgstr "--url=; --all, --regexp veya --value ile kullanılamaz" @@ -5629,6 +5638,14 @@ msgid "found %i tags; gave up search at %s\n" msgstr "%i etiket bulundu; arama ÅŸurada bitirildi: %s\n" #, c-format +msgid "cannot search for blob '%s' on an unborn branch" +msgstr "henüz doÄŸmamış bir dalda '%s' ikili nesnesi aranamaz" + +#, c-format +msgid "blob '%s' not reachable from HEAD" +msgstr "'%s' ikili nesnesi, HEAD'den ulaşılabilir deÄŸil" + +#, c-format msgid "describe %s\n" msgstr "ÅŸunu tanımla: %s\n" @@ -5767,6 +5784,9 @@ msgstr "geçersiz seçenek: %s" msgid "%s...%s: no merge base" msgstr "%s...%s: birleÅŸtirme temeli yok" +msgid "cannot come back to cwd" +msgstr "cwd'ye geri dönülemiyor" + msgid "Not a git repository" msgstr "Bir git deposu deÄŸil" @@ -5877,10 +5897,140 @@ msgstr "--extcmd=<komut> için bir <komut> verilmedi" msgid "git fast-export [<rev-list-opts>]" msgstr "git fast-export [<revizyon-listesi-seçenekleri>]" -msgid "Error: Cannot export nested tags unless --mark-tags is specified." +#, c-format +msgid "unknown %s mode: %s" +msgstr "bilinmeyen %s kipi: %s" + +#, c-format +msgid "unknown tag-of-filtered mode: %s" +msgstr "bilinmeyen tag-of-filtered kipi: %s" + +#, c-format +msgid "unknown reencoding mode: %s" +msgstr "bilinmeyen yeniden kodlama kipi: %s" + +#, c-format +msgid "could not read blob %s" +msgstr "%s ikili geniÅŸ nesnesi okunamadı" + +#, c-format +msgid "oid mismatch in blob %s" +msgstr "%s ikili geniÅŸ nesnesinde oid uyuÅŸmazlığı" + +#, c-format +msgid "could not write blob '%s'" +msgstr "\"%s\" ikili geniÅŸ nesnesi yazılamadı" + +#, c-format +msgid "unexpected comparison status '%c' for %s, %s" +msgstr "ÅŸunlar için beklenmedik karşılaÅŸtırma durumu \"%c\": %s, %s" + +msgid "none" +msgstr "yok" + +#, c-format +msgid "could not find author in commit %s" +msgstr "%s iÅŸlemesinde yazar bulunamadı" + +#, c-format +msgid "could not find committer in commit %s" +msgstr "%s iÅŸlemesinde iÅŸlemeci bulunamadı" + +#, c-format +msgid "" +"encountered commit-specific encoding %.*s in commit %s; use --reencode=[yes|" +"no] to handle it" +msgstr "" +"ÅŸu iÅŸlemede, iÅŸlemeye özel %.*s kodlamasına denk gelindi; iÅŸlemek için --" +"reencode[yes|no] kullanın: %s" + +#, c-format +msgid "encountered signed commit %s; use --signed-commits=<mode> to handle it" +msgstr "" +"imzalanmış %s iÅŸlemesine denk gelindi; iÅŸlemek için --signed-commits=<kip> " +"kullanın" + +#, c-format +msgid "exporting %<PRIuMAX> signature(s) for commit %s" +msgstr "ÅŸu iÅŸleme için %<PRIuMAX> imza dışa aktarılıyor: %s" + +#, c-format +msgid "stripping signature(s) from commit %s" +msgstr "%s iÅŸlemesinden imzalar soyuluyor" + +#, c-format +msgid "" +"omitting tag %s,\n" +"since tags of trees (or tags of tags of trees, etc.) are not supported." +msgstr "" +"etiket aÄŸaçları desteklenmediÄŸinden (veya etiketin etiketinin\n" +"aÄŸacı), %s etiketi yok sayılıyor" + +#, c-format +msgid "could not read tag %s" +msgstr "%s etiketi okunamadı" + +#, c-format +msgid "encountered signed tag %s; use --signed-tags=<mode> to handle it" +msgstr "" +"imzalanmış %s etiketinee denk gelindi; iÅŸlemek için --signed-tags=<kip> " +"kullanın" + +#, c-format +msgid "exporting signed tag %s" +msgstr "imzalanmış %s etiketi dışa aktarılıyor" + +#, c-format +msgid "stripping signature from tag %s" +msgstr "%s etiketinden imza soyuluyor" + +#, c-format +msgid "" +"tag %s tags unexported object; use --tag-of-filtered-object=<mode> to handle " +"it" +msgstr "" +"%s etiketi, dışa aktarılmayan nesneyi etiketliyor, iÅŸlemek için --tag-of-" +"filtered-object=<kip> kullanın" + +msgid "cannot export nested tags unless --mark-tags is specified." msgstr "" -"Hata: İç içe geçmiÅŸ etiketler --mark-tags belirtilmediÄŸi sürece dışa " -"aktarılamaz." +"--mark-tags belirtilmediÄŸi sürece iç içe geçmiÅŸ etiketler dışa aktarılamaz" + +#, c-format +msgid "tag %s points nowhere?" +msgstr "%s etiketi hiçbir yere iÅŸaret etmiyor?" + +#, c-format +msgid "%s: unexpected object of type %s, skipping." +msgstr "%s: %s türünden beklenmedik nesne, atlanıyor" + +#, c-format +msgid "tag points to object of unexpected type %s, skipping." +msgstr "etiket, beklenmedik türdeki %s nesnesine iÅŸaret ediyor, atlanıyor" + +#, c-format +msgid "unable to open marks file %s for writing." +msgstr "imler dosyası %s, yazmak için açılamıyor" + +#, c-format +msgid "unable to write marks file %s." +msgstr "imler dosyası %s yazılamıyor" + +#, c-format +msgid "corrupt mark line: %s" +msgstr "hasarlı im satırı: %s" + +#, c-format +msgid "object not found: %s" +msgstr "nesne bulunamadı: %s" + +#, c-format +msgid "not a commit? can't happen: %s" +msgstr "bir iÅŸleme deÄŸil mi? oldurulamıyor: %s" + +#, c-format +msgid "object %s already has a mark" +msgstr "%s nesnesinde halihazırda bir im var" msgid "--anonymize-map token cannot be empty" msgstr "--anonymize-map jetonu boÅŸ olamaz" @@ -5947,27 +6097,453 @@ msgid "label tags with mark ids" msgstr "etiketleri im numaralarıyla adlandır" #, c-format -msgid "Missing from marks for submodule '%s'" -msgstr "'%s' altmodülü için '(on)-dan' imleri eksik" +msgid "can't write crash report %s" +msgstr "çökme raporu %s yazılamıyor" + +#, c-format +msgid "fast-import: dumping crash report to %s\n" +msgstr "fast-import: çökme raporu, %s konumuna dökülüyor\n" + +#, c-format +msgid "mark :%<PRIuMAX> not declared" +msgstr ":%<PRIuMAX> imi beyan edilmemiÅŸ" + +#, c-format +msgid "invalid attempt to create duplicate branch: %s" +msgstr "yinelenmiÅŸ dal oluÅŸturmak için geçersiz deneme: %s" + +#, c-format +msgid "branch name doesn't conform to Git standards: %s" +msgstr "dal adı, Git standartlarına uymuyor: %s" + +msgid "internal consistency error creating the index" +msgstr "indeks oluÅŸturulurken içsel tutarlılık hatası" + +msgid "cannot create keep file" +msgstr "himaye dosyası oluÅŸturulamıyor" + +msgid "failed to write keep file" +msgstr "himaye dosyası yazılamadı" + +msgid "cannot store pack file" +msgstr "paket dosyası depolanamıyor" + +msgid "cannot store index file" +msgstr "indeks dosyası depolanamıyor" + +#, c-format +msgid "failed seeking to start of '%s'" +msgstr "\"%s\" baÅŸlanıcına doÄŸru arama yapılamadı" + +#, c-format +msgid "core Git rejected index %s" +msgstr "çekirdek Git, %s indeksini reddetti" + +msgid "cannot truncate pack to skip duplicate" +msgstr "yinelenmiÅŸleri atlamak üzere paket kısaltılamıyor" + +#, c-format +msgid "EOF in data (%<PRIuMAX> bytes remaining)" +msgstr "veride dosya sonu (%<PRIuMAX> bayt kaldı)" + +#, c-format +msgid "unexpected deflate failure: %d" +msgstr "beklenmedik söndürme hatası: %d" + +#, c-format +msgid "not a tree: %s" +msgstr "bir aÄŸaç deÄŸil: %s" + +#, c-format +msgid "can't load tree %s" +msgstr "%s aÄŸacı yüklenemiyor" + +#, c-format +msgid "corrupt mode in %s" +msgstr "%s içinde hasarlı kip" + +msgid "root cannot be a non-directory" +msgstr "kök, bir dizin dışında olamaz" + +msgid "empty path component found in input" +msgstr "girdide boÅŸ yol bileÅŸeni" + +msgid "non-directories cannot have subtrees" +msgstr "dizin olmayan ögelerin altaÄŸaçları olamaz" + +#, c-format +msgid "dropping %s since it would point to itself (i.e. to %s)" +msgstr "kendine iÅŸaret edeceÄŸinden %s bırakılıyor (yani, %s konumuna)" + +#, c-format +msgid "branch %s is missing commits." +msgstr "%s dalında iÅŸlemeler eksik" + +#, c-format +msgid "not updating %s (new tip %s does not contain %s)" +msgstr "%s güncellenmiyor (yeni %s ucunda %s yok)" + +#, c-format +msgid "unable to create leading directories of %s" +msgstr "%s öncü dizinleri oluÅŸturulamıyor" + +#, c-format +msgid "unable to write marks file %s" +msgstr "imler dosyası %s yazılamıyor" + +#, c-format +msgid "unable to write marks file %s: %s" +msgstr "imler dosyası %s yazılamıyor: %s" + +#, c-format +msgid "unable to write file %s" +msgstr "%s dosyası yazılamıyor" + +#, c-format +msgid "expected 'data n' command, found: %s" +msgstr "\"data n\" komutu bekleniyordu, ÅŸu bulundu: %s" + +#, c-format +msgid "EOF in data (terminator '%s' not found)" +msgstr "veride dosya sonu (\"%s\" sonlandırıcısı bulunamadı)" + +msgid "data is too large to use in this context" +msgstr "veri, bu baÄŸlamda kullanmak için pek büyük" + +#, c-format +msgid "EOF in data (%lu bytes remaining)" +msgstr "veride dosya sonu (%lu bayt kalan)" + +#, c-format +msgid "missing < in ident string: %s" +msgstr "kimlik dizisinde < eksik: %s" + +#, c-format +msgid "missing space before < in ident string: %s" +msgstr "kimlik dizisinde < öncesi boÅŸluk eksik: %s" + +#, c-format +msgid "missing > in ident string: %s" +msgstr "kimlik dizisinde > eksik: %s" + +#, c-format +msgid "missing space after > in ident string: %s" +msgstr "kimlik dizisinde > öncesi boÅŸluk eksik: %s" + +#, c-format +msgid "invalid raw date \"%s\" in ident: %s" +msgstr "kimlikte geçersiz ham tarih \"%s\": %s" + +#, c-format +msgid "invalid rfc2822 date \"%s\" in ident: %s" +msgstr "kimlikte geçersiz rfc2822 tarihi \"%s\": %s" + +#, c-format +msgid "date in ident must be 'now': %s" +msgstr "kimlikteki tarih \"ÅŸimdi\" olmalı: %s" + +#, c-format +msgid "too large fanout (%u)" +msgstr "pek büyük çıkış sayısı (%u)" + +#, c-format +msgid "failed to remove path %s" +msgstr "%s yolu kaldırılamadı" + +#, c-format +msgid "no value after ':' in mark: %s" +msgstr "imde \":\" sonrası deÄŸer yok: %s" + +#, c-format +msgid "garbage after mark: %s" +msgstr "im sonrası çöp veri: %s" + +#, c-format +msgid "missing space after mark: %s" +msgstr "im sonrası boÅŸluk eksik: %s" + +#, c-format +msgid "invalid %s: %s" +msgstr "geçersiz %s: %s" + +#, c-format +msgid "NUL in %s: %s" +msgstr "%s içinde NULL: %s" + +#, c-format +msgid "garbage after %s: %s" +msgstr "%s sonrası çöp veri: %s" + +#, c-format +msgid "missing space after %s: %s" +msgstr "%s sonrası boÅŸluk eksik: %s" + +#, c-format +msgid "corrupt mode: %s" +msgstr "hasarlı kip: %s" + +#, c-format +msgid "invalid dataref: %s" +msgstr "geçersiz veri baÅŸvurusu: %s" + +#, c-format +msgid "missing space after SHA1: %s" +msgstr "SHA1 sonrası boÅŸluk eksik: %s" + +#, c-format +msgid "Git links cannot be specified 'inline': %s" +msgstr "Git baÄŸlantıları \"satır içi\" olarak belirtilemez: %s" + +#, c-format +msgid "not a commit (actually a %s): %s" +msgstr "bir iÅŸleme deÄŸil (aslında bir %s): %s" + +#, c-format +msgid "directories cannot be specified 'inline': %s" +msgstr "dizinler \"satır içi\" olarak belirtilemez: %s" + +#, c-format +msgid "%s not found: %s" +msgstr "%s bulunamadı: %s" + +msgid "tree" +msgstr "aÄŸaç" + +#, c-format +msgid "not a %s (actually a %s): %s" +msgstr "bir %s deÄŸil (aslında bir %s): %s" + +#, c-format +msgid "path %s not in branch" +msgstr "%s yolu dalda deÄŸil" + +msgid "can't add a note on empty branch." +msgstr "boÅŸ dala not eklenemiyor" + +#, c-format +msgid "mark :%<PRIuMAX> not a commit" +msgstr ":%<PRIuMAX> imi bir iÅŸleme deÄŸil" + +#, c-format +msgid "not a valid commit: %s" +msgstr "geçerli bir iÅŸleme deÄŸil: %s" + +#, c-format +msgid "invalid ref name or SHA1 expression: %s" +msgstr "geçersiz baÅŸvuru adı veya SHA1 ifadesi: %s" + +#, c-format +msgid "not a blob (actually a %s): %s" +msgstr "bir ikili geniÅŸ nesne deÄŸil (aslında bir %s): %s" + +#, c-format +msgid "blob not found: %s" +msgstr "ikili geniÅŸ nesne bulunamadı: %s" + +#, c-format +msgid "the commit %s is corrupt" +msgstr "%s iÅŸlemesi hasarlı" + +#, c-format +msgid "can't create a branch from itself: %s" +msgstr "kendinden bir dal oluÅŸturulamıyor: %s" + +#, c-format +msgid "" +"expected gpgsig format: 'gpgsig <hash-algo> <signature-format>', got 'gpgsig " +"%s'" +msgstr "" +"\"gpgsig <saÄŸlama-algoritması> <imza-biçimi>\" gpgsig biçimi bekleniyordu, " +"\"gpgsig %s\" alındı" + +#, c-format +msgid "unknown git hash algorithm in gpgsig: '%s'" +msgstr "gpgsig içinde bilinmeyen saÄŸlama algoritması: \"%s\"" + +#, c-format +msgid "invalid signature format in gpgsig: '%s'" +msgstr "gpgsig içinde bilinmeyen imza biçimi: \"%s\"" + +msgid "'unknown' signature format in gpgsig" +msgstr "gpgsig içinde \"bilinmeyen\" imza biçimi" + +#, c-format +msgid "multiple %s signatures found, ignoring additional signature" +msgstr "birden çok %s imzası bulundu, ek imzalar yok sayılıyor" + +msgid "parse_one_signature() returned unknown hash algo" +msgstr "parse_one_signature(), bilinmeyen bir saÄŸlama algoritması döndürdü" + +msgid "expected committer but didn't get one" +msgstr "iÅŸlemeci bekleniyordu; ancak bir tane bulunamadı" + +msgid "encountered signed commit; use --signed-commits=<mode> to handle it" +msgstr "" +"imzalı iÅŸlemeye denk gelindi; iÅŸlemek için --signed-commits=<kip> kullanın" + +msgid "stripping a commit signature" +msgstr "bir iÅŸleme imzası soyuluyor" + +msgid "importing a commit signature verbatim" +msgstr "bir iÅŸleme imzası olduÄŸu gibi içe aktarılıyor" + +msgid "encountered signed tag; use --signed-tags=<mode> to handle it" +msgstr "" +"imzalanmış etikete denk gelindi; iÅŸlemek için --signed-tags=<kip> kullanın" + +#, c-format +msgid "importing a tag signature verbatim for tag '%s'" +msgstr "\"%s\" etiketi için bir etiket imzası olduÄŸu gibi içe aktarılıyor" + +#, c-format +msgid "stripping a tag signature for tag '%s'" +msgstr "\"%s\" etiketi için bir etiket imzası soyuluyor" + +#, c-format +msgid "expected 'from' command, got '%s'" +msgstr "\"from\" komutu bekleniyordu, \"%s\" alındı" + +msgid "can't tag an empty branch." +msgstr "boÅŸ bir dal etiketlenemiyor" + +#, c-format +msgid "not a valid object: %s" +msgstr "geçerli bir nesne deÄŸil: %s" + +msgid "write to frontend failed" +msgstr "ön uca yazım baÅŸarısız" + +#, c-format +msgid "can't read object %s" +msgstr "%s nesnesi okunamıyor" + +#, c-format +msgid "object %s is a %s but a blob was expected." +msgstr "%s nesnesi bir %s; ancak bir ikili geniÅŸ nesne bekleniyordu" + +#, c-format +msgid "not a mark: %s" +msgstr "bir im deÄŸil: %s" + +#, c-format +msgid "unknown mark: %s" +msgstr "bilinmeyen im: %s" + +#, c-format +msgid "garbage after SHA1: %s" +msgstr "SHA1 sonrası çöp veri: %s" + +#, c-format +msgid "not a tree-ish: %s" +msgstr "bir aÄŸacımsı deÄŸil: %s" + +#, c-format +msgid "can't load object %s" +msgstr "%s nesnesi yüklenemiyor" + +#, c-format +msgid "invalid SHA1 in tag: %s" +msgstr "etikette geçersiz SHA1: %s" + +#, c-format +msgid "invalid SHA1 in commit: %s" +msgstr "iÅŸlemede geçersiz SHA1: %s" + +#, c-format +msgid "missing from marks for submodule '%s'" +msgstr "\"%s\" altmodülü için \"from\" imleri eksik" #, c-format -msgid "Missing to marks for submodule '%s'" -msgstr "'%s' altmodülü için '(o)-na' imleri eksik" +msgid "missing to marks for submodule '%s'" +msgstr "\"%s\" altmodülü için \"to\" imleri eksik" #, c-format -msgid "Expected 'mark' command, got %s" -msgstr "'mark' komutu bekleniyordu, %s alındı" +msgid "missing space after tree-ish: %s" +msgstr "aÄŸacımsı sonrası eksik boÅŸluk: %s" #, c-format -msgid "Expected 'to' command, got %s" -msgstr "'to' komutu bekleniyordu, %s alındı" +msgid "not in a commit: %s" +msgstr "bir iÅŸleme deÄŸil: %s" + +#, c-format +msgid "expected 'mark' command, got %s" +msgstr "\"mark\" komutu bekleniyordu, %s alındı" + +#, c-format +msgid "expected 'to' command, got %s" +msgstr "\"to\" komutu bekleniyordu, %s alındı" + +msgid "only one import-marks command allowed per stream" +msgstr "akış başına yalnızca bir import-marks komutuna izin veriliyor" -msgid "Expected format name:filename for submodule rewrite option" -msgstr "Altmodül yeniden yazım seçeneÄŸi için name:filename biçimi bekleniyordu" +#, c-format +msgid "unknown --date-format argument %s" +msgstr "bilinmeyen --date-format argümanı %s" + +#, c-format +msgid "%s: argument must be a non-negative integer" +msgstr "%s: argüman, negatif olmayan bir tamsayı olmalı" + +#, c-format +msgid "--depth cannot exceed %u" +msgstr "--depth, %u deÄŸerini aÅŸamaz" + +#, c-format +msgid "--cat-blob-fd cannot exceed %d" +msgstr "--cat-blob-fd, %d deÄŸerini aÅŸamaz" + +msgid "expected format name:filename for submodule rewrite option" +msgstr "altmodül yeniden yazım seçeneÄŸi için ad:dosya-adı biçimi bekleniyordu" + +#, c-format +msgid "max-pack-size is now in bytes, assuming --max-pack-size=%lum" +msgstr "max-pack-size artık bayt türünden, --max-pack-size=%lum varsayılıyor" + +msgid "minimum max-pack-size is 1 MiB" +msgstr "olabilecek en küçük max-pack-size 1 MiB'dır" + +#, c-format +msgid "unknown --signed-commits mode '%s'" +msgstr "bilinmeyen --signed-commits kipi \"%s\"" + +#, c-format +msgid "unknown --signed-tags mode '%s'" +msgstr "bilinmeyen --signed-tags kipi \"%s\"" #, c-format msgid "feature '%s' forbidden in input without --allow-unsafe-features" -msgstr "'%s' özelliÄŸi --allow-unsafe-features olmadan girdide yasaklı" +msgstr "\"%s\" özelliÄŸi --allow-unsafe-features olmadan girdide yasaklı" + +#, c-format +msgid "got feature command '%s' after data command" +msgstr "veri komutu sonrası \"%s\" komut özelliÄŸi alındı" + +#, c-format +msgid "this version of fast-import does not support feature %s." +msgstr "fast-import'un bu sürümü ÅŸu özelliÄŸi desteklemiyor: %s" + +#, c-format +msgid "got option command '%s' after data command" +msgstr "veri komutu sonrası \"%s\" komut seçeneÄŸi alındı" + +#, c-format +msgid "this version of fast-import does not support option: %s" +msgstr "fast-import'un bu sürümü ÅŸu seçeneÄŸi desteklemiyor: %s" + +#, c-format +msgid "unknown option %s" +msgstr "bilinmeyen seçenek %s" + +#, c-format +msgid "unknown option --%s" +msgstr "bilinmeyen seçenek --%s" + +#, c-format +msgid "unsupported command: %s" +msgstr "desteklenmeyen komut: %s" + +msgid "stream ends early" +msgstr "akış erken bitiyor" #, c-format msgid "Lockfile created but not reported: %s" @@ -6106,6 +6682,36 @@ msgstr "" "komutunu çalıştırmak, uyarıyı HEAD'e veya baÅŸka bir ÅŸeye uzaktan\n" "deÄŸiÅŸiklik olana dek devre dışı bırakır." +msgid "" +"You're on a case-insensitive filesystem, and the remote you are\n" +"trying to fetch from has references that only differ in casing. It\n" +"is impossible to store such references with the 'files' backend. You\n" +"can either accept this as-is, in which case you won't be able to\n" +"store all remote references on disk. Or you can alternatively\n" +"migrate your repository to use the 'reftable' backend with the\n" +"following command:\n" +"\n" +" git refs migrate --ref-format=reftable\n" +"\n" +"Please keep in mind that not all implementations of Git support this\n" +"new format yet. So if you use tools other than Git to access this\n" +"repository it may not be an option to migrate to reftables.\n" +msgstr "" +"BÃœYÃœK/küçük harf duyarsız bir dosya sistemindesiniz ve getirmeye\n" +"çalıştığınız uzak konumda harf biçiminden dolayı farklar içeren\n" +"baÅŸvurular var. Bu tür baÅŸvuruları 'files' arka ucuyla depolamak\n" +"olanaklı deÄŸildir. Bunu ya olduÄŸu gibi kabul edebilir (bu durumda\n" +"tüm uzak baÅŸvuruları diskte depolayamazsınız) ya da alternatif\n" +"olarak deponuzu aÅŸağıdaki komutla 'reftable' arka ucuna geçirerek\n" +"bunu çözebilirsiniz:\n" +"\n" +"\tgit refs migrate --ref-format=reftable\n" +"\n" +"Lütfen Git'in tüm gerçeklemelerinin bu yeni biçimi henüz\n" +"desteklemediÄŸini not edin. Bu depoya eriÅŸmek için Git'ten farklı bir\n" +"araçlar kullanıyorsanız baÅŸvuru tablolarına göç uygun bir seçenek\n" +"deÄŸildir.\n" + #, c-format msgid "" "some local refs could not be updated; try running\n" @@ -6349,21 +6955,6 @@ msgstr "gerçek hedef dal yerine <ad> kullan" msgid "file to read from" msgstr "okunacak dosya" -msgid "git for-each-ref [<options>] [<pattern>]" -msgstr "git for-each-ref [<seçenekler>] [<dizgi>]" - -msgid "git for-each-ref [--points-at <object>]" -msgstr "git for-each-ref [--points-at <nesne>]" - -msgid "git for-each-ref [--merged [<commit>]] [--no-merged [<commit>]]" -msgstr "git for-each-ref [--merged [<iÅŸleme>]] [--no-merged [<iÅŸleme>]]" - -msgid "git for-each-ref [--contains [<commit>]] [--no-contains [<commit>]]" -msgstr "git for-each-ref [--contains [<iÅŸleme>]] [--no-contains [<iÅŸleme>]]" - -msgid "git for-each-ref [--start-after <marker>]" -msgstr "git for-each-ref [--start-after <imleyici>]" - msgid "quote placeholders suitably for shells" msgstr "yer tutucuları kabuÄŸun anlayabileceÄŸi biçimde tırnak içine al" @@ -6418,6 +7009,9 @@ msgstr "--stdin ile bilinmeyen argümanlar verilmiÅŸ" msgid "cannot use --start-after with patterns" msgstr "dizgilerle --start-after kullanılamıyor" +msgid "git for-each-ref " +msgstr "git for-each-ref " + msgid "git for-each-repo --config=<config> [--] <arguments>" msgstr "git for-each-repo --config=<yapılandırma> [--] <argümanlar>" @@ -6886,6 +7480,9 @@ msgid "" msgstr "" "incremental-repack görevi atlanıyor; çünkü core.multiPackIndex devre dışı" +msgid "failed to perform geometric repack" +msgstr "geometrik yeniden paketleme yapılamadı" + #, c-format msgid "task '%s' failed" msgstr "'%s' görevi baÅŸarısız oldu" @@ -6895,6 +7492,10 @@ msgid "lock file '%s' exists, skipping maintenance" msgstr "kilit dosyası '%s' var, bakım atlanıyor" #, c-format +msgid "unknown maintenance strategy: '%s'" +msgstr "bilinmeyen bakım stratejisi: '%s'" + +#, c-format msgid "'%s' is not a valid task" msgstr "'%s' geçerli bir görev deÄŸil" @@ -7761,6 +8362,29 @@ msgstr "--trailer ile --only-input bir anlam ifade etmiyor" msgid "no input file given for in-place editing" msgstr "yerinde düzenleme için girdi dosyası verilmedi" +msgid "last-modified can only operate on one tree at a time" +msgstr "last-modified yalnızca aynı anda bir aÄŸaç üzerinde iÅŸleyebilir" + +#, c-format +msgid "unknown last-modified argument: %s" +msgstr "bilinmeyen last-modified argümanı: %s" + +msgid "unable to setup last-modified" +msgstr "last-modified ayarları yapılamıyor" + +msgid "" +"git last-modified [--recursive] [--show-trees] [<revision-range>] [[--] " +"<path>...]" +msgstr "" +"git last-modified [--recursive] [--show-trees] [<revizyon-erimi>]\n" +"[[--] <yol>...]" + +msgid "recurse into subtrees" +msgstr "altaÄŸaçlara özyinele" + +msgid "show tree entries when recursing into subtrees" +msgstr "altaÄŸaçlara özyinelerken aÄŸaç girdilerini göster" + msgid "git log [<options>] [<revision-range>] [[--] <path>...]" msgstr "git log [<seçenekler>] [<revizyon-erimi>] [[--] <yol>...]" @@ -7799,6 +8423,22 @@ msgstr "" msgid "-L<range>:<file> cannot be used with pathspec" msgstr "-L<erim>:<dosya>, yol belirteci ile kullanılamıyor" +msgid "" +"\n" +"hint: You can replace 'git whatchanged <opts>' with:\n" +"hint:\tgit log <opts> --raw --no-merges\n" +"hint: Or make an alias:\n" +"hint:\tgit config set --global alias.whatchanged 'log --raw --no-merges'\n" +"\n" +msgstr "" +"\n" +"ipucu: 'git whatchanged <seçenekler>'i ÅŸununla deÄŸiÅŸtirebilirsiniz:\n" +"ipucu:\tgit log <seçenekler> --raw --no-merges\n" +"ipucu: Veya bir arma yapın:\n" +"ipucu:\tgit config set --global alias.whatchanged\n" +" 'log --raw --no-merges'\n" +"\n" + #, c-format msgid "git show %s: bad file" msgstr "git show %s: hatalı dosya" @@ -8233,9 +8873,6 @@ msgstr "git ls-tree [<seçenekler>] <aÄŸacımsı> [<yol>...]" msgid "only show trees" msgstr "yalnızca aÄŸaçları göster" -msgid "recurse into subtrees" -msgstr "altaÄŸaçlara özyinele" - msgid "show trees when recursing" msgstr "özyinelerken aÄŸaçları göster" @@ -8383,10 +9020,6 @@ msgid "Could not write object file" msgstr "nesne dosyası yazılamadı" #, c-format -msgid "unknown option %s" -msgstr "bilinmeyen seçenek %s" - -#, c-format msgid "could not parse object '%s'" msgstr "'%s' nesnesi ayrıştırılamadı" @@ -8554,10 +9187,6 @@ msgstr "zula çalıştırılamadı." msgid "stash failed" msgstr "zulalama baÅŸarısız oldu" -#, c-format -msgid "not a valid object: %s" -msgstr "geçerli bir nesne deÄŸil: %s" - msgid "read-tree failed" msgstr "read-tree baÅŸarısız oldu" @@ -9688,27 +10317,8 @@ msgstr "" "Toplam %<PRIu32> (delta %<PRIu32>), yeniden kullanılan %<PRIu32> (delta " "%<PRIu32>), yeniden kullanılan paket %<PRIu32> (%<PRIuMAX> konumundan)" -msgid "" -"git pack-refs [--all] [--no-prune] [--auto] [--include <pattern>] [--exclude " -"<pattern>]" -msgstr "" -"git pack-refs [--all] [--no-prune] [--auto] [--include <dizgi>] [--exclude " -"<dizgi>]" - -msgid "pack everything" -msgstr "her ÅŸeyi paketle" - -msgid "prune loose refs (default)" -msgstr "gevÅŸek baÅŸvuruları buda (öntanımlı)" - -msgid "auto-pack refs as needed" -msgstr "gerekirse baÅŸvuruları paketle" - -msgid "references to include" -msgstr "içerilecek baÅŸvurular" - -msgid "references to exclude" -msgstr "dışarıda tutulacak baÅŸvurular" +msgid "git pack-refs " +msgstr "git pack-refs " msgid "git patch-id [--stable | --unstable | --verbatim]" msgstr "git patch-id [--stable | --unstable | --verbatim]" @@ -10216,6 +10826,10 @@ msgstr "git range-diff [<seçenekler>] <old-tip>...<new-tip>" msgid "git range-diff [<options>] <base> <old-tip> <new-tip>" msgstr "git range-diff [<seçenekler>] <base> <old-tip> <new-tip>" +#, c-format +msgid "invalid max-memory value: %s" +msgstr "geçersiz en büyük bellek deÄŸeri: %s" + msgid "use simple diff colors" msgstr "yalın diff renklerini kullan" @@ -10225,6 +10839,12 @@ msgstr "notlar" msgid "passed to 'git log'" msgstr "'git log'a aktarıldı" +msgid "size" +msgstr "büyüklük" + +msgid "maximum memory for cost matrix (default 4G)" +msgstr "maliyet matrisi için en büyük bellek (öntanımlı 4 G)" + msgid "only emit output related to the first range" msgstr "yalnızca ilk erimle iliÅŸkili çıktıyı yay" @@ -10781,16 +11401,11 @@ msgstr "git reflog [show] [<günlük-seçenekleri>] [<baÅŸvuru>]" msgid "git reflog list" msgstr "git reflog list" -msgid "" -"git reflog expire [--expire=<time>] [--expire-unreachable=<time>]\n" -" [--rewrite] [--updateref] [--stale-fix]\n" -" [--dry-run | -n] [--verbose] [--all [--single-worktree] | " -"<refs>...]" -msgstr "" -"git reflog expire [--expire=<zaman>] [--expire-unreachable=<zaman>]\n" -" [--rewrite] [--updateref] [--stale-fix]\n" -" [--dry-run | -n] [--verbose] [--all [--single-worktree] | " -"<zaman>...]" +msgid "git reflog exists <ref>" +msgstr "git reflog exists <baÅŸvuru>" + +msgid "git reflog write <ref> <old-oid> <new-oid> <message>" +msgstr "git reflog write <baÅŸvuru> <eski-oid> <yeni-oid> <ileti>" msgid "" "git reflog delete [--rewrite] [--updateref]\n" @@ -10799,12 +11414,20 @@ msgstr "" "git reflog delete [--rewrite] [--updateref]\n" " [--dry-run | -n] [--verbose] <baÅŸvuru>@{<belirteç>}..." -msgid "git reflog exists <ref>" -msgstr "git reflog exists <baÅŸvuru>" - msgid "git reflog drop [--all [--single-worktree] | <refs>...]" msgstr "git reflog drop [--all [--single-worktree] | <baÅŸvurular>...]" +msgid "" +"git reflog expire [--expire=<time>] [--expire-unreachable=<time>]\n" +" [--rewrite] [--updateref] [--stale-fix]\n" +" [--dry-run | -n] [--verbose] [--all [--single-worktree] | " +"<refs>...]" +msgstr "" +"git reflog expire [--expire=<zaman>] [--expire-unreachable=<zaman>]\n" +" [--rewrite] [--updateref] [--stale-fix]\n" +" [--dry-run | -n] [--verbose] [--all [--single-worktree] | " +"<zaman>...]" + #, c-format msgid "invalid timestamp '%s' given to '--%s'" msgstr "geçersiz zaman damgası '%s', '--%s' argümanına verildi" @@ -10873,12 +11496,50 @@ msgstr "yalnızca geçerli çalışma aÄŸacından olan baÅŸvuru günlüklerini b msgid "references specified along with --all" msgstr "--all ile belirtilmiÅŸ baÅŸvurular" +#, c-format +msgid "invalid reference name: %s" +msgstr "geçersiz baÅŸvuru adı: %s" + +#, c-format +msgid "invalid old object ID: '%s'" +msgstr "geçersiz eski nesne kimliÄŸi: %s" + +#, c-format +msgid "old object '%s' does not exist" +msgstr "eski nesne '%s' yok" + +#, c-format +msgid "invalid new object ID: '%s'" +msgstr "geçersiz yeni nesne kimliÄŸi: %s" + +#, c-format +msgid "new object '%s' does not exist" +msgstr "yeni nesne '%s' yok" + +#, c-format +msgid "cannot start transaction: %s" +msgstr "iÅŸlem baÅŸlatılamıyor: %s" + +#, c-format +msgid "cannot queue reflog update: %s" +msgstr "baÅŸvuru günlüğü güncellemesi kuyruklanamadı: %s" + +#, c-format +msgid "cannot commit reflog update: %s" +msgstr "baÅŸvuru günlüğü güncellemesi iÅŸlenemiyor: %s" + msgid "git refs migrate --ref-format=<format> [--no-reflog] [--dry-run]" msgstr "git refs migrate --ref-format=<biçim> [--no-reflog] [--dry-run]" msgid "git refs verify [--strict] [--verbose]" msgstr "git refs verify [--strict] [--verbose]" +msgid "git refs exists <ref>" +msgstr "git refs exists <baÅŸvuru>" + +msgid "git refs optimize " +msgstr "git refs optimize " + msgid "specify the reference format to convert to" msgstr "dönüştürülecek baÅŸvuru biçimini belirt" @@ -10901,6 +11562,18 @@ msgstr "kesin denetlemeyi etkinleÅŸtir" msgid "'git refs verify' takes no arguments" msgstr "'git refs verify' bir argüman almıyor" +msgid "git refs list " +msgstr "git refs list" + +msgid "'git refs exists' requires a reference" +msgstr "'git refs exists' bir baÅŸvuru gerektiriyor" + +msgid "reference does not exist" +msgstr "baÅŸvuru yok" + +msgid "failed to look up reference" +msgstr "baÅŸvuru bakılamadı" + msgid "" "git remote add [-t <branch>] [-m <master>] [-f] [--tags | --no-tags] [--" "mirror=<fetch|push>] <name> <url>" @@ -11060,6 +11733,24 @@ msgstr "" "\t%s:%d\n" "artık var olmayan '%s' uzak konumunu adlandırıyor" +msgid "" +"The remote you are trying to rename has conflicting references in the\n" +"new target refspec. This is most likely caused by you trying to nest\n" +"a remote into itself, e.g. by renaming 'parent' into 'parent/child'\n" +"or by unnesting a remote, e.g. the other way round.\n" +"\n" +"If that is the case, you can address this by first renaming the\n" +"remote to a different name.\n" +msgstr "" +"Yeniden adlandırmaya çalıştığınız uzak konumun yeni hedef baÅŸvuru\n" +"belirtecinde çakışan baÅŸvurular var. Bu, büyük olasılıkla sizin\n" +"bir uzak konumu baÅŸka bir uzak konumun içine geçirmeye çalışmanızdan\n" +"dolayı oldu; örneÄŸin, 'üst öge'yi 'üst öge/alt öge' olarak yeniden\n" +"adlandırmanızdan veya tersini yaparak içeriden çıkarmanızdan.\n" +"\n" +"EÄŸer durum buysa önce uzak konumu baÅŸka bir ÅŸekilde yeniden\n" +"adlandırarak bu sorunu çözebilirsiniz.\n" + #, c-format msgid "No such remote: '%s'" msgstr "Böyle bir uzak konum yok: '%s'" @@ -11068,6 +11759,13 @@ msgstr "Böyle bir uzak konum yok: '%s'" msgid "Could not rename config section '%s' to '%s'" msgstr "'%s' yapılandırma bölümü '%s' olarak yeniden adlandırılamadı" +msgid "Renaming remote references" +msgstr "Uzak konum baÅŸvuruları yeniden adlandırılıyor" + +#, c-format +msgid "queueing remote ref renames failed: %s" +msgstr "uzak baÅŸvuru adlarını kuyruklama baÅŸarısız: %s" + #, c-format msgid "" "Not updating non-default fetch refspec\n" @@ -11078,16 +11776,9 @@ msgstr "" "\t%s\n" "\tLütfen gerekirse yapılandırmayı el ile güncelleyin." -msgid "Renaming remote references" -msgstr "Uzak konum baÅŸvuruları yeniden adlandırılıyor" - #, c-format -msgid "deleting '%s' failed" -msgstr "'%s' silinmesi baÅŸarısız" - -#, c-format -msgid "creating '%s' failed" -msgstr "'%s' oluÅŸturulması baÅŸarısız" +msgid "renaming remote refs failed: %s" +msgstr "uzak baÅŸvurular yeniden adlandırılamadı: %s" msgid "" "Note: A branch outside the refs/remotes/ hierarchy was not removed;\n" @@ -11371,46 +12062,6 @@ msgstr "" "--no-write-bitmap-index kullanın veya pack.writeBitmaps\n" "yapılandırmasını devre dışı bırakın." -msgid "could not start pack-objects to repack promisor objects" -msgstr "vaatçi nesneleri yeniden paketleme için pack-objects baÅŸlatılamadı" - -msgid "failed to feed promisor objects to pack-objects" -msgstr "vaatçi nesneleri pack-objects'e beslenemedi" - -msgid "repack: Expecting full hex object ID lines only from pack-objects." -msgstr "" -"repack: Onaltılı tam nesne no satırları yalnızca pack-objects'ten bekleniyor." - -msgid "could not finish pack-objects to repack promisor objects" -msgstr "vaatçi nesneleri yeniden paketleme için pack-objects bitirilemedi" - -#, c-format -msgid "cannot open index for %s" -msgstr "%s için indeks açılamıyor" - -#, c-format -msgid "pack %s too large to consider in geometric progression" -msgstr "%s paketi, geometrik ilerlemede kullanmayı düşünmek için pek büyük" - -#, c-format -msgid "pack %s too large to roll up" -msgstr "%s paketi, sarmak için pek büyük" - -#, c-format -msgid "could not open tempfile %s for writing" -msgstr "geçici dosya '%s', yazma için açılamadı" - -msgid "could not close refs snapshot tempfile" -msgstr "baÅŸvurular anlık görüntü geçici dosyası kapatılamadı" - -#, c-format -msgid "could not remove stale bitmap: %s" -msgstr "eskimiÅŸ biteÅŸlem kaldırılamadı: %s" - -#, c-format -msgid "pack prefix %s does not begin with objdir %s" -msgstr "paket öneki %s, nesne dizini %s ile baÅŸlamıyor" - msgid "pack everything in a single pack" msgstr "her ÅŸeyi tek bir pakete sığdır" @@ -11507,18 +12158,6 @@ msgstr "'%s' seçeneÄŸi, yalnızca '%s' ile birlikte kullanılabilir" msgid "Nothing new to pack." msgstr "Paketlenecek yeni bir ÅŸey yok." -#, c-format -msgid "renaming pack to '%s' failed" -msgstr "paketi '%s' olarak yeniden adlandırma baÅŸarısız" - -#, c-format -msgid "pack-objects did not write a '%s' file for pack %s-%s" -msgstr "pack-objects, ÅŸu paket için bir '%s' dosyası yazmadı: %s-%s" - -#, c-format -msgid "could not unlink: %s" -msgstr "baÄŸlantı kaldırılamadı: %s" - msgid "git replace [-f] <object> <replacement>" msgstr "git replace [-f] <nesne> <deÄŸiÅŸim>" @@ -11774,6 +12413,62 @@ msgstr "kök iÅŸlemeye kadar yeniden oynatma henüz desteklenmiyor!" msgid "replaying merge commits is not supported yet!" msgstr "birleÅŸtirme iÅŸlemelerini yeniden oynatma henüz desteklenmiyor!" +#, c-format +msgid "key '%s' not found" +msgstr "'%s' anahtarı bulunamadı" + +#, c-format +msgid "invalid format '%s'" +msgstr "geçersiz biçim '%s'" + +msgid "output format" +msgstr "çıktı biçimi" + +msgid "synonym for --format=nul" +msgstr "--format=nul eÅŸanlamlısı" + +msgid "unsupported output format" +msgstr "desteklenmeyen çıktı biçimi" + +msgid "References" +msgstr "BaÅŸvurular" + +msgid "Count" +msgstr "Sayım" + +msgid "Branches" +msgstr "Dallar" + +msgid "Tags" +msgstr "Etiketler" + +msgid "Remotes" +msgstr "Uzak konumlar" + +msgid "Others" +msgstr "DiÄŸerleri" + +msgid "Reachable objects" +msgstr "Ulaşılabilir nesneler" + +msgid "Commits" +msgstr "Ä°ÅŸlemeler" + +msgid "Trees" +msgstr "AÄŸaçlar" + +msgid "Blobs" +msgstr "Ä°kili geniÅŸ nesneler" + +msgid "Repository structure" +msgstr "Depo yapısı" + +msgid "Value" +msgstr "DeÄŸer" + +msgid "Counting references" +msgstr "BaÅŸvurular sayılıyor" + msgid "" "git rerere [clear | forget <pathspec>... | diff | status | remaining | gc]" msgstr "" @@ -12364,12 +13059,6 @@ msgstr "git show-ref --exclude-existing[=<dizgi>]" msgid "git show-ref --exists <ref>" msgstr "git show-ref --exists <baÅŸvuru>" -msgid "reference does not exist" -msgstr "baÅŸvuru yok" - -msgid "failed to look up reference" -msgstr "baÅŸvuru bakılamadı" - msgid "only show tags (can be combined with --branches)" msgstr "yalnızca etiketleri göster (--branches ile birlikte kullanılabilir)" @@ -12399,10 +13088,10 @@ msgstr "stdin'den yerel bir depoda olmayan baÅŸvuruları göster" msgid "" "git sparse-checkout (init | list | set | add | reapply | disable | check-" -"rules) [<options>]" +"rules | clean) [<options>]" msgstr "" -"git sparse-checkout (init | list | set | add | reapply | disable | check-" -"rules) [<seçenekler>]" +"git sparse-checkout (init | list | set | add | reapply | disable\n" +"| check-rules | clean) [<seçenekler>]" msgid "this worktree is not sparse" msgstr "bu çalışma aÄŸacı aralıklı deÄŸil" @@ -12443,10 +13132,6 @@ msgid "toggle the use of a sparse index" msgstr "bir aralıklı indeksin kullanımını aç/kapat" #, c-format -msgid "unable to create leading directories of %s" -msgstr "%s öncü dizinleri oluÅŸturulamıyor" - -#, c-format msgid "failed to open '%s'" msgstr "'%s' açılamadı" @@ -12525,6 +13210,32 @@ msgstr "" "aralıklılık dizgilerinin yeniden uygulanması için bir aralıklı çıkış içinde " "olmalı" +msgid "report each affected file, not just directories" +msgstr "yalnızca dizinler deÄŸil, tüm etkilenen dosyaları raporla" + +msgid "must be in a sparse-checkout to clean directories" +msgstr "dizinleri temizlemek için bir aralıklı çıkış içinde olmalı" + +msgid "must be in a cone-mode sparse-checkout to clean directories" +msgstr "dizinleri temizlemek için koni kipindeki bir aralıklı çıkışta olmalı" + +msgid "for safety, refusing to clean without one of --force or --dry-run" +msgstr "güvenlik için --force veya --dry-run olmadan temizleme reddediliyor" + +msgid "failed to read index" +msgstr "indeks okunamadı" + +msgid "" +"failed to convert index to a sparse index; resolve merge conflicts and try " +"again" +msgstr "" +"indeks bir aralıklı indekse dönüştürülemedi; birleÅŸtirme çakışmalarını çözün " +"ve yeniden deneyin" + +#, c-format +msgid "failed to remove '%s'" +msgstr "'%s' kaldırılamadı" + msgid "error while refreshing working directory" msgstr "çalışma dizini yenilenirken hata" @@ -14207,9 +14918,6 @@ msgstr "bir <önek> altdizini için aÄŸaç nesnesi yaz" msgid "only useful for debugging" msgstr "yalnızca hata ayıklama için yararlı" -msgid "core.fsyncMethod = batch is unsupported on this platform" -msgstr "core.fsyncMethod = batch, bu platformda desteklenmiyor" - #, c-format msgid "could not parse bundle list key %s with value '%s'" msgstr "demet liste anahtarı %s ile '%s' deÄŸeri ayrıştırılamıyor" @@ -14599,6 +15307,9 @@ msgstr "gitweb'deki çalışma deposuna anında göz at" msgid "Add or parse structured information in commit messages" msgstr "Ä°ÅŸleme iletilerine düzenli bilgi ekle veya ayrıştır" +msgid "EXPERIMENTAL: Show when files were last modified" +msgstr "DENEYSEL: Dosyaların en son ne zaman deÄŸiÅŸtirildiÄŸini göster" + msgid "Show commit logs" msgstr "Ä°ÅŸleme günlüklerini göster" @@ -14719,6 +15430,9 @@ msgstr "Nesne deÄŸiÅŸtirmek için baÅŸvuru oluÅŸtur, sil, listele" msgid "EXPERIMENTAL: Replay commits on a new base, works with bare repos too" msgstr "DENEYSEL: Ä°ÅŸlemeleri yeni temelde oynat, çıplak depolarla çalışır" +msgid "Retrieve information about the repository" +msgstr "Depo hakkında bilgi getir" + msgid "Generates a summary of pending changes" msgstr "Bekleyen deÄŸiÅŸikliklerin bir özetini çıkart" @@ -14800,8 +15514,8 @@ msgstr "Dal deÄŸiÅŸtir" msgid "Read, modify and delete symbolic refs" msgstr "Sembolik baÅŸvuruları oku, düzenle ve sil" -msgid "Create, list, delete or verify a tag object signed with GPG" -msgstr "GPG imzalı etiket oluÅŸtur, sil, listele, doÄŸrula" +msgid "Create, list, delete or verify tags" +msgstr "Etiket oluÅŸtur, sil, listele, doÄŸrula" msgid "Creates a temporary file with a blob's contents" msgstr "Ä°kili nesnenin içeriÄŸi ile geçici bir dosya oluÅŸtur" @@ -15644,6 +16358,45 @@ msgstr "'%s' yapılandırma ikili nesnesi çözülemiyor" msgid "unable to parse command-line config" msgstr "komut satırı yapılandırması ayrıştırılamıyor" +#, c-format +msgid "" +"\n" +"To use the default comment string (#) please run\n" +"\n" +"%s" +msgstr "" +"\n" +"Öntanımlı yorum dizisini kullanmak için (#) ÅŸunu çalıştırın:\n" +"\n" +"%s" + +msgid "<comment string>" +msgstr "<yorum-dizisi>" + +#, c-format +msgid "" +"\n" +"To set a custom comment string please run\n" +"\n" +"%s\n" +"where '%s' is the string you wish to use.\n" +msgstr "" +"\n" +"Özel bir yorum dizisi ayarlamak için ÅŸunu çalıştırın\n" +"\n" +"%s\n" +"'%s', kullanmak istediÄŸiniz dizidir.\n" + +#, c-format +msgid "Support for '%s=auto' has been removed in Git 3.0" +msgstr "'%s=auto' için olan destek Git 3.0 sürümünde kaldırılmıştır" + +#, c-format +msgid "Support for '%s=auto' is deprecated and will be removed in Git 3.0" +msgstr "" +"'%s=auto' için olan destek artık kullanılmamaktadır ve Git 3.0 sürümünde " +"kaldırılacaktır" + msgid "unknown error occurred while reading the configuration files" msgstr "yapılandırma dosyaları okunurken beklenmedik bir hata oluÅŸtu" @@ -16122,6 +16875,12 @@ msgstr "'%s' dizini, arÅŸivleyiciye eklenemedi" msgid "failed to write archive" msgstr "arÅŸiv yazılamadı" +msgid "max-depth is not supported for worktree diffs" +msgstr "max-depth, çalışma aÄŸacı diff'lerinde desteklenmiyor" + +msgid "max-depth is not supported for index diffs" +msgstr "max-depth, indeks diff'lerinde desteklenmiyor" + msgid "--merge-base does not work with ranges" msgstr "--merge-base erimlerle çalışmaz" @@ -16627,6 +17386,12 @@ msgstr "[(A|C|D|M|R|T|U|X|B)...[*]]" msgid "select files by diff type" msgstr "dosyaları diff türüne göre seç" +msgid "<depth>" +msgstr "<derinlik>" + +msgid "maximum tree depth to recurse" +msgstr "özyinelenecek en çok aÄŸaç derinliÄŸi" + msgid "<file>" msgstr "<dosya>" @@ -16824,10 +17589,6 @@ msgid "invalid unshallow line: %s" msgstr "geçersiz sığ olmayan satır: %s" #, c-format -msgid "object not found: %s" -msgstr "nesne bulunamadı: %s" - -#, c-format msgid "error in object: %s" msgstr "nesne içinde hata: %s" @@ -17105,6 +17866,10 @@ msgstr "%s için boÅŸ arma" msgid "recursive alias: %s" msgstr "özyineli arma: %s" +#, c-format +msgid "alias loop detected: expansion of '%s' does not terminate:%s" +msgstr "arma döngüsü algılandı: '%s' geniÅŸletilmesi sonlanmıyor:%s" + msgid "write failure on standard output" msgstr "standart çıktı'da yazma hatası" @@ -17115,10 +17880,6 @@ msgid "close failed on standard output" msgstr "standart çıktı'da kapatma baÅŸarısız" #, c-format -msgid "alias loop detected: expansion of '%s' does not terminate:%s" -msgstr "arma döngüsü algılandı: '%s' geniÅŸletilmesi sonlanmıyor:%s" - -#, c-format msgid "cannot handle %s as a builtin" msgstr "%s bir yerleÅŸik olarak ele alınamıyor" @@ -17172,6 +17933,10 @@ msgstr "hatalı/uyumsuz imza '%s'" msgid "failed to get the ssh fingerprint for key '%s'" msgstr "'%s' anahtarı için ssh parmak izi alınamadı" +#, c-format +msgid "failed to get the ssh fingerprint for key %s" +msgstr "%s anahtarı için ssh parmak izi alınamadı" + msgid "" "either user.signingkey or gpg.ssh.defaultKeyCommand needs to be configured" msgstr "" @@ -17179,6 +17944,10 @@ msgstr "" "gerekiyor" #, c-format +msgid "malformed build-time gpg.ssh.defaultKeyCommand: %s" +msgstr "gpg.ssh.defaultKeyCommand için hatalı yapı süresi: %s" + +#, c-format msgid "gpg.ssh.defaultKeyCommand succeeded but returned no keys: %s %s" msgstr "" "gpg.ssh.defaultKeyCommand baÅŸarılı oldu; ancak herhangi bir anahtar " @@ -17434,6 +18203,12 @@ msgstr "" " ÅŸu istendi: %s\n" " yönlenen: %s" +#, c-format +msgid "" +"number too large to represent as curl_off_t on this platform: %<PRIuMAX>" +msgstr "" +"bu platformda curl_off_t olarak temsil etmek için sayı pek büyük: %<PRIuMAX>" + msgid "Author identity unknown\n" msgstr "Yazar kimliÄŸi bilinmiyor\n" @@ -17897,10 +18672,6 @@ msgid "could not load pack" msgstr "paket yüklenemedi" #, c-format -msgid "could not open index for %s" -msgstr "%s için indeks açılamadı" - -#, c-format msgid "unable to link '%s' to '%s'" msgstr "'%s', '%s' ile baÄŸlantılanamıyor" @@ -17923,6 +18694,10 @@ msgid "unknown preferred pack: '%s'" msgstr "bilinmeyen tercih edilen paket: '%s'" #, c-format +msgid "failed to open preferred pack %s" +msgstr "yeÄŸlenen paket %s açılamadı" + +#, c-format msgid "cannot select preferred pack %s with no objects" msgstr "yeÄŸlenen paket %s nesnesiz seçilemiyor" @@ -17946,6 +18721,9 @@ msgstr "geçici MIDX katmanı oluÅŸturulamıyor" msgid "could not write multi-pack bitmap" msgstr "çoklu paket biteÅŸlem yazılamadı" +msgid "too many multi-pack-indexes" +msgstr "pek çok multi-pack-indexes" + msgid "unable to open multi-pack-index chain file" msgstr "multi-pack-index zincir dosyası açılamıyor" @@ -18209,10 +18987,6 @@ msgid "files '%s' and '%s' differ in contents" msgstr "'%s' ve '%s' dosyalarının içeriÄŸi farklı" #, c-format -msgid "unable to write file %s" -msgstr "%s dosyası yazılamıyor" - -#, c-format msgid "unable to write repeatedly vanishing file %s" msgstr "sürekli olarak kaybolan %s dosyası yazılamıyor" @@ -18220,6 +18994,9 @@ msgstr "sürekli olarak kaybolan %s dosyası yazılamıyor" msgid "unable to set permission to '%s'" msgstr "'%s' ögesine izin ayarlanamıyor" +msgid "core.fsyncMethod = batch is unsupported on this platform" +msgstr "core.fsyncMethod = batch, bu platformda desteklenmiyor" + msgid "error when closing loose object file" msgstr "gevÅŸek nesne dosyası kapatılırken hata" @@ -18719,6 +19496,21 @@ msgstr "%s mtimes dosyasında desteklenmeyen saÄŸlama kimliÄŸi %<PRIu32> var" msgid "mtimes file %s is corrupt" msgstr "%s mtimes dosyası hasarlı" +msgid "pack everything" +msgstr "her ÅŸeyi paketle" + +msgid "prune loose refs (default)" +msgstr "gevÅŸek baÅŸvuruları buda (öntanımlı)" + +msgid "auto-pack refs as needed" +msgstr "gerekirse baÅŸvuruları paketle" + +msgid "references to include" +msgstr "içerilecek baÅŸvurular" + +msgid "references to exclude" +msgstr "dışarıda tutulacak baÅŸvurular" + #, c-format msgid "reverse-index file %s is too small" msgstr "reverse-index dosyası %s pek küçük" @@ -19139,6 +19931,10 @@ msgid "could not fetch %s from promisor remote" msgstr "vaatçi uzak konumundan %s getirilemedi" #, c-format +msgid "unsupported field '%s' in '%s' config" +msgstr "ÅŸu yapılandırmada desteklenmeyen '%s' alanı: '%s'" + +#, c-format msgid "no or empty URL advertised for remote '%s'" msgstr "'%s' uzak konumu için olmayan veya boÅŸ URL saÄŸlandı" @@ -19147,12 +19943,16 @@ msgid "known remote named '%s' but with URL '%s' instead of '%s'" msgstr "bilinen uzak konum adı '%s'; ancak URL'si '%s'; '%s' olmalı" #, c-format -msgid "unknown '%s' value for '%s' config option" -msgstr "'%s' yapılandırma seçeneÄŸi için bilinmeyen deÄŸer: '%s'" +msgid "invalid element '%s' from remote info" +msgstr "uzak konum bilgisinden geçersiz '%s' ögesi" #, c-format -msgid "unknown element '%s' from remote info" -msgstr "uzak bilgiden bilinmeyen öge '%s'" +msgid "server advertised a promisor remote without a name or URL: %s" +msgstr "sunucu bir ad veya URL olmadan bir vaatçiyi öne sürdü: %s" + +#, c-format +msgid "unknown '%s' value for '%s' config option" +msgstr "'%s' yapılandırma seçeneÄŸi için bilinmeyen deÄŸer: '%s'" #, c-format msgid "accepted promisor remote '%s' not found" @@ -19250,6 +20050,16 @@ msgid "failed to generate diff" msgstr "diff oluÅŸturulamadı" #, c-format +msgid "" +"range-diff: unable to compute the range-diff, since it exceeds the maximum " +"memory for the cost matrix: %s (%<PRIuMAX> bytes) needed, limited to %s " +"(%<PRIuMAX> bytes)" +msgstr "" +"range-diff: maliyet matrisi için olan en çok belleÄŸi aÅŸtığından range-diff " +"hesaplanamıyor: %s (%<PRIuMAX> bayt) gerekiyor, %s (%<PRIuMAX> bayt) olarak " +"sınırlı" + +#, c-format msgid "could not parse log for '%s'" msgstr "'%s' günlüğü ayrıştırılamadı" @@ -19775,6 +20585,9 @@ msgstr "bir baÅŸvuru günlüğü deÄŸil: %s" msgid "no reflog for '%s'" msgstr "'%s' için baÅŸvuru günlüğü yok" +msgid "Checking references consistency" +msgstr "BaÅŸvuruların tutarlılığı denetleniyor" + #, c-format msgid "%s does not point to a valid object!" msgstr "%s geçerli bir nesneye iÅŸaret etmiyor!" @@ -19790,8 +20603,9 @@ msgstr "%s%s, %s silindikten sonra sarkmaya baÅŸladı\n" #, c-format msgid "" "Using '%s' as the name for the initial branch. This default branch name\n" -"is subject to change. To configure the initial branch name to use in all\n" -"of your new repositories, which will suppress this warning, call:\n" +"will change to \"main\" in Git 3.0. To configure the initial branch name\n" +"to use in all of your new repositories, which will suppress this warning,\n" +"call:\n" "\n" "\tgit config --global init.defaultBranch <name>\n" "\n" @@ -19800,9 +20614,10 @@ msgid "" "\n" "\tgit branch -m <name>\n" msgstr "" -"BaÅŸlangıç dal adı olarak %s kullanılıyor. Bu öntanımlı dal adı\n" -"deÄŸiÅŸtirilebilir. Bu iletiyi kapatmak ve yeni depolarınızda kullanılacak\n" -"baÅŸlangıç dal adını yapılandırmak için ÅŸu komutu kullanın:\n" +"BaÅŸlangıç dal adı olarak '%s' kullanılıyor. Öntanımlı dal\n" +"adı Git 3.0 sürümünde 'main' olarak deÄŸiÅŸtirilecektir. Tüm yeni\n" +"depolarınızda kullanılacak dal adını ayarlamak ve bu iletiyi susturmak\n" +"için ÅŸu komutu kullanın:\n" "\n" "\tgit config --global init.defaultBranch <ad>\n" "\n" @@ -19813,6 +20628,20 @@ msgstr "" "\tgit branch -m <ad>\n" #, c-format +msgid "" +"Using '%s' as the name for the initial branch since Git 3.0.\n" +"If you expected Git to create 'master', the just-created\n" +"branch can be renamed via this command:\n" +"\n" +"\tgit branch -m master\n" +msgstr "" +"Git 3.0 sürümünden itibaren baÅŸlangıç dal adı olarak '%s'\n" +"kullanılıyor. Git'in 'master' kullanmasını bekliyorduysanız yeni\n" +"dal adı ÅŸu komutla deÄŸiÅŸtirilebilir:\n" +"\n" +"\tgit branch -m master\n" + +#, c-format msgid "could not retrieve `%s`" msgstr "'%s' alınamadı" @@ -19899,6 +20728,27 @@ msgstr "geçici göç dizini '%s' kaldırılamadı" msgid "migrated refs can be found at '%s'" msgstr "göç ettirilen baÅŸvurular '%s' konumunda bulunabilir" +msgid "" +"'core.preferSymlinkRefs=true' is nominated for removal.\n" +"hint: The use of symbolic links for symbolic refs is deprecated\n" +"hint: and will be removed in Git 3.0. The configuration that\n" +"hint: tells Git to use them is thus going away. You can unset\n" +"hint: it with:\n" +"hint:\n" +"hint:\tgit config unset core.preferSymlinkRefs\n" +"hint:\n" +"hint: Git will then use the textual symref format instead." +msgstr "" +"'core.preferSymlinkRefs=true', kaldırılma için aday gösterildi.\n" +"ipucu: Sembolik baÅŸvurular için sembolik baÄŸların kullanılması\n" +"ipucu: artık yapılmayacak ve Git 3.0 sürümünde toptan kaldırılacak.\n" +"ipucu: Git'in bunu kullanmasını söyleyen yapılandırma artık olmayacak.\n" +"ipucu: Bunu, aÅŸağıdaki komutu kullanarak kapatabilirsiniz:\n" +"ipucu:\n" +"ipucu:\tgit config unset core.preferSymlinkRefs\n" +"ipucu:\n" +"ipucu: Git o zaman metinsel sembolik baÅŸvuru biçimini kullanır." + #, c-format msgid "" "cannot lock ref '%s': expected symref with target '%s': but is a regular ref" @@ -19907,6 +20757,11 @@ msgstr "" "bekleniyordu; ancak bu normal bir baÅŸvuru" #, c-format +msgid "trying to write reflog for '%s' with incomplete values" +msgstr "" +"\"%s\" için olan baÅŸvuru günlüğüne eksik deÄŸerlerle yazılmaya çalışılıyor" + +#, c-format msgid "cannot read ref file '%s'" msgstr "baÅŸvuru dosyası '%s' yazılamıyor" @@ -19914,9 +20769,6 @@ msgstr "baÅŸvuru dosyası '%s' yazılamıyor" msgid "cannot open directory %s" msgstr "%s dizini açılamıyor" -msgid "Checking references consistency" -msgstr "BaÅŸvuruların tutarlılığı denetleniyor" - #, c-format msgid "unable to open '%s'" msgstr "'%s' açılamıyor" @@ -19957,6 +20809,10 @@ msgstr "" "de içeren) izin verilmiyor" #, c-format +msgid "cannot lock ref '%s': dangling symref already exists" +msgstr "'%s' baÅŸvurusu kilitlenemiyor: Sallanan baÅŸvuru halihazırda var" + +#, c-format msgid "cannot lock ref '%s': reference already exists" msgstr "'%s' baÅŸvurusu kilitlenemiyor: BaÅŸvuru halihazırda var" @@ -20056,9 +20912,6 @@ msgstr "remote-curl: beklenmedik yanıt sonu paketi" msgid "RPC failed; %s" msgstr "RPC baÅŸarısız oldu; %s" -msgid "cannot handle pushes this big" -msgstr "bu kadar büyük itmeler ele alınamıyor" - #, c-format msgid "cannot deflate request; zlib deflate error %d" msgstr "istek söndürülemiyor; 'zlib deflate' hatası %d" @@ -20250,6 +21103,12 @@ msgstr "" "etiketlemek istediniz?" #, c-format +msgid "" +"The <src> part of the refspec ('%s') is an object ID that doesn't exist.\n" +msgstr "" +"BaÅŸvuru belirtecinin <kaynak> kısmı ('%s'), var olmayan bir nesne kimliÄŸi.\n" + +#, c-format msgid "%s cannot be resolved to branch" msgstr "%s dala çözülemiyor" @@ -20373,6 +21232,58 @@ msgid "cannot strip one component off url '%s'" msgstr "'%s' url'sinden bir bileÅŸen çıkarılamıyor" #, c-format +msgid "cannot open index for %s" +msgstr "%s için indeks açılamıyor" + +#, c-format +msgid "pack %s too large to consider in geometric progression" +msgstr "%s paketi, geometrik ilerlemede kullanmayı düşünmek için pek büyük" + +#, c-format +msgid "pack %s too large to roll up" +msgstr "%s paketi, sarmak için pek büyük" + +#, c-format +msgid "could not open tempfile %s for writing" +msgstr "geçici dosya '%s', yazma için açılamadı" + +msgid "could not close refs snapshot tempfile" +msgstr "baÅŸvurular anlık görüntü geçici dosyası kapatılamadı" + +#, c-format +msgid "could not remove stale bitmap: %s" +msgstr "eskimiÅŸ biteÅŸlem kaldırılamadı: %s" + +msgid "could not start pack-objects to repack promisor objects" +msgstr "vaatçi nesneleri yeniden paketleme için pack-objects baÅŸlatılamadı" + +msgid "failed to feed promisor objects to pack-objects" +msgstr "vaatçi nesneleri pack-objects'e beslenemedi" + +msgid "repack: Expecting full hex object ID lines only from pack-objects." +msgstr "" +"repack: Onaltılı tam nesne no satırları yalnızca pack-objects'ten bekleniyor." + +msgid "could not finish pack-objects to repack promisor objects" +msgstr "vaatçi nesneleri yeniden paketleme için pack-objects bitirilemedi" + +#, c-format +msgid "pack prefix %s does not begin with objdir %s" +msgstr "paket öneki %s, nesne dizini %s ile baÅŸlamıyor" + +#, c-format +msgid "renaming pack to '%s' failed" +msgstr "paketi '%s' olarak yeniden adlandırma baÅŸarısız" + +#, c-format +msgid "pack-objects did not write a '%s' file for pack %s-%s" +msgstr "pack-objects, ÅŸu paket için bir '%s' dosyası yazmadı: %s-%s" + +#, c-format +msgid "could not unlink: %s" +msgstr "baÄŸlantı kaldırılamadı: %s" + +#, c-format msgid "bad replace ref name: %s" msgstr "hatalı deÄŸiÅŸtirme baÅŸvurusu adı: %s" @@ -20461,7 +21372,7 @@ msgid "unsupported section for hidden refs: %s" msgstr "gizli baÅŸvurular için desteklenmeyen bölüm: %s" msgid "--exclude-hidden= passed more than once" -msgstr "--exclude-hidden=, birden çok kez geçirildi" +msgstr "--exclude-hidden= bayrağı birden çok kez geçirildi" #, c-format msgid "resolve-undo records `%s` which is missing" @@ -21672,9 +22583,6 @@ msgstr "bir git deposu deÄŸil: '%s'" msgid "cannot chdir to '%s'" msgstr "'%s' konumuna chdir yapılamıyor" -msgid "cannot come back to cwd" -msgstr "cwd'ye geri dönülemiyor" - #, c-format msgid "failed to stat '%*s%s%s'" msgstr "'%*s%s%s' bilgileri alınamadı" @@ -22732,19 +23640,32 @@ msgid "warning: " msgstr "uyarı: " #, c-format +msgid "'%s' is nominated for removal.\n" +msgstr "'%s', kaldırılması için aday gösterildi.\n" + +#, c-format msgid "" -"'%s' is nominated for removal.\n" -"If you still use this command, please add an extra\n" -"option, '--i-still-use-this', on the command line\n" -"and let us know you still use it by sending an e-mail\n" -"to <git@vger.kernel.org>. Thanks.\n" +"If you still use this command, here's what you can do:\n" +"\n" +"- read https://git-scm.com/docs/BreakingChanges.html\n" +"- check if anyone has discussed this on the mailing\n" +" list and if they came up with something that can\n" +" help you: https://lore.kernel.org/git/?q=%s\n" +"- send an email to <git@vger.kernel.org> to let us\n" +" know that you still use this command and were unable\n" +" to determine a suitable replacement\n" +"\n" msgstr "" -"'%s' komutu, kaldırma için aday\n" -"gösterildi. Bu komutu hâlâ kullanıyorsanız lütfen\n" -"komut satırında '--i-still-use-this' ek seçeneÄŸini\n" -"kullanın ve bunu hâlâ kullandığınızı\n" -"<git@vger.kernel.org> adresine bir e-posta atarak\n" -"bize haber verin. SaÄŸ olun.\n" +"Bu komutu hâlâ kullanıyorsanız ÅŸunları yapabilirsiniz:\n" +"\n" +"- https://git-scm.com/docs/BreakingChanges.html sayfasını okuyun\n" +"- posta listesinde herhangi bir kiÅŸinin bunun hakkında konuÅŸup\n" +" konuÅŸmadığına ve size yardımcı olabilecek bir ÅŸey söylenip\n" +" söylenmediÄŸine bakın: https://lore.kernel.org/git/?q=%s\n" +"- <git@vger.kernel.org> adresine bir e-posta göndererek bize\n" +" bu komutu hâlâ kullandığınızı ve yerine uygun bir ikâmeyi\n" +" bulamadığınızı iletin\n" +"\n" msgid "refusing to run without --i-still-use-this" msgstr "--i-still-use-this olmadan çalıştırma reddediliyor" @@ -23593,6 +24514,9 @@ msgstr "" msgid "Send this email reply required" msgstr "Bu e-postayı yanıt gerektirme seçeneÄŸiyle gönder" +msgid "The destination IMAP folder is not properly defined." +msgstr "Hedef IMAP sunucusu klasörü düzgünce tanımlanmamış." + msgid "The required SMTP server is not properly defined." msgstr "Gerekli SMTP sunucusu düzgünce tanımlanmamış." @@ -8,9 +8,9 @@ msgid "" msgstr "" "Project-Id-Version: Git v2.46\n" "Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n" -"POT-Creation-Date: 2025-08-14 15:16-0700\n" -"PO-Revision-Date: 2025-08-14 17:33-0700\n" -"Last-Translator: Kateryna Golovanova <kate@kgthreads.com>\n" +"POT-Creation-Date: 2025-11-13 15:18-0800\n" +"PO-Revision-Date: 2025-11-14 21:08-0800\n" +"Last-Translator: Arkadii Yakovets <ark@cho.red>\n" "Language-Team: Ukrainian <https://github.com/arkid15r/git-uk-l10n/>\n" "Language: uk\n" "MIME-Version: 1.0\n" @@ -18,7 +18,7 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && " "n%10<=4 && (n%100<12 || n%100>14) ? 1 : 2);\n" -"X-Generator: Poedit 3.6\n" +"X-Generator: Poedit 3.8\n" #, c-format msgid "%s cannot be negative" @@ -545,39 +545,39 @@ msgid "Nothing was applied.\n" msgstr "Ðічого не заÑтоÑовано.\n" msgid "" -"j - leave this hunk undecided, see next undecided hunk\n" -"J - leave this hunk undecided, see next hunk\n" -"k - leave this hunk undecided, see previous undecided hunk\n" -"K - leave this hunk undecided, see previous hunk\n" +"j - go to the next undecided hunk, roll over at the bottom\n" +"J - go to the next hunk, roll over at the bottom\n" +"k - go to the previous undecided hunk, roll over at the top\n" +"K - go to the previous hunk, roll over at the top\n" "g - select a hunk to go to\n" "/ - search for a hunk matching the given regex\n" "s - split the current hunk into smaller hunks\n" "e - manually edit the current hunk\n" -"p - print the current hunk, 'P' to use the pager\n" +"p - print the current hunk\n" +"P - print the current hunk using the pager\n" "? - print help\n" msgstr "" -"j - залишити цей шматок невизначеним, перейти до наÑтупного невизначеного " -"шматка\n" -"J - залишити цей шматок невизначеним, перейти до наÑтупного шматка\n" -"k - залишити цей шматок невизначеним, перейти до попереднього невизначеного " -"шматка\n" -"K - залишити цей шматок невизначеним, перейти до попереднього шматка\n" +"j - перейти до наÑтупного невизначеного шматка, перевернути внизу\n" +"J - перейти до наÑтупного шматка, перевернути внизу\n" +"k - перейти до попереднього невизначеного шматка, перевернути вгорі\n" +"K - перейти до попереднього фрагмента, прокрутити вгорі\n" "g - вибрати шматок, до Ñкого ви хочете перейти\n" "/ - шукати шматок, що відповідає заданому регвиру\n" "s - розбити поточний шматок на менші шматки\n" "e - редагувати поточний шматок вручну\n" "p - показати поточний шматок, \"P\" Ð´Ð»Ñ Ð³Ð¾Ñ€Ñ‚Ð°Ð½Ð½Ñ Ñторінок\n" +"P - показати поточний шматок з гортаннÑм Ñторінок\n" "? - показати довідку\n" #, c-format msgid "Only one letter is expected, got '%s'" msgstr "ОчікувавÑÑ Ð»Ð¸ÑˆÐµ один Ñимвол, отримано \"%s\"" -msgid "No previous hunk" -msgstr "Ðемає попереднього шматка" +msgid "No other hunk" +msgstr "Ðемає інших шматків" -msgid "No next hunk" -msgstr "Ðемає наÑтупного шматка" +msgid "No other undecided hunk" +msgstr "ÐÑ–Ñких інших невизначених шматків" msgid "No other hunks to goto" msgstr "Ðемає інших шматків Ð´Ð»Ñ Ð¿ÐµÑ€ÐµÑ…Ð¾Ð´Ñƒ" @@ -2378,15 +2378,20 @@ msgid "Restrict the missing objects to the current sparse-checkout" msgstr "Обмежити відÑутні обʼєкти поточним розрідженим переходом" msgid "" -"git bisect start [--term-(new|bad)=<term> --term-(old|good)=<term>] [--no-" -"checkout] [--first-parent] [<bad> [<good>...]] [--] [<pathspec>...]" +"git bisect start [--term-(bad|new)=<term-new> --term-(good|old)=<term-old>]\n" +" [--no-checkout] [--first-parent] [<bad> [<good>...]] [--] " +"[<pathspec>...]" msgstr "" -"git bisect start [--term-(new,bad)=<термін> --term-(old,good)=<термін>] " -"[--no-checkout] [--first-parent] [<поганий> [<добрий>...]] [--] " -"[<визначник шлÑху>...]" +"git bisect start [--term-(bad|new)=<новий-термін> --term-(good|old)=<Ñтарий-" +"термін>]\n" +" [--no-checkout] [--first-parent] [<поганий> [<добрий>...]] " +"[--] [<визначник шлÑху>...]" + +msgid "git bisect (bad|new|<term-new>) [<rev>]" +msgstr "git bisect (поганий|новий|<новий-термін>) [<ревізіÑ>...]" -msgid "git bisect (good|bad) [<rev>...]" -msgstr "git bisect (добрий|поганий) [<ревізіÑ>...]" +msgid "git bisect (good|old|<term-old>) [<rev>...]" +msgstr "git bisect (добрий|Ñтарий|<Ñтарий-термін>) [<ревізіÑ>...]" msgid "git bisect skip [(<rev>|<range>)...]" msgstr "git bisect skip [(<ревізіÑ>|<діапазон>)...]" @@ -5629,6 +5634,14 @@ msgid "found %i tags; gave up search at %s\n" msgstr "знайдено %i тегів; припинено пошук на %s\n" #, c-format +msgid "cannot search for blob '%s' on an unborn branch" +msgstr "неможливо знайти blob \"%s\" на гілці, Ñка ще не Ñтворена" + +#, c-format +msgid "blob '%s' not reachable from HEAD" +msgstr "blob \"%s\" недоÑÑжний з HEAD" + +#, c-format msgid "describe %s\n" msgstr "опиÑати %s\n" @@ -5771,6 +5784,9 @@ msgstr "неприпуÑтима Ð¾Ð¿Ñ†Ñ–Ñ %s" msgid "%s...%s: no merge base" msgstr "%s...%s: немає бази злиттÑ" +msgid "cannot come back to cwd" +msgstr "неможливо повернутиÑÑ Ð´Ð¾ поточної робочої директорії" + msgid "Not a git repository" msgstr "Ðе Ñ” git Ñховищем" @@ -5880,9 +5896,139 @@ msgstr "не надана <команда> Ð´Ð»Ñ --extcmd=<команда>" msgid "git fast-export [<rev-list-opts>]" msgstr "git fast-export [<rev-list-опції>]" -msgid "Error: Cannot export nested tags unless --mark-tags is specified." +#, c-format +msgid "unknown %s mode: %s" +msgstr "невідомий режим %s: %s" + +#, c-format +msgid "unknown tag-of-filtered mode: %s" +msgstr "невідомий режим Ñ„Ñ–Ð»ÑŒÑ‚Ñ€ÑƒÐ²Ð°Ð½Ð½Ñ Ñ‚ÐµÐ³Ñ–Ð²: %s" + +#, c-format +msgid "unknown reencoding mode: %s" +msgstr "невідомий режим перекодуваннÑ: %s" + +#, c-format +msgid "could not read blob %s" +msgstr "не вдалоÑÑ Ð¿Ñ€Ð¾Ñ‡Ð¸Ñ‚Ð°Ñ‚Ð¸ blob %s" + +#, c-format +msgid "oid mismatch in blob %s" +msgstr "невідповідніÑÑ‚ÑŒ oid у blob %s" + +#, c-format +msgid "could not write blob '%s'" +msgstr "не вдалоÑÑ Ð·Ð°Ð¿Ð¸Ñати blob \"%s\"" + +#, c-format +msgid "unexpected comparison status '%c' for %s, %s" +msgstr "неÑподіваний Ñтан порівнÑÐ½Ð½Ñ \"%c\" Ð´Ð»Ñ %s, %s" + +msgid "none" +msgstr "нічого" + +#, c-format +msgid "could not find author in commit %s" +msgstr "не вдалоÑÑ Ð·Ð½Ð°Ð¹Ñ‚Ð¸ автора в коміті %s" + +#, c-format +msgid "could not find committer in commit %s" +msgstr "не вдалоÑÑ Ð·Ð½Ð°Ð¹Ñ‚Ð¸ комітера в коміті %s" + +#, c-format +msgid "" +"encountered commit-specific encoding %.*s in commit %s; use --reencode=[yes|" +"no] to handle it" +msgstr "" +"виÑвлено Ñпецифічне Ð´Ð»Ñ ÐºÐ¾Ð¼Ñ–Ñ‚Ñƒ ÐºÐ¾Ð´ÑƒÐ²Ð°Ð½Ð½Ñ %.*s у коміті %s; Ð´Ð»Ñ Ð¹Ð¾Ð³Ð¾ обробки " +"викориÑтовуйте --reencode=[yes|no]" + +#, c-format +msgid "encountered signed commit %s; use --signed-commits=<mode> to handle it" +msgstr "" +"виÑвлено підпиÑаний коміт %s; викориÑтовуйте --signed-commits=<режим> Ð´Ð»Ñ " +"його обробки" + +#, c-format +msgid "exporting %<PRIuMAX> signature(s) for commit %s" +msgstr "екÑпорт %<PRIuMAX> підпиÑів Ð´Ð»Ñ ÐºÐ¾Ð¼Ñ–Ñ‚Ñƒ %s" + +#, c-format +msgid "stripping signature(s) from commit %s" +msgstr "Ð²Ð¸Ð´Ð°Ð»ÐµÐ½Ð½Ñ Ð¿Ñ–Ð´Ð¿Ð¸Ñу(-ів) з коміту %s" + +#, c-format +msgid "" +"omitting tag %s,\n" +"since tags of trees (or tags of tags of trees, etc.) are not supported." +msgstr "" +"пропуÑтити тег %s,\n" +"оÑкільки теги дерев (або теги тегів дерев тощо) не підтримуютьÑÑ." + +#, c-format +msgid "could not read tag %s" +msgstr "не вдалоÑÑ Ð¿Ñ€Ð¾Ñ‡Ð¸Ñ‚Ð°Ñ‚Ð¸ тег %s" + +#, c-format +msgid "encountered signed tag %s; use --signed-tags=<mode> to handle it" +msgstr "" +"виÑвлено підпиÑаний тег %s; Ð´Ð»Ñ Ð¹Ð¾Ð³Ð¾ обробки викориÑтовуйте --signed-" +"tags=<режим>" + +#, c-format +msgid "exporting signed tag %s" +msgstr "екÑÐ¿Ð¾Ñ€Ñ‚ÑƒÐ²Ð°Ð½Ð½Ñ Ð¿Ñ–Ð´Ð¿Ð¸Ñаного тегу %s" + +#, c-format +msgid "stripping signature from tag %s" +msgstr "Ð²Ð¸Ð´Ð°Ð»ÐµÐ½Ð½Ñ Ð¿Ñ–Ð´Ð¿Ð¸Ñу з тегу %s" + +#, c-format +msgid "" +"tag %s tags unexported object; use --tag-of-filtered-object=<mode> to handle " +"it" msgstr "" -"Помилка: неможливо екÑпортувати вкладені теги, Ñкщо не вказано --mark-tags." +"тег %s тегує неекÑпортований обʼєкт; Ð´Ð»Ñ Ð¹Ð¾Ð³Ð¾ обробки викориÑтовуйте --tag-" +"of-filtered-object=<режим>" + +msgid "cannot export nested tags unless --mark-tags is specified." +msgstr "не можна екÑпортувати вкладені теги, Ñкщо не вказано --mark-tags." + +#, c-format +msgid "tag %s points nowhere?" +msgstr "тег %s нікуди не вказує?" + +#, c-format +msgid "%s: unexpected object of type %s, skipping." +msgstr "%s: неÑподіваний обʼєкт типу %s, пропущено." + +#, c-format +msgid "tag points to object of unexpected type %s, skipping." +msgstr "тег вказує на обʼєкт неÑподіваного типу %s, пропуÑкаємо." + +#, c-format +msgid "unable to open marks file %s for writing." +msgstr "не вдалоÑÑ Ð²Ñ–Ð´ÐºÑ€Ð¸Ñ‚Ð¸ файл позначок %s Ð´Ð»Ñ Ð·Ð°Ð¿Ð¸Ñу." + +#, c-format +msgid "unable to write marks file %s." +msgstr "не вдалоÑÑ Ð·Ð°Ð¿Ð¸Ñати файл позначок %s." + +#, c-format +msgid "corrupt mark line: %s" +msgstr "пошкоджена Ð»Ñ–Ð½Ñ–Ñ Ð¿Ð¾Ð·Ð½Ð°Ñ‡ÐºÐ¸: %s" + +#, c-format +msgid "object not found: %s" +msgstr "обʼєкт не знайдено: %s" + +#, c-format +msgid "not a commit? can't happen: %s" +msgstr "не коміт? не може бути: %s" + +#, c-format +msgid "object %s already has a mark" +msgstr "обʼєкт %s вже має позначку" msgid "--anonymize-map token cannot be empty" msgstr "--anonymize-map токен не може бути порожнім" @@ -5950,23 +6096,420 @@ msgid "label tags with mark ids" msgstr "позначати теги ідентифікаторами позначок" #, c-format -msgid "Missing from marks for submodule '%s'" -msgstr "ВідÑутні \"від\" позначки Ð´Ð»Ñ Ð¿Ñ–Ð´Ð¼Ð¾Ð´ÑƒÐ»Ñ \"%s\"" +msgid "can't write crash report %s" +msgstr "неможливо напиÑати звіт про збій %s" + +#, c-format +msgid "fast-import: dumping crash report to %s\n" +msgstr "швидкий імпорт: Ð²Ð¸Ð²Ð°Ð½Ñ‚Ð°Ð¶ÐµÐ½Ð½Ñ Ð·Ð²Ñ–Ñ‚Ñƒ про збій у %s\n" + +#, c-format +msgid "mark :%<PRIuMAX> not declared" +msgstr "позначка :%<PRIuMAX> не визначена" + +#, c-format +msgid "invalid attempt to create duplicate branch: %s" +msgstr "невірна Ñпроба Ñтворити копію гілки: %s" + +#, c-format +msgid "branch name doesn't conform to Git standards: %s" +msgstr "назва гілки не відповідає Ñтандартам Git: %s" + +msgid "internal consistency error creating the index" +msgstr "Ð²Ð½ÑƒÑ‚Ñ€Ñ–ÑˆÐ½Ñ Ð¿Ð¾Ð¼Ð¸Ð»ÐºÐ° узгодженоÑÑ‚Ñ– при Ñтворенні індекÑу" + +msgid "cannot create keep file" +msgstr "неможливо Ñтворити keep файл" + +msgid "failed to write keep file" +msgstr "не вдалоÑÑ Ð·Ð°Ð¿Ð¸Ñати keep файл" + +msgid "cannot store pack file" +msgstr "неможливо зберегти файл пакунка" + +msgid "cannot store index file" +msgstr "неможливо зберегти індекÑний файл" + +#, c-format +msgid "failed seeking to start of '%s'" +msgstr "не вдалоÑÑ Ð·Ð°Ð¿ÑƒÑтити \"%s\"" + +#, c-format +msgid "core Git rejected index %s" +msgstr "Ñдро Git відхилило Ñ–Ð½Ð´ÐµÐºÑ %s" + +msgid "cannot truncate pack to skip duplicate" +msgstr "не можна Ñкоротити пакет, щоб пропуÑтити дублікати" + +#, c-format +msgid "EOF in data (%<PRIuMAX> bytes remaining)" +msgstr "EOF у даних (залишилоÑÑ %<PRIuMAX> байт)" + +#, c-format +msgid "unexpected deflate failure: %d" +msgstr "неÑподівана помилка запакуванні: %d" + +#, c-format +msgid "not a tree: %s" +msgstr "не дерево: %s" + +#, c-format +msgid "can't load tree %s" +msgstr "неможливо завантажити дерево %s" + +#, c-format +msgid "corrupt mode in %s" +msgstr "пошкоджений режим у %s" + +msgid "root cannot be a non-directory" +msgstr "корінь не може бути не директорією" + +msgid "empty path component found in input" +msgstr "у вхідних даних виÑвлено порожній компонент шлÑху" + +msgid "non-directories cannot have subtrees" +msgstr "не директорії не можуть мати піддерева" + +#, c-format +msgid "dropping %s since it would point to itself (i.e. to %s)" +msgstr "Ð²Ð¸Ð»ÑƒÑ‡ÐµÐ½Ð½Ñ %s, оÑкільки воно вказувало б на Ñебе (тобто на %s)" + +#, c-format +msgid "branch %s is missing commits." +msgstr "у гілці %s не виÑтачає комітів." + +#, c-format +msgid "not updating %s (new tip %s does not contain %s)" +msgstr "не оновлюєтьÑÑ %s (нова верхівка %s не міÑтить %s)" + +#, c-format +msgid "unable to create leading directories of %s" +msgstr "не вдалоÑÑ Ñтворити провідні директорії %s" + +#, c-format +msgid "unable to write marks file %s" +msgstr "неможливо запиÑати файл позначок %s" + +#, c-format +msgid "unable to write marks file %s: %s" +msgstr "неможливо запиÑати файл позначок %s: %s" + +#, c-format +msgid "unable to write file %s" +msgstr "не вдалоÑÑ Ð·Ð°Ð¿Ð¸Ñати файл %s" + +#, c-format +msgid "expected 'data n' command, found: %s" +msgstr "очікувалаÑÑŒ команда \"data n\", знайдено: %s" + +#, c-format +msgid "EOF in data (terminator '%s' not found)" +msgstr "EOF в даних (завершувач \"%s\" не знайдено)" + +msgid "data is too large to use in this context" +msgstr "дані занадто великі Ð´Ð»Ñ Ð²Ð¸ÐºÐ¾Ñ€Ð¸ÑÑ‚Ð°Ð½Ð½Ñ Ð² цьому контекÑÑ‚Ñ–" + +#, c-format +msgid "EOF in data (%lu bytes remaining)" +msgstr "EOF в даних (залишилоÑÑ %lu байтів)" + +#, c-format +msgid "missing < in ident string: %s" +msgstr "відÑутній < у Ñ€Ñдку ідентифікатора: %s" + +#, c-format +msgid "missing space before < in ident string: %s" +msgstr "відÑутній пробіл перед < у Ñ€Ñдку ідентифікатора: %s" + +#, c-format +msgid "missing > in ident string: %s" +msgstr "відÑутній > у Ñ€Ñдку ідентифікатора: %s" + +#, c-format +msgid "missing space after > in ident string: %s" +msgstr "відÑутній пробіл піÑÐ»Ñ > у Ñ€Ñдку ідентифікатора: %s" + +#, c-format +msgid "invalid raw date \"%s\" in ident: %s" +msgstr "невірна необроблена дата \"%s\" в ідентифікаторі: %s" + +#, c-format +msgid "invalid rfc2822 date \"%s\" in ident: %s" +msgstr "невірна rfc2822 дата \"%s\" в ідентифікаторі: %s" + +#, c-format +msgid "date in ident must be 'now': %s" +msgstr "дата в ідентифікаторі повинна бути \"now\": %s" + +#, c-format +msgid "too large fanout (%u)" +msgstr "занадто великий fanout (%u)" + +#, c-format +msgid "failed to remove path %s" +msgstr "не вдалоÑÑ Ð²Ð¸Ð´Ð°Ð»Ð¸Ñ‚Ð¸ шлÑÑ… %s" + +#, c-format +msgid "no value after ':' in mark: %s" +msgstr "немає Ð·Ð½Ð°Ñ‡ÐµÐ½Ð½Ñ Ð¿Ñ–ÑÐ»Ñ \":\" у позначці: %s" + +#, c-format +msgid "garbage after mark: %s" +msgstr "непотріб піÑÐ»Ñ Ð¿Ð¾Ð·Ð½Ð°Ñ‡ÐºÐ¸: %s" + +#, c-format +msgid "missing space after mark: %s" +msgstr "відÑутній пробіл піÑÐ»Ñ Ð¿Ð¾Ð·Ð½Ð°Ñ‡ÐºÐ¸: %s" + +#, c-format +msgid "invalid %s: %s" +msgstr "невірний %s: %s" + +#, c-format +msgid "NUL in %s: %s" +msgstr "NUL в %s: %s" + +#, c-format +msgid "garbage after %s: %s" +msgstr "ÑÐ¼Ñ–Ñ‚Ñ‚Ñ Ð¿Ñ–ÑÐ»Ñ %s: %s" + +#, c-format +msgid "missing space after %s: %s" +msgstr "відÑутній пробіл піÑÐ»Ñ %s: %s" #, c-format -msgid "Missing to marks for submodule '%s'" -msgstr "ВідÑутні \"до\" позначки Ð´Ð»Ñ Ð¿Ñ–Ð´Ð¼Ð¾Ð´ÑƒÐ»Ñ \"%s\"" +msgid "corrupt mode: %s" +msgstr "пошкоджений режим: %s" #, c-format -msgid "Expected 'mark' command, got %s" -msgstr "ОчікувалаÑÑŒ команда \"mark\", отримано %s" +msgid "invalid dataref: %s" +msgstr "невірний dataref: %s" #, c-format -msgid "Expected 'to' command, got %s" -msgstr "ОчікувалаÑÑŒ команда \"to\", отримано %s" +msgid "missing space after SHA1: %s" +msgstr "відÑутній пробіл піÑÐ»Ñ SHA1: %s" -msgid "Expected format name:filename for submodule rewrite option" -msgstr "Очікуваний формат назва:назва файлу Ð´Ð»Ñ Ð¿Ð°Ñ€Ð°Ð¼ÐµÑ‚Ñ€Ð° перезапиÑу підмодулÑ" +#, c-format +msgid "Git links cannot be specified 'inline': %s" +msgstr "Git поÑÐ¸Ð»Ð°Ð½Ð½Ñ Ð½Ðµ можна вказувати \"inline\": %s" + +#, c-format +msgid "not a commit (actually a %s): %s" +msgstr "не коміт (наÑправді %s): %s" + +#, c-format +msgid "directories cannot be specified 'inline': %s" +msgstr "директорії не можуть бути вказані \"вбудованими\": %s" + +#, c-format +msgid "%s not found: %s" +msgstr "%s не знайдено: %s" + +msgid "tree" +msgstr "дерево" + +#, c-format +msgid "not a %s (actually a %s): %s" +msgstr "не %s (наÑправді %s): %s" + +#, c-format +msgid "path %s not in branch" +msgstr "шлÑÑ… %s не знаходитьÑÑ Ñƒ гілці" + +msgid "can't add a note on empty branch." +msgstr "не можна додати нотатку до порожньої гілки." + +#, c-format +msgid "mark :%<PRIuMAX> not a commit" +msgstr "позначка :%<PRIuMAX> не Ñ” комітом" + +#, c-format +msgid "not a valid commit: %s" +msgstr "недійÑний коміт: %s" + +#, c-format +msgid "invalid ref name or SHA1 expression: %s" +msgstr "невірна назва поÑÐ¸Ð»Ð°Ð½Ð½Ñ Ð°Ð±Ð¾ вираз SHA1: %s" + +#, c-format +msgid "not a blob (actually a %s): %s" +msgstr "не blog (наÑправді %s): %s" + +#, c-format +msgid "blob not found: %s" +msgstr "не знайдено blob: %s" + +#, c-format +msgid "the commit %s is corrupt" +msgstr "коміт %s пошкоджений" + +#, c-format +msgid "can't create a branch from itself: %s" +msgstr "неможливо Ñтворити гілку з Ñамої Ñебе: %s" + +#, c-format +msgid "" +"expected gpgsig format: 'gpgsig <hash-algo> <signature-format>', got 'gpgsig " +"%s'" +msgstr "" +"очікувавÑÑ Ñ„Ð¾Ñ€Ð¼Ð°Ñ‚ gpgsig: \"gpgsig <алгоритм-хешуваннÑ> <формат-підпиÑу>\", " +"отримано \"gpgsig %s\"" + +#, c-format +msgid "unknown git hash algorithm in gpgsig: '%s'" +msgstr "невідомий алгоритм Ñ…ÐµÑˆÑƒÐ²Ð°Ð½Ð½Ñ git у gpgsig: \"%s\"" + +#, c-format +msgid "invalid signature format in gpgsig: '%s'" +msgstr "невірний формат підпиÑу в gpgsig: \"%s\"" + +msgid "'unknown' signature format in gpgsig" +msgstr "\"unknown\" формат підпиÑу в gpgsig" + +#, c-format +msgid "multiple %s signatures found, ignoring additional signature" +msgstr "знайдено кілька підпиÑів %s, Ñ–Ð³Ð½Ð¾Ñ€ÑƒÐ²Ð°Ð½Ð½Ñ Ð´Ð¾Ð´Ð°Ñ‚ÐºÐ¾Ð²Ð¾Ð³Ð¾ підпиÑу" + +msgid "parse_one_signature() returned unknown hash algo" +msgstr "parse_one_signature() повернув невідомий алгоритм хешуваннÑ" + +msgid "expected committer but didn't get one" +msgstr "очікувавÑÑ ÐºÐ¾Ð¼Ð¼Ñ–Ñ‚Ñ‚ÐµÑ€, але його не отримали" + +msgid "encountered signed commit; use --signed-commits=<mode> to handle it" +msgstr "" +"виÑвлено підпиÑаний коміт; викориÑтовуйте --signed-commits=<режим> Ð´Ð»Ñ Ð¹Ð¾Ð³Ð¾ " +"обробки" + +msgid "stripping a commit signature" +msgstr "Ð²Ð¸Ð´Ð°Ð»ÐµÐ½Ð½Ñ Ð¿Ñ–Ð´Ð¿Ð¸Ñу коміту" + +msgid "importing a commit signature verbatim" +msgstr "Ñ–Ð¼Ð¿Ð¾Ñ€Ñ‚ÑƒÐ²Ð°Ð½Ð½Ñ Ð¿Ñ–Ð´Ð¿Ð¸Ñу комміту доÑлівно" + +msgid "encountered signed tag; use --signed-tags=<mode> to handle it" +msgstr "" +"зуÑтрів підпиÑаний тег; викориÑтовуйте --signed-tags=<режим> Ð´Ð»Ñ Ð¹Ð¾Ð³Ð¾ обробки" + +#, c-format +msgid "importing a tag signature verbatim for tag '%s'" +msgstr "Ñ–Ð¼Ð¿Ð¾Ñ€Ñ‚ÑƒÐ²Ð°Ð½Ð½Ñ Ð´Ð¾Ñлівного підпиÑу Ð´Ð»Ñ Ñ‚ÐµÐ³Ñƒ \"%s\"" + +#, c-format +msgid "stripping a tag signature for tag '%s'" +msgstr "Ð²Ð¸Ð´Ð°Ð»ÐµÐ½Ð½Ñ Ð¿Ñ–Ð´Ð¿Ð¸Ñу Ð´Ð»Ñ Ñ‚ÐµÐ³Ñƒ \"%s\"" + +#, c-format +msgid "expected 'from' command, got '%s'" +msgstr "очікувалаÑÑŒ команда \"from\", отримано \"%s\"" + +msgid "can't tag an empty branch." +msgstr "неможливо позначити порожню гілку." + +#, c-format +msgid "not a valid object: %s" +msgstr "не Ñ” припуÑтимим обʼєктом: %s" + +msgid "write to frontend failed" +msgstr "не вдалоÑÑ Ð·Ð°Ð¿Ð¸Ñати в інтерфейÑ" + +#, c-format +msgid "can't read object %s" +msgstr "неможливо прочитати обʼєкт %s" + +#, c-format +msgid "object %s is a %s but a blob was expected." +msgstr "обʼєкт %s Ñ” %s, але очікувавÑÑ blob." + +#, c-format +msgid "not a mark: %s" +msgstr "не позначка: %s" + +#, c-format +msgid "unknown mark: %s" +msgstr "невідома позначка: %s" + +#, c-format +msgid "garbage after SHA1: %s" +msgstr "непотріб піÑÐ»Ñ SHA1: %s" + +#, c-format +msgid "not a tree-ish: %s" +msgstr "не деревоподібний: %s" + +#, c-format +msgid "can't load object %s" +msgstr "неможливо завантажити обʼєкт %s" + +#, c-format +msgid "invalid SHA1 in tag: %s" +msgstr "недійÑний SHA1 у тезі: %s" + +#, c-format +msgid "invalid SHA1 in commit: %s" +msgstr "невірний SHA1 у коміті: %s" + +#, c-format +msgid "missing from marks for submodule '%s'" +msgstr "відÑутні \"від\" позначки Ð´Ð»Ñ Ð¿Ñ–Ð´Ð¼Ð¾Ð´ÑƒÐ»Ñ \"%s\"" + +#, c-format +msgid "missing to marks for submodule '%s'" +msgstr "відÑутні \"до\" позначки Ð´Ð»Ñ Ð¿Ñ–Ð´Ð¼Ð¾Ð´ÑƒÐ»Ñ \"%s\"" + +#, c-format +msgid "missing space after tree-ish: %s" +msgstr "відÑутній пробіл піÑÐ»Ñ Ð´ÐµÑ€ÐµÐ²Ð¾Ð¿Ð¾Ð´Ñ–Ð±Ð½Ð¾Ð³Ð¾: %s" + +#, c-format +msgid "not in a commit: %s" +msgstr "не в коміті: %s" + +#, c-format +msgid "expected 'mark' command, got %s" +msgstr "очікувалаÑÑŒ команда \"mark\", отримано %s" + +#, c-format +msgid "expected 'to' command, got %s" +msgstr "очікувалаÑÑŒ команда \"to\", отримано %s" + +msgid "only one import-marks command allowed per stream" +msgstr "дозволено лише одну команду import-marks на потік" + +#, c-format +msgid "unknown --date-format argument %s" +msgstr "невідомий --date-format аргумент %s" + +#, c-format +msgid "%s: argument must be a non-negative integer" +msgstr "%s: аргумент повинен бути невідʼємним цілим чиÑлом" + +#, c-format +msgid "--depth cannot exceed %u" +msgstr "--depth не може перевищувати %u" + +#, c-format +msgid "--cat-blob-fd cannot exceed %d" +msgstr "--cat-blob-fd не може перевищувати %d" + +msgid "expected format name:filename for submodule rewrite option" +msgstr "очікуваний формат назва:назва_файлу Ð´Ð»Ñ Ð¾Ð¿Ñ†Ñ–Ñ— перезапиÑу підмодулÑ" + +#, c-format +msgid "max-pack-size is now in bytes, assuming --max-pack-size=%lum" +msgstr "" +"max-pack-size тепер вимірюєтьÑÑ Ð² байтах, припуÑкаючи --max-pack-size=%lum" + +msgid "minimum max-pack-size is 1 MiB" +msgstr "мінімальний розмір пакунка 1 МіБ" + +#, c-format +msgid "unknown --signed-commits mode '%s'" +msgstr "невідомий --signed-commits режим \"%s\"" + +#, c-format +msgid "unknown --signed-tags mode '%s'" +msgstr "невідомий --signed-tags режим \"%s\"" #, c-format msgid "feature '%s' forbidden in input without --allow-unsafe-features" @@ -5974,6 +6517,37 @@ msgstr "" "оÑобливіÑÑ‚ÑŒ \"%s\" не можна викориÑтовувати без --allow-unsafe-features" #, c-format +msgid "got feature command '%s' after data command" +msgstr "отримано команду функції \"%s\" піÑÐ»Ñ ÐºÐ¾Ð¼Ð°Ð½Ð´Ð¸ даних" + +#, c-format +msgid "this version of fast-import does not support feature %s." +msgstr "Ñ†Ñ Ð²ÐµÑ€ÑÑ–Ñ fast-import не підтримує функцію %s." + +#, c-format +msgid "got option command '%s' after data command" +msgstr "отримано команду опції \"%s\" піÑÐ»Ñ ÐºÐ¾Ð¼Ð°Ð½Ð´Ð¸ даних" + +#, c-format +msgid "this version of fast-import does not support option: %s" +msgstr "Ñ†Ñ Ð²ÐµÑ€ÑÑ–Ñ fast-import не підтримує опцію: %s" + +#, c-format +msgid "unknown option %s" +msgstr "невідома Ð¾Ð¿Ñ†Ñ–Ñ %s" + +#, c-format +msgid "unknown option --%s" +msgstr "невідома Ð¾Ð¿Ñ†Ñ–Ñ --%s" + +#, c-format +msgid "unsupported command: %s" +msgstr "непідтримувана команда: %s" + +msgid "stream ends early" +msgstr "потік закінчуєтьÑÑ Ñ€Ð°Ð½Ñ–ÑˆÐµ" + +#, c-format msgid "Lockfile created but not reported: %s" msgstr "Файл Ð±Ð»Ð¾ÐºÑƒÐ²Ð°Ð½Ð½Ñ Ñтворено, але не звітовано: %s" @@ -6111,6 +6685,38 @@ msgstr "" "\"git config set remote.%s.followRemoteHEAD warn-if-not-branch-%s\"\n" "вимкне попередженнÑ, доки віддалене Ð¿Ñ€Ð¸Ð·Ð½Ð°Ñ‡ÐµÐ½Ð½Ñ Ð½Ðµ змінить HEAD на щоÑÑŒ інше." +msgid "" +"You're on a case-insensitive filesystem, and the remote you are\n" +"trying to fetch from has references that only differ in casing. It\n" +"is impossible to store such references with the 'files' backend. You\n" +"can either accept this as-is, in which case you won't be able to\n" +"store all remote references on disk. Or you can alternatively\n" +"migrate your repository to use the 'reftable' backend with the\n" +"following command:\n" +"\n" +" git refs migrate --ref-format=reftable\n" +"\n" +"Please keep in mind that not all implementations of Git support this\n" +"new format yet. So if you use tools other than Git to access this\n" +"repository it may not be an option to migrate to reftables.\n" +msgstr "" +"Ви викориÑтовуєте файлову ÑиÑтему, Ñка не розрізнÑÑ” регіÑÑ‚Ñ€, а віддалений " +"реÑурÑ, з Ñкого ви\n" +"намагаєтеÑÑ Ð·Ð°Ð²Ð°Ð½Ñ‚Ð°Ð¶Ð¸Ñ‚Ð¸ дані, міÑтить поÑиланнÑ, що відрізнÑÑŽÑ‚ÑŒÑÑ Ð»Ð¸ÑˆÐµ " +"регіÑтром.\n" +"Зберегти такі поÑÐ¸Ð»Ð°Ð½Ð½Ñ Ð·Ð° допомогою бекенду \"files\" неможливо. Ви\n" +"можете або прийнÑти це Ñк Ñ”, але в такому випадку ви не зможете\n" +"зберегти вÑÑ– віддалені поÑÐ¸Ð»Ð°Ð½Ð½Ñ Ð½Ð° диÑку. Ðбо ви можете\n" +"змінити бекенд вашого Ñховища на \"reftable\" за допомогою\n" +"наÑтупної команди:\n" +"\n" +" git refs migrate --ref-format=reftable\n" +"\n" +"Зверніть увагу, що не вÑÑ– реалізації Git ще підтримують цей\n" +"новий формат. Тому, Ñкщо ви викориÑтовуєте інші інÑтрументи, крім Git, Ð´Ð»Ñ " +"доÑтупу до цього\n" +"Ñховища, перехід на reftables може бути неможливим.\n" + #, c-format msgid "" "some local refs could not be updated; try running\n" @@ -6358,21 +6964,6 @@ msgstr "викориÑтовувати <назва> заміÑÑ‚ÑŒ реальнРmsgid "file to read from" msgstr "файл, з Ñкого читати" -msgid "git for-each-ref [<options>] [<pattern>]" -msgstr "git for-each-ref [<опції>] [<шаблон>]" - -msgid "git for-each-ref [--points-at <object>]" -msgstr "git for-each-ref [--points-at <обʼєкт>]" - -msgid "git for-each-ref [--merged [<commit>]] [--no-merged [<commit>]]" -msgstr "git for-each-ref [--merged [<коміт>]] [--no-merged [<коміт>]]" - -msgid "git for-each-ref [--contains [<commit>]] [--no-contains [<commit>]]" -msgstr "git for-each-ref [--contains [<коміт>]] [--no-contains [<коміт>]]" - -msgid "git for-each-ref [--start-after <marker>]" -msgstr "git for-each-ref [--start-after <маркер>]" - msgid "quote placeholders suitably for shells" msgstr "заповнювачі лапок Ð´Ð»Ñ shell" @@ -6428,6 +7019,9 @@ msgstr "невідомі аргументи надані через --stdin" msgid "cannot use --start-after with patterns" msgstr "неможливо викориÑтовувати --start-after із шаблонами" +msgid "git for-each-ref " +msgstr "git for-each-ref " + msgid "git for-each-repo --config=<config> [--] <arguments>" msgstr "git for-each-repo --config=<конфіг> [--] <аргументи>" @@ -6904,6 +7498,9 @@ msgid "" msgstr "" "пропуÑк incremental-repack завданнÑ, оÑкільки core.multiPackIndex вимкнено" +msgid "failed to perform geometric repack" +msgstr "не вдалоÑÑ Ð²Ð¸ÐºÐ¾Ð½Ð°Ñ‚Ð¸ геометричне перепакуваннÑ" + #, c-format msgid "task '%s' failed" msgstr "Ð·Ð°Ð²Ð´Ð°Ð½Ð½Ñ \"%s\" завершилоÑÑ Ð½ÐµÐ²Ð´Ð°Ð»Ð¾" @@ -6913,6 +7510,10 @@ msgid "lock file '%s' exists, skipping maintenance" msgstr "файл Ð±Ð»Ð¾ÐºÑƒÐ²Ð°Ð½Ð½Ñ \"%s\" Ñ–Ñнує, пропуÑк обÑлуговуваннÑ" #, c-format +msgid "unknown maintenance strategy: '%s'" +msgstr "невідома ÑÑ‚Ñ€Ð°Ñ‚ÐµÐ³Ñ–Ñ Ð¾Ð±ÑÐ»ÑƒÐ³Ð¾Ð²ÑƒÐ²Ð°Ð½Ð½Ñ %s" + +#, c-format msgid "'%s' is not a valid task" msgstr "\"%s\" не Ñ” припуÑтимим завданнÑм" @@ -7221,10 +7822,10 @@ msgid "show only matches from files that match all patterns" msgstr "показувати збіги лише з файлів, Ñкі відповідають уÑім шаблонам" msgid "pager" -msgstr "пейджер" +msgstr "Ð³Ð¾Ñ€Ñ‚Ð°Ð½Ð½Ñ Ñторінок" msgid "show matching files in the pager" -msgstr "показати відповідні файли в пейджері" +msgstr "показати відповідні файли з гортаннÑм Ñторінок" msgid "allow calling of grep(1) (ignored by this build)" msgstr "дозволÑти виклик grep(1) (ігноруєтьÑÑ Ñƒ цій збірці)" @@ -7786,6 +8387,29 @@ msgstr "--trailer з --only-input не має ÑенÑу" msgid "no input file given for in-place editing" msgstr "не надано вхідного файлу Ð´Ð»Ñ Ñ€ÐµÐ´Ð°Ð³ÑƒÐ²Ð°Ð½Ð½Ñ Ð½Ð° міÑці" +msgid "last-modified can only operate on one tree at a time" +msgstr "last-modified може працювати тільки з одним деревом за раз" + +#, c-format +msgid "unknown last-modified argument: %s" +msgstr "невідомий аргумент last-modified: %s" + +msgid "unable to setup last-modified" +msgstr "не вдалоÑÑ Ð½Ð°Ð»Ð°ÑˆÑ‚ÑƒÐ²Ð°Ñ‚Ð¸ last-modified" + +msgid "" +"git last-modified [--recursive] [--show-trees] [<revision-range>] [[--] " +"<path>...]" +msgstr "" +"git last-modified [--recursive] [--show-trees] [<діапазон-ревізій>] [[--] " +"<шлÑÑ…>...]" + +msgid "recurse into subtrees" +msgstr "рекурÑивно в піддеревах" + +msgid "show tree entries when recursing into subtrees" +msgstr "показати запиÑи дерева при рекурÑÑ–Ñ— в піддерева" + msgid "git log [<options>] [<revision-range>] [[--] <path>...]" msgstr "git log [<опції>] [<діапазон-ревізій>] [[--] <шлÑÑ…>...]" @@ -7824,6 +8448,22 @@ msgstr "" msgid "-L<range>:<file> cannot be used with pathspec" msgstr "-L<діапазон>:<файл> не можна викориÑтовувати з визначником шлÑху" +msgid "" +"\n" +"hint: You can replace 'git whatchanged <opts>' with:\n" +"hint:\tgit log <opts> --raw --no-merges\n" +"hint: Or make an alias:\n" +"hint:\tgit config set --global alias.whatchanged 'log --raw --no-merges'\n" +"\n" +msgstr "" +"\n" +"підказка: Ви можете замінити \"git whatchanged <опції>\" на:\n" +"підказка: git log <опції> --raw --no-merges\n" +"підказка: Ðбо Ñтворити пÑевдонім:\n" +"підказка: git config set --global alias.whatchanged \"log --raw --no-" +"merges\"\n" +"\n" + #, c-format msgid "git show %s: bad file" msgstr "git show %s: невірний файл" @@ -8267,9 +8907,6 @@ msgstr "git ls-tree [<опції>] <деревоподібне-джерело> [ msgid "only show trees" msgstr "показувати тільки дерева" -msgid "recurse into subtrees" -msgstr "рекурÑивно в піддеревах" - msgid "show trees when recursing" msgstr "відображати дерева при рекурÑÑ–Ñ—" @@ -8419,10 +9056,6 @@ msgid "Could not write object file" msgstr "Ðе вдалоÑÑ Ð·Ð°Ð¿Ð¸Ñати файл обʼєкта" #, c-format -msgid "unknown option %s" -msgstr "невідома Ð¾Ð¿Ñ†Ñ–Ñ %s" - -#, c-format msgid "could not parse object '%s'" msgstr "не вдалоÑÑ Ñ€Ð¾Ð·Ñ–Ð±Ñ€Ð°Ñ‚Ð¸ обʼєкт \"%s\"" @@ -8591,10 +9224,6 @@ msgstr "не вдалоÑÑ Ð²Ð¸ÐºÐ¾Ð½Ð°Ñ‚Ð¸ stash." msgid "stash failed" msgstr "не вдалоÑÑ Ð´Ð¾Ð´Ð°Ñ‚Ð¸ до Ñхову" -#, c-format -msgid "not a valid object: %s" -msgstr "не Ñ” припуÑтимим обʼєктом: %s" - msgid "read-tree failed" msgstr "read-tree завершивÑÑ Ð½ÐµÐ²Ð´Ð°Ð»Ð¾" @@ -9740,27 +10369,8 @@ msgstr "" "Ð’Ñього %<PRIu32> (дельта %<PRIu32>), повторно викориÑтано %<PRIu32> (дельта " "%<PRIu32>), повторно викориÑтано пакунків %<PRIu32> (з %<PRIuMAX>)" -msgid "" -"git pack-refs [--all] [--no-prune] [--auto] [--include <pattern>] [--exclude " -"<pattern>]" -msgstr "" -"git pack-refs [--all] [--no-prune] [--auto] [--include <шаблон>] [--exclude " -"<шаблон>]" - -msgid "pack everything" -msgstr "запакувати вÑе" - -msgid "prune loose refs (default)" -msgstr "видалити вивільнені поÑÐ¸Ð»Ð°Ð½Ð½Ñ (за замовчуваннÑм)" - -msgid "auto-pack refs as needed" -msgstr "Ð°Ð²Ñ‚Ð¾Ð¿Ð°ÐºÑƒÐ²Ð°Ð½Ð½Ñ Ð¿Ð¾Ñилань за потреби" - -msgid "references to include" -msgstr "поÑÐ¸Ð»Ð°Ð½Ð½Ñ Ð´Ð»Ñ Ð²ÐºÐ»ÑŽÑ‡ÐµÐ½Ð½Ñ" - -msgid "references to exclude" -msgstr "поÑÐ¸Ð»Ð°Ð½Ð½Ñ Ð´Ð»Ñ Ð²Ð¸ÐºÐ»ÑŽÑ‡ÐµÐ½Ð½Ñ" +msgid "git pack-refs " +msgstr "git pack-refs " msgid "git patch-id [--stable | --unstable | --verbatim]" msgstr "git patch-id [--stable | --unstable | --verbatim]" @@ -10285,6 +10895,10 @@ msgstr "git range-diff [<опції>] <Ñтара-верхівка>...<нова- msgid "git range-diff [<options>] <base> <old-tip> <new-tip>" msgstr "git range-diff [<опції>] <база> <Ñтара-верхівка> <нова-верхівка>" +#, c-format +msgid "invalid max-memory value: %s" +msgstr "неприпуÑтиме Ð·Ð½Ð°Ñ‡ÐµÐ½Ð½Ñ Ð¼Ð°ÐºÑимального обÑÑгу памʼÑÑ‚Ñ–: %s" + msgid "use simple diff colors" msgstr "викориÑтовувати проÑÑ‚Ñ– кольори diff" @@ -10294,6 +10908,12 @@ msgstr "нотатки" msgid "passed to 'git log'" msgstr "передано до \"git log\"" +msgid "size" +msgstr "розмір" + +msgid "maximum memory for cost matrix (default 4G)" +msgstr "макÑимальний обÑÑг памʼÑÑ‚Ñ– Ð´Ð»Ñ Ð¼Ð°Ñ‚Ñ€Ð¸Ñ†Ñ– витрат (за замовчуваннÑм 4 Гб)" + msgid "only emit output related to the first range" msgstr "видати тільки вивід, що відноÑитьÑÑ Ð´Ð¾ першого діапазону" @@ -10859,16 +11479,11 @@ msgstr "git reflog [show] [<лог-опції>] [<поÑиланнÑ>]" msgid "git reflog list" msgstr "git reflog list" -msgid "" -"git reflog expire [--expire=<time>] [--expire-unreachable=<time>]\n" -" [--rewrite] [--updateref] [--stale-fix]\n" -" [--dry-run | -n] [--verbose] [--all [--single-worktree] | " -"<refs>...]" -msgstr "" -"git reflog expire [--expire=<чаÑ>] [--expire-unreachable=<чаÑ>]\n" -" [--rewrite] [--updateref] [--stale-fix]\n" -" [--dry-run | -n] [--verbose] [--all [--single-worktree] | " -"<поÑиланнÑ>...]" +msgid "git reflog exists <ref>" +msgstr "git reflog exists <поÑиланнÑ>" + +msgid "git reflog write <ref> <old-oid> <new-oid> <message>" +msgstr "git reflog write <поÑиланнÑ> <Ñтарий-oid> <новий-oid> <повідомленнÑ>" msgid "" "git reflog delete [--rewrite] [--updateref]\n" @@ -10877,12 +11492,20 @@ msgstr "" "git reflog delete [--rewrite] [--updateref]\n" " [--dry-run | -n] [--verbose] <поÑиланнÑ>@{<визначник>}..." -msgid "git reflog exists <ref>" -msgstr "git reflog exists <поÑиланнÑ>" - msgid "git reflog drop [--all [--single-worktree] | <refs>...]" msgstr "git reflog drop [--all [--single-worktree] | <поÑиланнÑ>...]" +msgid "" +"git reflog expire [--expire=<time>] [--expire-unreachable=<time>]\n" +" [--rewrite] [--updateref] [--stale-fix]\n" +" [--dry-run | -n] [--verbose] [--all [--single-worktree] | " +"<refs>...]" +msgstr "" +"git reflog expire [--expire=<чаÑ>] [--expire-unreachable=<чаÑ>]\n" +" [--rewrite] [--updateref] [--stale-fix]\n" +" [--dry-run | -n] [--verbose] [--all [--single-worktree] | " +"<поÑиланнÑ>...]" + #, c-format msgid "invalid timestamp '%s' given to '--%s'" msgstr "неприпуÑтима позначка чаÑу \"%s\" передана до \"--%s\"" @@ -10950,12 +11573,50 @@ msgstr "видалÑти журнали поÑилань лише з поточРmsgid "references specified along with --all" msgstr "поÑиланнÑ, вказані разом з --all" +#, c-format +msgid "invalid reference name: %s" +msgstr "неприпуÑтима назва поÑиланнÑ: %s" + +#, c-format +msgid "invalid old object ID: '%s'" +msgstr "невірний ідентифікатор Ñтарого об’єкта: \"%s\"" + +#, c-format +msgid "old object '%s' does not exist" +msgstr "Ñтарий об’єкт \"%s\" не Ñ–Ñнує" + +#, c-format +msgid "invalid new object ID: '%s'" +msgstr "невірний ідентифікатор нового об’єкта: \"%s\"" + +#, c-format +msgid "new object '%s' does not exist" +msgstr "новий об’єкт \"%s\" не Ñ–Ñнує" + +#, c-format +msgid "cannot start transaction: %s" +msgstr "неможливо почати транзакцію: %s" + +#, c-format +msgid "cannot queue reflog update: %s" +msgstr "неможливо вÑтановити чергу Ð¾Ð½Ð¾Ð²Ð»ÐµÐ½Ð½Ñ Ð¶ÑƒÑ€Ð½Ð°Ð»Ñƒ поÑилань: %s" + +#, c-format +msgid "cannot commit reflog update: %s" +msgstr "неможливо зробити коміт Ð¾Ð½Ð¾Ð²Ð»ÐµÐ½Ð½Ñ Ð¶ÑƒÑ€Ð½Ð°Ð»Ñƒ поÑилань: %s" + msgid "git refs migrate --ref-format=<format> [--no-reflog] [--dry-run]" msgstr "git refs migrate --ref-format=<формат> [--no-reflog] [--dry-run]" msgid "git refs verify [--strict] [--verbose]" msgstr "git refs verify [--strict] [--verbose]" +msgid "git refs exists <ref>" +msgstr "git ref exists <поÑиланнÑ>" + +msgid "git refs optimize " +msgstr "git refs optimize " + msgid "specify the reference format to convert to" msgstr "вкажіть формат поÑиланнÑ, в Ñкий потрібно конвертувати" @@ -10978,6 +11639,18 @@ msgstr "увімкнути Ñувору перевірку" msgid "'git refs verify' takes no arguments" msgstr "\"git refs verify\" не потребує аргументів" +msgid "git refs list " +msgstr "git refs list " + +msgid "'git refs exists' requires a reference" +msgstr "\"git refs exists\" потребує поÑиланнÑ" + +msgid "reference does not exist" +msgstr "поÑÐ¸Ð»Ð°Ð½Ð½Ñ Ð½Ðµ Ñ–Ñнує" + +msgid "failed to look up reference" +msgstr "не вдалоÑÑ Ð·Ð½Ð°Ð¹Ñ‚Ð¸ поÑиланнÑ" + msgid "" "git remote add [-t <branch>] [-m <master>] [-f] [--tags | --no-tags] [--" "mirror=<fetch|push>] <name> <url>" @@ -11139,6 +11812,26 @@ msgstr "" "\t%s:%d\n" "тепер називає неіÑнуюче віддалене поÑÐ¸Ð»Ð°Ð½Ð½Ñ \"%s\"" +msgid "" +"The remote you are trying to rename has conflicting references in the\n" +"new target refspec. This is most likely caused by you trying to nest\n" +"a remote into itself, e.g. by renaming 'parent' into 'parent/child'\n" +"or by unnesting a remote, e.g. the other way round.\n" +"\n" +"If that is the case, you can address this by first renaming the\n" +"remote to a different name.\n" +msgstr "" +"Віддалене призначеннÑ, Ñке ви намагаєтеÑÑ Ð¿ÐµÑ€ÐµÐ¹Ð¼ÐµÐ½ÑƒÐ²Ð°Ñ‚Ð¸, має Ñуперечливі " +"поÑÐ¸Ð»Ð°Ð½Ð½Ñ Ð²\n" +"новому цільовому визначнику поÑиланнÑ. Ðайімовірніше, це Ñпричинено тим, що " +"ви намагаєтеÑÑ Ð²ÐºÐ»Ð°Ñти\n" +"віддалене Ð¿Ñ€Ð¸Ð·Ð½Ð°Ñ‡ÐµÐ½Ð½Ñ Ð² Ñаме Ñебе, наприклад, перейменувавши «parent» на " +"«parent/child»\n" +"або вилучивши вкладене віддалене призначеннÑ, тобто, навпаки.\n" +"\n" +"У такому випадку ви можете вирішити це, Ñпочатку переназвавши\n" +"віддалене призначеннÑ.\n" + #, c-format msgid "No such remote: '%s'" msgstr "Ðемає такого віддаленого призначеннÑ: \"%s\"" @@ -11147,6 +11840,13 @@ msgstr "Ðемає такого віддаленого призначеннÑ: \ msgid "Could not rename config section '%s' to '%s'" msgstr "Ðе вдалоÑÑ Ð¿ÐµÑ€ÐµÐ¹Ð¼ÐµÐ½ÑƒÐ²Ð°Ñ‚Ð¸ розділ конфігурації з \"%s\" на \"%s\"" +msgid "Renaming remote references" +msgstr "ÐŸÐµÑ€ÐµÐ¹Ð¼ÐµÐ½ÑƒÐ²Ð°Ð½Ð½Ñ Ð²Ñ–Ð´Ð´Ð°Ð»ÐµÐ½Ð¸Ñ… поÑилань" + +#, c-format +msgid "queueing remote ref renames failed: %s" +msgstr "помилка при перейменуванні віддаленого поÑÐ¸Ð»Ð°Ð½Ð½Ñ Ð² черзі: %s" + #, c-format msgid "" "Not updating non-default fetch refspec\n" @@ -11157,16 +11857,9 @@ msgstr "" "%s\n" "Будь лаÑка, за потреби оновіть конфігурацію вручну." -msgid "Renaming remote references" -msgstr "ÐŸÐµÑ€ÐµÐ¹Ð¼ÐµÐ½ÑƒÐ²Ð°Ð½Ð½Ñ Ð²Ñ–Ð´Ð´Ð°Ð»ÐµÐ½Ð¸Ñ… поÑилань" - #, c-format -msgid "deleting '%s' failed" -msgstr "не вдалоÑÑ Ð²Ð¸Ð´Ð°Ð»Ð¸Ñ‚Ð¸ \"%s\"" - -#, c-format -msgid "creating '%s' failed" -msgstr "не вдалоÑÑ Ñтворити \"%s\"" +msgid "renaming remote refs failed: %s" +msgstr "не вдалоÑÑ Ð¿ÐµÑ€ÐµÐ¹Ð¼ÐµÐ½ÑƒÐ²Ð°Ñ‚Ð¸ віддалені поÑиланнÑ: %s" msgid "" "Note: A branch outside the refs/remotes/ hierarchy was not removed;\n" @@ -11456,47 +12149,6 @@ msgstr "" "параметром\n" "--no-write-bitmap-index або вимкніть конфігурацію pack.writeBitmaps." -msgid "could not start pack-objects to repack promisor objects" -msgstr "не вдалоÑÑ Ñ€Ð¾Ð·Ð¿Ð¾Ñ‡Ð°Ñ‚Ð¸ pack-objects Ð´Ð»Ñ Ð¿ÐµÑ€ÐµÐ¿Ð°ÐºÑƒÐ²Ð°Ð½Ð½Ñ promisor обʼєктів" - -msgid "failed to feed promisor objects to pack-objects" -msgstr "не вдалоÑÑ Ð¿ÐµÑ€ÐµÐ´Ð°Ñ‚Ð¸ promisor обʼєкти обʼєктам пакунків" - -msgid "repack: Expecting full hex object ID lines only from pack-objects." -msgstr "" -"перепакуваннÑ: очікуютьÑÑ Ð¿Ð¾Ð²Ð½Ñ– Ñ€Ñдки hex ідентифікаторів обʼєктів тільки " -"від pack-objects." - -msgid "could not finish pack-objects to repack promisor objects" -msgstr "не вдалоÑÑ Ð·Ð°Ð²ÐµÑ€ÑˆÐ¸Ñ‚Ð¸ pack-objects Ð´Ð»Ñ Ð¿ÐµÑ€ÐµÐ¿Ð°ÐºÑƒÐ²Ð°Ð½Ð½Ñ promisor обʼєктів" - -#, c-format -msgid "cannot open index for %s" -msgstr "неможливо відкрити Ñ–Ð½Ð´ÐµÐºÑ Ð´Ð»Ñ %s" - -#, c-format -msgid "pack %s too large to consider in geometric progression" -msgstr "пакунок %s занадто великий, щоб враховувати в геометричній прогреÑÑ–Ñ—" - -#, c-format -msgid "pack %s too large to roll up" -msgstr "пакунок %s занадто великий Ð´Ð»Ñ Ð·Ð³Ð¾Ñ€Ñ‚Ð°Ð½Ð½Ñ" - -#, c-format -msgid "could not open tempfile %s for writing" -msgstr "не вдалоÑÑ Ð²Ñ–Ð´ÐºÑ€Ð¸Ñ‚Ð¸ тимчаÑовий файл %s Ð´Ð»Ñ Ð·Ð°Ð¿Ð¸Ñу" - -msgid "could not close refs snapshot tempfile" -msgstr "не вдалоÑÑ Ð·Ð°ÐºÑ€Ð¸Ñ‚Ð¸ тимчаÑовий файл знімка поÑилань" - -#, c-format -msgid "could not remove stale bitmap: %s" -msgstr "не вдалоÑÑ Ð²Ð¸Ð´Ð°Ð»Ð¸Ñ‚Ð¸ заÑтарілий bitmap: %s" - -#, c-format -msgid "pack prefix %s does not begin with objdir %s" -msgstr "Ð¿Ñ€ÐµÑ„Ñ–ÐºÑ Ð¿Ð°ÐºÑƒÐ½ÐºÑƒ %s не починаєтьÑÑ Ð· objdir %s" - msgid "pack everything in a single pack" msgstr "запакувати вÑе в один пакунок" @@ -11594,18 +12246,6 @@ msgstr "Ð¾Ð¿Ñ†Ñ–Ñ \"%s\" може бути викориÑтана тільки msgid "Nothing new to pack." msgstr "Ðемає нічого нового Ð´Ð»Ñ Ð¿Ð°ÐºÑƒÐ²Ð°Ð½Ð½Ñ." -#, c-format -msgid "renaming pack to '%s' failed" -msgstr "Ð¿ÐµÑ€ÐµÐ¹Ð¼ÐµÐ½ÑƒÐ²Ð°Ð½Ð½Ñ Ð¿Ð°ÐºÑƒÐ½ÐºÐ° на \"%s\" завершилоÑÑ Ð½ÐµÐ²Ð´Ð°Ð»Ð¾" - -#, c-format -msgid "pack-objects did not write a '%s' file for pack %s-%s" -msgstr "pack-objects не запиÑав файл \"%s\" Ð´Ð»Ñ Ð¿Ð°ÐºÑƒÐ½ÐºÐ° %s-%s" - -#, c-format -msgid "could not unlink: %s" -msgstr "не вдалоÑÑ Ð²Ð¸Ð´Ð°Ð»Ð¸Ñ‚Ð¸: %s" - msgid "git replace [-f] <object> <replacement>" msgstr "git replace [-f] <обʼєкт> <заміна>" @@ -11860,6 +12500,62 @@ msgstr "Ð²Ñ–Ð´Ñ‚Ð²Ð¾Ñ€ÐµÐ½Ð½Ñ Ð´Ð¾ кореневого коміту поки Ñ msgid "replaying merge commits is not supported yet!" msgstr "Ð²Ñ–Ð´Ñ‚Ð²Ð¾Ñ€ÐµÐ½Ð½Ñ ÐºÐ¾Ð¼Ñ–Ñ‚Ñ–Ð² Ð·Ð»Ð¸Ñ‚Ñ‚Ñ Ð¿Ð¾ÐºÐ¸ що не підтримуєтьÑÑ!" +#, c-format +msgid "key '%s' not found" +msgstr "ключ \"%s\" не знайдено" + +#, c-format +msgid "invalid format '%s'" +msgstr "неприпуÑтимий формат \"%s\"" + +msgid "output format" +msgstr "формат виводу" + +msgid "synonym for --format=nul" +msgstr "те ж Ñаме, що й --format=nul" + +msgid "unsupported output format" +msgstr "непідтримуваний формат виводу" + +msgid "References" +msgstr "ПоÑиланнÑ" + +msgid "Count" +msgstr "КількіÑÑ‚ÑŒ" + +msgid "Branches" +msgstr "Гілки" + +msgid "Tags" +msgstr "Теги" + +msgid "Remotes" +msgstr "Віддалені призначеннÑ" + +msgid "Others" +msgstr "Інші" + +msgid "Reachable objects" +msgstr "ДоÑÑжні обʼєкти" + +msgid "Commits" +msgstr "Коміти" + +msgid "Trees" +msgstr "Дерева" + +msgid "Blobs" +msgstr "Blobs" + +msgid "Repository structure" +msgstr "Структура Ñховища" + +msgid "Value" +msgstr "ЗначеннÑ" + +msgid "Counting references" +msgstr "Підрахунок поÑилань" + msgid "" "git rerere [clear | forget <pathspec>... | diff | status | remaining | gc]" msgstr "" @@ -12462,12 +13158,6 @@ msgstr "git show-ref --exclude-existing[=<шаблон>]" msgid "git show-ref --exists <ref>" msgstr "git show-ref --exists <поÑиланнÑ>" -msgid "reference does not exist" -msgstr "поÑÐ¸Ð»Ð°Ð½Ð½Ñ Ð½Ðµ Ñ–Ñнує" - -msgid "failed to look up reference" -msgstr "не вдалоÑÑ Ð·Ð½Ð°Ð¹Ñ‚Ð¸ поÑиланнÑ" - msgid "only show tags (can be combined with --branches)" msgstr "показувати тільки теги (можна комбінувати з --branches)" @@ -12497,10 +13187,10 @@ msgstr "показати поÑÐ¸Ð»Ð°Ð½Ð½Ñ Ð· stdin, Ñких немає в лРmsgid "" "git sparse-checkout (init | list | set | add | reapply | disable | check-" -"rules) [<options>]" +"rules | clean) [<options>]" msgstr "" "git sparse-checkout (init | list | set | add | reapply | disable | check-" -"rules) [<опції>]" +"rules | clean) [<опції>]" msgid "this worktree is not sparse" msgstr "це робоче дерево не Ñ” розрідженим" @@ -12542,10 +13232,6 @@ msgid "toggle the use of a sparse index" msgstr "перемкнути викориÑÑ‚Ð°Ð½Ð½Ñ Ñ€Ð¾Ð·Ñ€Ñ–Ð´Ð¶ÐµÐ½Ð¾Ð³Ð¾ індекÑу" #, c-format -msgid "unable to create leading directories of %s" -msgstr "не вдалоÑÑ Ñтворити провідні директорії %s" - -#, c-format msgid "failed to open '%s'" msgstr "не вдалоÑÑ Ð²Ñ–Ð´ÐºÑ€Ð¸Ñ‚Ð¸ \"%s\"" @@ -12627,6 +13313,36 @@ msgstr "" "має перебувати в розрідженому переході Ð´Ð»Ñ Ð¿Ð¾Ð²Ñ‚Ð¾Ñ€Ð½Ð¾Ð³Ð¾ заÑтоÑÑƒÐ²Ð°Ð½Ð½Ñ ÑˆÐ°Ð±Ð»Ð¾Ð½Ñ–Ð² " "розрідженоÑÑ‚Ñ–" +msgid "report each affected file, not just directories" +msgstr "повідомлÑти про кожен уражений файл, а не тільки про директорії" + +msgid "must be in a sparse-checkout to clean directories" +msgstr "має перебувати в режимі розрідженого переходу Ð´Ð»Ñ Ð¾Ñ‡Ð¸Ñ‰ÐµÐ½Ð½Ñ Ð´Ð¸Ñ€ÐµÐºÑ‚Ð¾Ñ€Ñ–Ð¹" + +msgid "must be in a cone-mode sparse-checkout to clean directories" +msgstr "" +"має перебувати в режимі конуÑного розрідженого переходу, щоб очиÑтити " +"директорії" + +msgid "for safety, refusing to clean without one of --force or --dry-run" +msgstr "" +"Ð´Ð»Ñ Ð±ÐµÐ·Ð¿ÐµÐºÐ¸, відмовлÑтиÑÑ Ð²Ð¸ÐºÐ¾Ð½ÑƒÐ²Ð°Ñ‚Ð¸ Ð¾Ñ‡Ð¸Ñ‰ÐµÐ½Ð½Ñ Ð±ÐµÐ· одного з параметрів --" +"force або --dry-run" + +msgid "failed to read index" +msgstr "не вдалоÑÑ Ð¿Ñ€Ð¾Ñ‡Ð¸Ñ‚Ð°Ñ‚Ð¸ індекÑ" + +msgid "" +"failed to convert index to a sparse index; resolve merge conflicts and try " +"again" +msgstr "" +"не вдалоÑÑ Ð¿ÐµÑ€ÐµÑ‚Ð²Ð¾Ñ€Ð¸Ñ‚Ð¸ Ñ–Ð½Ð´ÐµÐºÑ Ð½Ð° розріджений індекÑ; розвʼÑжіть конфлікти " +"Ð·Ð»Ð¸Ñ‚Ñ‚Ñ Ñ‚Ð° Ñпробуйте ще раз" + +#, c-format +msgid "failed to remove '%s'" +msgstr "не вдалоÑÑ Ð²Ð¸Ð´Ð°Ð»Ð¸Ñ‚Ð¸ \"%s\"" + msgid "error while refreshing working directory" msgstr "помилка під Ñ‡Ð°Ñ Ð¾Ð½Ð¾Ð²Ð»ÐµÐ½Ð½Ñ Ñ€Ð¾Ð±Ð¾Ñ‡Ð¾Ñ— директорії" @@ -14347,9 +15063,6 @@ msgstr "запиÑати обʼєкт дерева Ð´Ð»Ñ Ð¿Ñ–Ð´Ð´Ð¸Ñ€ÐµÐºÑ‚Ð¾Ñ€ msgid "only useful for debugging" msgstr "кориÑно лише Ð´Ð»Ñ Ð²Ñ–Ð´Ð»Ð°Ð³Ð¾Ð´Ð¶ÐµÐ½Ð½Ñ" -msgid "core.fsyncMethod = batch is unsupported on this platform" -msgstr "core.fsyncMethod = batch не підтримуєтьÑÑ Ð½Ð° цій платформі" - #, c-format msgid "could not parse bundle list key %s with value '%s'" msgstr "не вдалоÑÑ Ñ€Ð¾Ð·Ñ–Ð±Ñ€Ð°Ñ‚Ð¸ ключ ÑпиÑку пакунків %s зі значеннÑм \"%s\"" @@ -14487,7 +15200,7 @@ msgstr "index-pack завершивÑÑ Ð½ÐµÐ²Ð´Ð°Ð»Ð¾" #, c-format msgid "directory '%s' is present in index, but not sparse" -msgstr "Ð”Ð¸Ñ€ÐµÐºÑ‚Ð¾Ñ€Ñ–Ñ \"%s\" приÑÑƒÑ‚Ð½Ñ Ð² індекÑÑ–, але не Ñ” розрідженою" +msgstr "Ð´Ð¸Ñ€ÐµÐºÑ‚Ð¾Ñ€Ñ–Ñ \"%s\" приÑÑƒÑ‚Ð½Ñ Ð² індекÑÑ–, але не Ñ” розрідженою" msgid "corrupted cache-tree has entries not present in index" msgstr "пошкоджене cache-tree має запиÑи, Ñких немає в індекÑÑ–" @@ -14743,6 +15456,9 @@ msgstr "Миттєво переглÑнути Ñвоє робоче Ñховищ msgid "Add or parse structured information in commit messages" msgstr "Додати або розібрати Ñтруктуровану інформацію в допиÑах до комітів" +msgid "EXPERIMENTAL: Show when files were last modified" +msgstr "ЕКСПЕРИМЕÐТÐЛЬÐО: Показати, коли файли були змінені воÑтаннє" + msgid "Show commit logs" msgstr "Показати журнал коміту" @@ -14866,6 +15582,9 @@ msgstr "" "ЕКСПЕРИМЕÐТÐЛЬÐО: Ð’Ñ–Ð´Ñ‚Ð²Ð¾Ñ€ÐµÐ½Ð½Ñ ÐºÐ¾Ð¼Ñ–Ñ‚Ñ–Ð² на новій базі також працює з порожніми " "Ñховищами" +msgid "Retrieve information about the repository" +msgstr "Отримати інформацію про Ñховище" + msgid "Generates a summary of pending changes" msgstr "Створює підÑумок змін Ð´Ð»Ñ Ñ€Ð¾Ð·Ð³Ð»Ñду" @@ -14947,9 +15666,8 @@ msgstr "Переключити гілки" msgid "Read, modify and delete symbolic refs" msgstr "Прочитати, змінити та видалити Ñимвольні поÑиланнÑ" -msgid "Create, list, delete or verify a tag object signed with GPG" -msgstr "" -"Створити, показати, видалити або перевірити обʼєкт тегу, підпиÑаний GPG" +msgid "Create, list, delete or verify tags" +msgstr "Створити, перерахувати, видалити або перевірити теги" msgid "Creates a temporary file with a blob's contents" msgstr "Створює тимчаÑовий файл із вміÑтом blob" @@ -15786,6 +16504,43 @@ msgstr "не вдалоÑÑ Ñ€Ð¾Ð·Ð¿Ñ–Ð·Ð½Ð°Ñ‚Ð¸ config blob \"%s\"" msgid "unable to parse command-line config" msgstr "не вдалоÑÑ Ñ€Ð¾Ð·Ñ–Ð±Ñ€Ð°Ñ‚Ð¸ конфігурацію командного Ñ€Ñдка" +#, c-format +msgid "" +"\n" +"To use the default comment string (#) please run\n" +"\n" +"%s" +msgstr "" +"\n" +"Щоб викориÑтовувати Ñтандартну Ñтроку ÐºÐ¾Ð¼ÐµÐ½Ñ‚Ð°Ñ€Ñ (#), виконайте команду\n" +"\n" +"%s" + +msgid "<comment string>" +msgstr "<Ñтрока_коментарÑ>" + +#, c-format +msgid "" +"\n" +"To set a custom comment string please run\n" +"\n" +"%s\n" +"where '%s' is the string you wish to use.\n" +msgstr "" +"\n" +"Щоб вÑтановити влаÑну Ñтроку коментарÑ, виконайте команду\n" +"\n" +"%s,\n" +" де \"%s\" — це Ñтрока, Ñку ви хочете викориÑтовувати.\n" + +#, c-format +msgid "Support for '%s=auto' has been removed in Git 3.0" +msgstr "Підтримка \"%s=auto\" була видалена в Git 3.0" + +#, c-format +msgid "Support for '%s=auto' is deprecated and will be removed in Git 3.0" +msgstr "Підтримка \"%s=auto\" Ñ” заÑтарілою Ñ– буде видалена в Git 3.0." + msgid "unknown error occurred while reading the configuration files" msgstr "невідома помилка виникла під Ñ‡Ð°Ñ Ñ‡Ð¸Ñ‚Ð°Ð½Ð½Ñ ÐºÐ¾Ð½Ñ„Ñ–Ð³ÑƒÑ€Ð°Ñ†Ñ–Ð¹Ð½Ð¸Ñ… файлів" @@ -16274,6 +17029,12 @@ msgstr "не вдалоÑÑ Ð´Ð¾Ð´Ð°Ñ‚Ð¸ директорію \"%s\" до арх msgid "failed to write archive" msgstr "не вдалоÑÑ Ð·Ð°Ð¿Ð¸Ñати архів" +msgid "max-depth is not supported for worktree diffs" +msgstr "max-depth не підтримуєтьÑÑ Ð´Ð»Ñ Ð¿Ð¾Ñ€Ñ–Ð²Ð½ÑÐ½Ð½Ñ Ñ€Ð¾Ð±Ð¾Ñ‡Ð¸Ñ… дерев" + +msgid "max-depth is not supported for index diffs" +msgstr "max-depth не підтримуєтьÑÑ Ð´Ð»Ñ Ñ–Ð½Ð´ÐµÐºÑних diff" + msgid "--merge-base does not work with ranges" msgstr "--merge-base не працює з діапазонами" @@ -16783,6 +17544,12 @@ msgstr "[(A|C|D|M|R|T|U|X|B)...[*]]" msgid "select files by diff type" msgstr "вибрати файли за типом різниці" +msgid "<depth>" +msgstr "<глибина>" + +msgid "maximum tree depth to recurse" +msgstr "макÑимальна глибина дерева Ð´Ð»Ñ Ñ€ÐµÐºÑƒÑ€ÑÑ–Ñ—" + msgid "<file>" msgstr "<файл>" @@ -16982,10 +17749,6 @@ msgid "invalid unshallow line: %s" msgstr "неприпуÑтимий unshallow Ñ€Ñдок: %s" #, c-format -msgid "object not found: %s" -msgstr "обʼєкт не знайдено: %s" - -#, c-format msgid "error in object: %s" msgstr "помилка в обʼєкті: %s" @@ -17267,6 +18030,10 @@ msgstr "порожній пÑевдонім Ð´Ð»Ñ %s" msgid "recursive alias: %s" msgstr "рекурÑивний пÑевдонім: %s" +#, c-format +msgid "alias loop detected: expansion of '%s' does not terminate:%s" +msgstr "виÑвлено цикл пÑевдонімів: Ñ€Ð¾Ð·ÑˆÐ¸Ñ€ÐµÐ½Ð½Ñ \"%s\" не припинÑÑ”:%s" + msgid "write failure on standard output" msgstr "помилка запиÑу в Ñтандартний вивід" @@ -17277,10 +18044,6 @@ msgid "close failed on standard output" msgstr "не вдалоÑÑ Ð·Ð°ÐºÑ€Ð¸Ñ‚Ð¸ Ñтандартний вивід" #, c-format -msgid "alias loop detected: expansion of '%s' does not terminate:%s" -msgstr "виÑвлено цикл пÑевдонімів: Ñ€Ð¾Ð·ÑˆÐ¸Ñ€ÐµÐ½Ð½Ñ \"%s\" не припинÑÑ”:%s" - -#, c-format msgid "cannot handle %s as a builtin" msgstr "неможливо обробити %s Ñк вбудовану команду" @@ -17331,12 +18094,20 @@ msgstr "невірний/неÑуміÑний Ð¿Ñ–Ð´Ð¿Ð¸Ñ \"%s\"" msgid "failed to get the ssh fingerprint for key '%s'" msgstr "не вдалоÑÑ Ð¾Ñ‚Ñ€Ð¸Ð¼Ð°Ñ‚Ð¸ ssh відбиток Ð´Ð»Ñ ÐºÐ»ÑŽÑ‡Ð° \"%s\"" +#, c-format +msgid "failed to get the ssh fingerprint for key %s" +msgstr "не вдалоÑÑ Ð¾Ñ‚Ñ€Ð¸Ð¼Ð°Ñ‚Ð¸ ssh відбиток Ð´Ð»Ñ ÐºÐ»ÑŽÑ‡Ð° %s" + msgid "" "either user.signingkey or gpg.ssh.defaultKeyCommand needs to be configured" msgstr "" "потрібно налаштувати або user.signingkey, або gpg.ssh.defaultKeyCommand" #, c-format +msgid "malformed build-time gpg.ssh.defaultKeyCommand: %s" +msgstr "помилка Ñ„Ð¾Ñ€Ð¼ÑƒÐ²Ð°Ð½Ð½Ñ Ð¿Ñ–Ð´ Ñ‡Ð°Ñ ÐºÐ¾Ð¼Ð¿Ñ–Ð»Ñції gpg.ssh.defaultKeyCommand: %s" + +#, c-format msgid "gpg.ssh.defaultKeyCommand succeeded but returned no keys: %s %s" msgstr "" "gpg.ssh.defaultKeyCommand команда виконалаÑÑ ÑƒÑпішно, але не повернула " @@ -17601,6 +18372,13 @@ msgstr "" " запитували: %s\n" " перенаправленнÑ: %s" +#, c-format +msgid "" +"number too large to represent as curl_off_t on this platform: %<PRIuMAX>" +msgstr "" +"чиÑло занадто велике, щоб предÑтавити його Ñк curl_off_t на цій платформі: " +"%<PRIuMAX>" + msgid "Author identity unknown\n" msgstr "ОÑобиÑÑ‚Ñ–ÑÑ‚ÑŒ автора невідома\n" @@ -18060,10 +18838,6 @@ msgid "could not load pack" msgstr "не вдалоÑÑ Ð·Ð°Ð²Ð°Ð½Ñ‚Ð°Ð¶Ð¸Ñ‚Ð¸ пакунок" #, c-format -msgid "could not open index for %s" -msgstr "не вдалоÑÑ Ð²Ñ–Ð´ÐºÑ€Ð¸Ñ‚Ð¸ Ñ–Ð½Ð´ÐµÐºÑ Ð´Ð»Ñ %s" - -#, c-format msgid "unable to link '%s' to '%s'" msgstr "не вдалоÑÑ Ð·Ð²Ê¼Ñзати \"%s\" з \"%s\"" @@ -18087,6 +18861,10 @@ msgid "unknown preferred pack: '%s'" msgstr "невідомий бажаний пакунок: \"%s\"" #, c-format +msgid "failed to open preferred pack %s" +msgstr "не вдалоÑÑ Ð²Ñ–Ð´ÐºÑ€Ð¸Ñ‚Ð¸ бажаний пакунок %s" + +#, c-format msgid "cannot select preferred pack %s with no objects" msgstr "неможливо вибрати бажаний пакунок %s за відÑутноÑÑ‚Ñ– об’єктів" @@ -18110,6 +18888,9 @@ msgstr "не вдалоÑÑ Ñтворити тимчаÑовий шар MIDX" msgid "could not write multi-pack bitmap" msgstr "не вдалоÑÑ Ð·Ð°Ð¿Ð¸Ñати мультіпакунковий bitmap" +msgid "too many multi-pack-indexes" +msgstr "занадто багато multi-pack-indexes" + msgid "unable to open multi-pack-index chain file" msgstr "не вдалоÑÑ Ð²Ñ–Ð´ÐºÑ€Ð¸Ñ‚Ð¸ ланцюжковий файл multi-pack-index" @@ -18378,10 +19159,6 @@ msgid "files '%s' and '%s' differ in contents" msgstr "файли \"%s\" та \"%s\" відрізнÑÑŽÑ‚ÑŒÑÑ Ð·Ð° вміÑтом" #, c-format -msgid "unable to write file %s" -msgstr "не вдалоÑÑ Ð·Ð°Ð¿Ð¸Ñати файл %s" - -#, c-format msgid "unable to write repeatedly vanishing file %s" msgstr "не вдалоÑÑ Ð·Ð°Ð¿Ð¸Ñати файл %s, Ñкий поÑтійно зникає" @@ -18389,6 +19166,9 @@ msgstr "не вдалоÑÑ Ð·Ð°Ð¿Ð¸Ñати файл %s, Ñкий поÑтійРmsgid "unable to set permission to '%s'" msgstr "не вдалоÑÑ Ð²Ñтановити дозволи Ð´Ð»Ñ \"%s\"" +msgid "core.fsyncMethod = batch is unsupported on this platform" +msgstr "core.fsyncMethod = batch не підтримуєтьÑÑ Ð½Ð° цій платформі" + msgid "error when closing loose object file" msgstr "помилка при закритті файла вільного об’єкта" @@ -18898,6 +19678,21 @@ msgstr "mtimes файл %s має непідтримуваний хеш-іден msgid "mtimes file %s is corrupt" msgstr "mtimes файл %s пошкоджено" +msgid "pack everything" +msgstr "запакувати вÑе" + +msgid "prune loose refs (default)" +msgstr "видалити вивільнені поÑÐ¸Ð»Ð°Ð½Ð½Ñ (за замовчуваннÑм)" + +msgid "auto-pack refs as needed" +msgstr "Ð°Ð²Ñ‚Ð¾Ð¿Ð°ÐºÑƒÐ²Ð°Ð½Ð½Ñ Ð¿Ð¾Ñилань за потреби" + +msgid "references to include" +msgstr "поÑÐ¸Ð»Ð°Ð½Ð½Ñ Ð´Ð»Ñ Ð²ÐºÐ»ÑŽÑ‡ÐµÐ½Ð½Ñ" + +msgid "references to exclude" +msgstr "поÑÐ¸Ð»Ð°Ð½Ð½Ñ Ð´Ð»Ñ Ð²Ð¸ÐºÐ»ÑŽÑ‡ÐµÐ½Ð½Ñ" + #, c-format msgid "reverse-index file %s is too small" msgstr "файл зворотного індекÑу %s занадто малий" @@ -19327,6 +20122,10 @@ msgid "could not fetch %s from promisor remote" msgstr "не вдалоÑÑ Ð¾Ñ‚Ñ€Ð¸Ð¼Ð°Ñ‚Ð¸ %s з віддаленого promisor" #, c-format +msgid "unsupported field '%s' in '%s' config" +msgstr "непідтримуване поле \"%s\" у конфігурації \"%s\"" + +#, c-format msgid "no or empty URL advertised for remote '%s'" msgstr "відÑутній або пуÑтий обіцÑний URL Ð´Ð»Ñ Ð²Ñ–Ð´Ð´Ð°Ð»ÐµÐ½Ð¾Ð³Ð¾ \"%s\"" @@ -19337,12 +20136,16 @@ msgstr "" "заміÑÑ‚ÑŒ \"%s\"" #, c-format -msgid "unknown '%s' value for '%s' config option" -msgstr "невідоме Ð·Ð½Ð°Ñ‡ÐµÐ½Ð½Ñ \"%s\" Ð´Ð»Ñ Ð¿Ð°Ñ€Ð°Ð¼ÐµÑ‚Ñ€Ð° конфігурації \"%s\"" +msgid "invalid element '%s' from remote info" +msgstr "невірний елемент \"%s\" з віддаленої інформації" + +#, c-format +msgid "server advertised a promisor remote without a name or URL: %s" +msgstr "Ñервер оголоÑив віддалений promisor без назви або URL-адреÑи: %s" #, c-format -msgid "unknown element '%s' from remote info" -msgstr "невідомий елемент \"%s\" з віддаленої інформації" +msgid "unknown '%s' value for '%s' config option" +msgstr "невідоме Ð·Ð½Ð°Ñ‡ÐµÐ½Ð½Ñ \"%s\" Ð´Ð»Ñ Ð¿Ð°Ñ€Ð°Ð¼ÐµÑ‚Ñ€Ð° конфігурації \"%s\"" #, c-format msgid "accepted promisor remote '%s' not found" @@ -19439,6 +20242,16 @@ msgid "failed to generate diff" msgstr "не вдалоÑÑ Ð·Ð³ÐµÐ½ÐµÑ€ÑƒÐ²Ð°Ñ‚Ð¸ різницю" #, c-format +msgid "" +"range-diff: unable to compute the range-diff, since it exceeds the maximum " +"memory for the cost matrix: %s (%<PRIuMAX> bytes) needed, limited to %s " +"(%<PRIuMAX> bytes)" +msgstr "" +"range-diff: неможливо розрахувати різницю діапазонів, оÑкільки вона " +"перевищує макÑимальний обÑÑг памʼÑÑ‚Ñ– Ð´Ð»Ñ Ð¼Ð°Ñ‚Ñ€Ð¸Ñ†Ñ– витрат: необхідно %s " +"(%<PRIuMAX> байт), обмежено до %s (%<PRIuMAX> байт)" + +#, c-format msgid "could not parse log for '%s'" msgstr "не вдалоÑÑ Ñ€Ð¾Ð·Ñ–Ð±Ñ€Ð°Ñ‚Ð¸ журнал Ð´Ð»Ñ \"%s\"" @@ -19965,6 +20778,9 @@ msgstr "не Ñ” журналом поÑилань: %s" msgid "no reflog for '%s'" msgstr "немає журналу поÑилань Ð´Ð»Ñ \"%s\"" +msgid "Checking references consistency" +msgstr "Перевірка ÑÐ¿Ñ–Ð²Ð¿Ð°Ð´Ñ–Ð½Ð½Ñ Ð¿Ð¾Ñилань" + #, c-format msgid "%s does not point to a valid object!" msgstr "%s не вказує на допуÑтимий обʼєкт!" @@ -19980,8 +20796,9 @@ msgstr "%s%s Ñтав виÑÑчим піÑÐ»Ñ Ð²Ð¸Ð´Ð°Ð»ÐµÐ½Ð½Ñ %s\n" #, c-format msgid "" "Using '%s' as the name for the initial branch. This default branch name\n" -"is subject to change. To configure the initial branch name to use in all\n" -"of your new repositories, which will suppress this warning, call:\n" +"will change to \"main\" in Git 3.0. To configure the initial branch name\n" +"to use in all of your new repositories, which will suppress this warning,\n" +"call:\n" "\n" "\tgit config --global init.defaultBranch <name>\n" "\n" @@ -19990,19 +20807,34 @@ msgid "" "\n" "\tgit branch -m <name>\n" msgstr "" -"ВикориÑÑ‚Ð°Ð½Ð½Ñ \"%s\" Ñк назви початкової гілки. Ðазву гілки за замовчуваннÑм\n" -"може бути змінено. Щоб налаштувати назву початкової гілки Ð´Ð»Ñ Ð²Ð¸ÐºÐ¾Ñ€Ð¸ÑÑ‚Ð°Ð½Ð½Ñ Ñƒ " -"вÑÑ–Ñ…\n" -"ваших нових Ñховищах, що приховає це попередженнÑ, викличте\n" +"ВикориÑÑ‚Ð°Ð½Ð½Ñ \"%s\" Ñк назву Ð´Ð»Ñ Ð¿Ð¾Ñ‡Ð°Ñ‚ÐºÐ¾Ð²Ð¾Ñ— гілки. Ð¦Ñ Ð½Ð°Ð·Ð²Ð° гілки за " +"замовчуваннÑм\n" +"змінитьÑÑ Ð½Ð° \"main\" у Git 3.0. Щоб налаштувати початкову назву гілки,\n" +"Ñка буде викориÑтовуватиÑÑ Ñƒ вÑÑ–Ñ… ваших нових Ñховищах, що приховає це " +"попередженнÑ,\n" +"виконайте:\n" "\n" -"\tgit config --global init.defaultBranch <назва>.\n" +"\tgit config --global init.defaultBranch <назва>\n" "\n" -"ЗаміÑÑ‚ÑŒ \"master\" зазвичай викориÑтовують такі назви, Ñк \"main\", " -"\"trunk\" та\n" +"ЗаміÑÑ‚ÑŒ \"master\" зазвичай вибирають імена \"main\", \"trunk\" Ñ–\n" "\"development\". Щойно Ñтворену гілку можна перейменувати за допомогою цієї " "команди:\n" "\n" -"\tgit branch -m <назва>\n" +"\tgit branch -m <name>\n" + +#, c-format +msgid "" +"Using '%s' as the name for the initial branch since Git 3.0.\n" +"If you expected Git to create 'master', the just-created\n" +"branch can be renamed via this command:\n" +"\n" +"\tgit branch -m master\n" +msgstr "" +"ВикориÑтовуєтьÑÑ \"%s\" Ñк назва початкової гілки з Git 3.0.\n" +"Якщо ви очікували, що Git Ñтворить \"master\", щойно Ñтворену\n" +"гілку можна перейменувати за допомогою команди:\n" +"\n" +"\tgit branch -m master\n" #, c-format msgid "could not retrieve `%s`" @@ -20089,6 +20921,28 @@ msgstr "не вдалоÑÑ Ð²Ð¸Ð´Ð°Ð»Ð¸Ñ‚Ð¸ тимчаÑову директор msgid "migrated refs can be found at '%s'" msgstr "перенеÑені поÑÐ¸Ð»Ð°Ð½Ð½Ñ Ð¼Ð¾Ð¶Ð½Ð° знайти в \"%s\"" +msgid "" +"'core.preferSymlinkRefs=true' is nominated for removal.\n" +"hint: The use of symbolic links for symbolic refs is deprecated\n" +"hint: and will be removed in Git 3.0. The configuration that\n" +"hint: tells Git to use them is thus going away. You can unset\n" +"hint: it with:\n" +"hint:\n" +"hint:\tgit config unset core.preferSymlinkRefs\n" +"hint:\n" +"hint: Git will then use the textual symref format instead." +msgstr "" +"\"core.preferSymlinkRefs=true\" номіновано на видаленнÑ.\n" +"hint: ВикориÑÑ‚Ð°Ð½Ð½Ñ Ñимволічних поÑилань Ð´Ð»Ñ Ñимвольних поÑилань Ñ” " +"заÑтарілим\n" +"hint: Ñ– буде видалено в Git 3.0. КонфігураціÑ, Ñка\n" +"hint: вказує Git викориÑтовувати Ñ—Ñ…, буде видалена. Ви можете ÑкаÑувати\n" +"hint: Ñ—Ñ— за допомогою:\n" +"hint:\n" +"hint: git config unset core.preferSymlinkRefs\n" +"hint:\n" +"hint: ЗаміÑÑ‚ÑŒ цього Git буде викориÑтовувати текÑтовий формат symref." + #, c-format msgid "" "cannot lock ref '%s': expected symref with target '%s': but is a regular ref" @@ -20097,6 +20951,10 @@ msgstr "" "призначеннÑм \"%s\", але це звичайне поÑиланнÑ" #, c-format +msgid "trying to write reflog for '%s' with incomplete values" +msgstr "Ñпроба запиÑати reflog Ð´Ð»Ñ \"%s\" з неповними значеннÑми" + +#, c-format msgid "cannot read ref file '%s'" msgstr "неможливо прочитати файл поÑÐ¸Ð»Ð°Ð½Ð½Ñ \"%s\"" @@ -20104,9 +20962,6 @@ msgstr "неможливо прочитати файл поÑÐ¸Ð»Ð°Ð½Ð½Ñ \"%s\" msgid "cannot open directory %s" msgstr "неможливо відкрити директорію %s" -msgid "Checking references consistency" -msgstr "Перевірка ÑÐ¿Ñ–Ð²Ð¿Ð°Ð´Ñ–Ð½Ð½Ñ Ð¿Ð¾Ñилань" - #, c-format msgid "unable to open '%s'" msgstr "не вдалоÑÑ Ð²Ñ–Ð´ÐºÑ€Ð¸Ñ‚Ð¸ \"%s\"" @@ -20150,6 +21005,10 @@ msgstr "" "не дозволені" #, c-format +msgid "cannot lock ref '%s': dangling symref already exists" +msgstr "неможливо заблокувати поÑÐ¸Ð»Ð°Ð½Ð½Ñ \"%s\": вже Ñ–Ñнує незалежний symref" + +#, c-format msgid "cannot lock ref '%s': reference already exists" msgstr "неможливо зафікÑувати поÑÐ¸Ð»Ð°Ð½Ð½Ñ \"%s\": поÑÐ¸Ð»Ð°Ð½Ð½Ñ Ð²Ð¶Ðµ Ñ–Ñнує" @@ -20255,9 +21114,6 @@ msgstr "remote-curl: неочікуваний response end пакет" msgid "RPC failed; %s" msgstr "RPC завершивÑÑ Ð½ÐµÐ²Ð´Ð°Ð»Ð¾; %s" -msgid "cannot handle pushes this big" -msgstr "неможливо впоратиÑÑ Ð· такими великими надÑиланнÑми" - #, c-format msgid "cannot deflate request; zlib deflate error %d" msgstr "неможливо запакувати запит; zlib помилка Ð¿Ð°ÐºÑƒÐ²Ð°Ð½Ð½Ñ %d" @@ -20449,6 +21305,13 @@ msgstr "" "\"%s:refs/tags/%s\"?" #, c-format +msgid "" +"The <src> part of the refspec ('%s') is an object ID that doesn't exist.\n" +msgstr "" +"ЧаÑтина <джерело> визаначника поÑÐ¸Ð»Ð°Ð½Ð½Ñ (\"%s\") Ñ” ідентифікатором обʼєкта, " +"Ñкий не Ñ–Ñнує.\n" + +#, c-format msgid "%s cannot be resolved to branch" msgstr "%s неможливо розвʼÑзати в гілку" @@ -20585,6 +21448,59 @@ msgid "cannot strip one component off url '%s'" msgstr "неможливо вилучити один компонент з url \"%s\"" #, c-format +msgid "cannot open index for %s" +msgstr "неможливо відкрити Ñ–Ð½Ð´ÐµÐºÑ Ð´Ð»Ñ %s" + +#, c-format +msgid "pack %s too large to consider in geometric progression" +msgstr "пакунок %s занадто великий, щоб враховувати в геометричній прогреÑÑ–Ñ—" + +#, c-format +msgid "pack %s too large to roll up" +msgstr "пакунок %s занадто великий Ð´Ð»Ñ Ð·Ð³Ð¾Ñ€Ñ‚Ð°Ð½Ð½Ñ" + +#, c-format +msgid "could not open tempfile %s for writing" +msgstr "не вдалоÑÑ Ð²Ñ–Ð´ÐºÑ€Ð¸Ñ‚Ð¸ тимчаÑовий файл %s Ð´Ð»Ñ Ð·Ð°Ð¿Ð¸Ñу" + +msgid "could not close refs snapshot tempfile" +msgstr "не вдалоÑÑ Ð·Ð°ÐºÑ€Ð¸Ñ‚Ð¸ тимчаÑовий файл знімка поÑилань" + +#, c-format +msgid "could not remove stale bitmap: %s" +msgstr "не вдалоÑÑ Ð²Ð¸Ð´Ð°Ð»Ð¸Ñ‚Ð¸ заÑтарілий bitmap: %s" + +msgid "could not start pack-objects to repack promisor objects" +msgstr "не вдалоÑÑ Ñ€Ð¾Ð·Ð¿Ð¾Ñ‡Ð°Ñ‚Ð¸ pack-objects Ð´Ð»Ñ Ð¿ÐµÑ€ÐµÐ¿Ð°ÐºÑƒÐ²Ð°Ð½Ð½Ñ promisor обʼєктів" + +msgid "failed to feed promisor objects to pack-objects" +msgstr "не вдалоÑÑ Ð¿ÐµÑ€ÐµÐ´Ð°Ñ‚Ð¸ promisor обʼєкти обʼєктам пакунків" + +msgid "repack: Expecting full hex object ID lines only from pack-objects." +msgstr "" +"перепакуваннÑ: очікуютьÑÑ Ð¿Ð¾Ð²Ð½Ñ– Ñ€Ñдки hex ідентифікаторів обʼєктів тільки " +"від pack-objects." + +msgid "could not finish pack-objects to repack promisor objects" +msgstr "не вдалоÑÑ Ð·Ð°Ð²ÐµÑ€ÑˆÐ¸Ñ‚Ð¸ pack-objects Ð´Ð»Ñ Ð¿ÐµÑ€ÐµÐ¿Ð°ÐºÑƒÐ²Ð°Ð½Ð½Ñ promisor обʼєктів" + +#, c-format +msgid "pack prefix %s does not begin with objdir %s" +msgstr "Ð¿Ñ€ÐµÑ„Ñ–ÐºÑ Ð¿Ð°ÐºÑƒÐ½ÐºÑƒ %s не починаєтьÑÑ Ð· objdir %s" + +#, c-format +msgid "renaming pack to '%s' failed" +msgstr "Ð¿ÐµÑ€ÐµÐ¹Ð¼ÐµÐ½ÑƒÐ²Ð°Ð½Ð½Ñ Ð¿Ð°ÐºÑƒÐ½ÐºÐ° на \"%s\" завершилоÑÑ Ð½ÐµÐ²Ð´Ð°Ð»Ð¾" + +#, c-format +msgid "pack-objects did not write a '%s' file for pack %s-%s" +msgstr "pack-objects не запиÑав файл \"%s\" Ð´Ð»Ñ Ð¿Ð°ÐºÑƒÐ½ÐºÐ° %s-%s" + +#, c-format +msgid "could not unlink: %s" +msgstr "не вдалоÑÑ Ð²Ð¸Ð´Ð°Ð»Ð¸Ñ‚Ð¸: %s" + +#, c-format msgid "bad replace ref name: %s" msgstr "неприпуÑтима назва заміни поÑиланнÑ: %s" @@ -21906,9 +22822,6 @@ msgstr "не Ñ” git Ñховищем: \"%s\"" msgid "cannot chdir to '%s'" msgstr "неможливо змінити директорію на \"%s\"" -msgid "cannot come back to cwd" -msgstr "неможливо повернутиÑÑ Ð´Ð¾ поточної робочої директорії" - #, c-format msgid "failed to stat '%*s%s%s'" msgstr "не вдалоÑÑ Ð·Ð°Ð¿Ð¸Ñати \"%*s%s%s\"" @@ -22989,19 +23902,33 @@ msgid "warning: " msgstr "попередженнÑ: " #, c-format +msgid "'%s' is nominated for removal.\n" +msgstr "\"%s\" номіновано на видаленнÑ.\n" + +#, c-format msgid "" -"'%s' is nominated for removal.\n" -"If you still use this command, please add an extra\n" -"option, '--i-still-use-this', on the command line\n" -"and let us know you still use it by sending an e-mail\n" -"to <git@vger.kernel.org>. Thanks.\n" +"If you still use this command, here's what you can do:\n" +"\n" +"- read https://git-scm.com/docs/BreakingChanges.html\n" +"- check if anyone has discussed this on the mailing\n" +" list and if they came up with something that can\n" +" help you: https://lore.kernel.org/git/?q=%s\n" +"- send an email to <git@vger.kernel.org> to let us\n" +" know that you still use this command and were unable\n" +" to determine a suitable replacement\n" +"\n" msgstr "" -"\"%s\" запропоновано Ð´Ð»Ñ Ð²Ð¸Ð´Ð°Ð»ÐµÐ½Ð½Ñ.\n" -"Якщо ви вÑе ще викориÑтовуєте цю команду, додайте додаткову\n" -"опцію \"--i-still-use-this\" у командний Ñ€Ñдок\n" -"Ñ– повідомте Ð½Ð°Ñ Ð¿Ñ€Ð¾ те, що ви вÑе ще Ñ—Ñ— викориÑтовуєте, надіÑлавши " -"електронного лиÑта\n" -"на адреÑу <git@vger.kernel.org>. ДÑкуємо.\n" +"Якщо ви вÑе ще викориÑтовуєте цю команду, оÑÑŒ що ви можете зробити:\n" +"\n" +"- прочитайте https://git-scm.com/docs/BreakingChanges.html\n" +"- перевірте, чи хтоÑÑŒ обговорював це у розÑилці\n" +" Ñ– чи знайшли вони щоÑÑŒ, що може\n" +" вам допомогти: https://lore.kernel.org/git/?q=%s\n" +"- надішліть електронного лиÑта на адреÑу <git@vger.kernel.org>, щоб " +"повідомити наÑ,\n" +" що ви вÑе ще викориÑтовуєте цю команду Ñ– не змогли\n" +" знайти їй гідну заміну\n" +"\n" msgid "refusing to run without --i-still-use-this" msgstr "відмовлено в запуÑку без --i-still-use-this" @@ -23874,6 +24801,9 @@ msgstr "ÐадіÑлати цей лиÑÑ‚? ([y]es|[n]o|[e]dit|[q]uit|[a]ll): " msgid "Send this email reply required" msgstr "Відповідь на Ð·Ð°Ð¿Ð¸Ñ‚Ð°Ð½Ð½Ñ \"ÐадіÑлати цей лиÑÑ‚?\" Ñ” обовʼÑзковою" +msgid "The destination IMAP folder is not properly defined." +msgstr "Ð”Ð¸Ñ€ÐµÐºÑ‚Ð¾Ñ€Ñ–Ñ IMAP Ð¿Ñ€Ð¸Ð·Ð½Ð°Ñ‡ÐµÐ½Ð½Ñ Ð½Ðµ визначена належним чином." + msgid "The required SMTP server is not properly defined." msgstr "Потрібний SMTP-Ñервер не визначено належним чином." @@ -11,7 +11,7 @@ # VÅ© Tiến HÆ°ng <newcomerminecraft@gmail.com>, 2024-2025. # --- # BẢNG THUẬT NGá»® / TERMINOLOGY -# Updated: 2025-03-06, git 2.49 +# Updated: 2025-11-15, git 2.52 # # Ghi chú: # - Bảng thuáºt ngữ nà y chÆ°a hoà n thiện. @@ -61,15 +61,17 @@ # | (v.) amend | tu bổ | # | (n.) revision | cải biên | # | (n.) repo/repository | kho chứa | +# | (n.) tag | thẻ | +# | (v.) tag | tạo thẻ | # | | | # | ... TODO ... | | # +------------------------------------------------------------------+ msgid "" msgstr "" -"Project-Id-Version: git 2.51\n" +"Project-Id-Version: git 2.52\n" "Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n" -"POT-Creation-Date: 2025-08-12 17:01+0000\n" -"PO-Revision-Date: 2025-08-14 16:16+0700\n" +"POT-Creation-Date: 2025-11-06 23:58+0000\n" +"PO-Revision-Date: 2025-11-15 11:38+0700\n" "Last-Translator: VÅ© Tiến HÆ°ng <newcomerminecraft@gmail.com>\n" "Language-Team: Vietnamese <https://github.com/Nekosha/git-po>\n" "Language: vi\n" @@ -603,37 +605,39 @@ msgid "Nothing was applied.\n" msgstr "Äã không áp dụng gì cả.\n" msgid "" -"j - leave this hunk undecided, see next undecided hunk\n" -"J - leave this hunk undecided, see next hunk\n" -"k - leave this hunk undecided, see previous undecided hunk\n" -"K - leave this hunk undecided, see previous hunk\n" +"j - go to the next undecided hunk, roll over at the bottom\n" +"J - go to the next hunk, roll over at the bottom\n" +"k - go to the previous undecided hunk, roll over at the top\n" +"K - go to the previous hunk, roll over at the top\n" "g - select a hunk to go to\n" "/ - search for a hunk matching the given regex\n" "s - split the current hunk into smaller hunks\n" "e - manually edit the current hunk\n" -"p - print the current hunk, 'P' to use the pager\n" +"p - print the current hunk\n" +"P - print the current hunk using the pager\n" "? - print help\n" msgstr "" -"j - để lại khúc nà y là chÆ°a quyết định, xem khúc chÆ°a quyết định kế tiếp\n" -"J - để lại khúc nà y là chÆ°a quyết định, xem khúc kế tiếp\n" -"k - để lại khúc nà y là chÆ°a quyết định, xem khúc chÆ°a quyết định kế trÆ°á»›c\n" -"K - để lại khúc nà y là chÆ°a quyết định, xem khúc kế trÆ°á»›c\n" +"j - xem khúc chÆ°a quyết định kế tiếp\n" +"J - xem khúc kế tiếp\n" +"k - xem khúc chÆ°a quyết định kế trÆ°á»›c\n" +"K - xem khúc kế trÆ°á»›c\n" "g - chá»n má»™t khúc muốn tá»›i\n" "/ - tìm má»™t khúc khá»›p vá»›i biểu thức chÃnh quy\n" "s - chia khúc hiện tại thà nh các khúc nhá» hÆ¡n\n" "e - sá»a bằng tay khúc hiện hà nh\n" -"p - in ra khúc hiện hà nh, 'P' để chạy trình phân trang\n" +"p - in ra khúc hiện hà nh\n" +"P - in tra khúc hiện hà nh có phân trang\n" "? - hiển thị trợ giúp\n" #, c-format msgid "Only one letter is expected, got '%s'" msgstr "Cần má»™t ký tá»±, nhÆ°ng lại có '%s'" -msgid "No previous hunk" -msgstr "Không có khúc kế trÆ°á»›c" +msgid "No other hunk" +msgstr "Không còn khúc nà o để nhảy đến" -msgid "No next hunk" -msgstr "Không có khúc kế tiếp" +msgid "No other undecided hunk" +msgstr "Không còn khúc nà o chÆ°a quyết định" msgid "No other hunks to goto" msgstr "Không còn khúc nà o để nhảy đến" @@ -2394,14 +2398,19 @@ msgid "Restrict the missing objects to the current sparse-checkout" msgstr "Chỉ lấy vỠđối tượng còn thiếu trong checkout thÆ°a hiện tại" msgid "" -"git bisect start [--term-(new|bad)=<term> --term-(old|good)=<term>] [--no-" -"checkout] [--first-parent] [<bad> [<good>...]] [--] [<pathspec>...]" +"git bisect start [--term-(bad|new)=<term-new> --term-(good|old)=<term-old>]\n" +" [--no-checkout] [--first-parent] [<bad> [<good>...]] [--] " +"[<pathspec>...]" msgstr "" -"git bisect start [--term-(new|bad)=<term> --term-(old|good)=<term>] [--no-" -"checkout] [--first-parent] [<bad> [<good>...]] [--] [<Ä‘Æ°á»ng/dẫn>...]" +"git bisect start [--term-(bad|new)=<term-new> --term-(good|old)=<term-old>]\n" +" [--no-checkout] [--first-parent] [<bad> [<good>...]] [--] " +"[<Ä‘Æ°á»ng/dẫn>...]" + +msgid "git bisect (bad|new|<term-new>) [<rev>]" +msgstr "git bisect (bad|new|<term-new>) [<rev>...]" -msgid "git bisect (good|bad) [<rev>...]" -msgstr "git bisect (good|bad) [<rev>...]" +msgid "git bisect (good|old|<term-old>) [<rev>...]" +msgstr "git bisect (good|old|<term-old>) [<rev>...]" msgid "git bisect skip [(<rev>|<range>)...]" msgstr "git bisect skip [(<rev>|<vùng>)...]" @@ -5606,6 +5615,14 @@ msgid "found %i tags; gave up search at %s\n" msgstr "tìm thấy %i thẻ; từ bá» tìm kiếm tại %s\n" #, c-format +msgid "cannot search for blob '%s' on an unborn branch" +msgstr "không thể tìm blob '%s' trên má»™t nhánh chÆ°a sinh" + +#, c-format +msgid "blob '%s' not reachable from HEAD" +msgstr "blob '%s' không thể tá»›i được từ HEAD" + +#, c-format msgid "describe %s\n" msgstr "mô tả %s\n" @@ -5746,6 +5763,9 @@ msgstr "tùy chá»n không hợp lệ: %s" msgid "%s...%s: no merge base" msgstr "%s...%s: không có gốc hòa trá»™n" +msgid "cannot come back to cwd" +msgstr "không thể quay lại thÆ° mục là m việc hiện hà nh" + msgid "Not a git repository" msgstr "Không phải là kho git" @@ -5855,11 +5875,132 @@ msgstr "chÆ°a Ä‘Æ°a ra <lệnh> cho --extcmd=<lệnh>" msgid "git fast-export [<rev-list-opts>]" msgstr "git fast-export [<rev-list-opts>]" -msgid "Error: Cannot export nested tags unless --mark-tags is specified." -msgstr "Lá»—i: không thể xuất thẻ lồng nhau trừ khi --mark-tags được chỉ định." +#, c-format +msgid "unknown %s mode: %s" +msgstr "không hiểu chế Ä‘á»™ %s: %s" + +#, c-format +msgid "unknown tag-of-filtered mode: %s" +msgstr "không hiểu chế Ä‘á»™ tag-of-filtered: %s" + +#, c-format +msgid "unknown reencoding mode: %s" +msgstr "Không hiểu chế Ä‘á»™ mã hoá lại: %s" + +#, c-format +msgid "could not read blob %s" +msgstr "không thể Ä‘á»c blob %s" + +#, c-format +msgid "oid mismatch in blob %s" +msgstr "oid không khá»›p trong blob %s" + +#, c-format +msgid "could not write blob '%s'" +msgstr "không thể ghi blob '%s'" + +#, c-format +msgid "unexpected comparison status '%c' for %s, %s" +msgstr "trạng thái lệnh so sánh không nhÆ° mong đợi '%c' cho %s, %s" + +# +msgid "none" +msgstr "(không)" + +msgid "could not find author in commit %s" +msgstr "không thể tìm thấy tác giả lần chuyển giao %s" + +#, c-format +msgid "could not find committer in commit %s" +msgstr "không thể tìm thấy ngÆ°á»i chuyển giao trong lần chuyển giao %s" + +#, c-format +msgid "" +"encountered commit-specific encoding %.*s in commit %s; use --reencode=[yes|" +"no] to handle it" +msgstr "" + +#, c-format +msgid "encountered signed commit %s; use --signed-commits=<mode> to handle it" +msgstr "" + +#, c-format +msgid "exporting %<PRIuMAX> signature(s) for commit %s" +msgstr "" + +#, c-format +msgid "stripping signature(s) from commit %s" +msgstr "" + +#, c-format +msgid "" +"omitting tag %s,\n" +"since tags of trees (or tags of tags of trees, etc.) are not supported." +msgstr "" + +#, c-format +msgid "could not read tag %s" +msgstr "không thể Ä‘á»c thẻ %s" + +#, c-format +msgid "encountered signed tag %s; use --signed-tags=<mode> to handle it" +msgstr "" + +#, c-format +msgid "exporting signed tag %s" +msgstr "xuất thẻ đã ký %s" + +#, c-format +msgid "stripping signature from tag %s" +msgstr "Lá»c bá» chữ ký từ thẻ %s" + +#, c-format +msgid "" +"tag %s tags unexported object; use --tag-of-filtered-object=<mode> to handle " +"it" +msgstr "" + +msgid "cannot export nested tags unless --mark-tags is specified." +msgstr "không thể xuất thẻ lồng nhau trừ khi --mark-tags được chỉ định." + +#, c-format +msgid "tag %s points nowhere?" +msgstr "thẻ %s chẳng chỉ đến đâu cả?" + +#, c-format +msgid "%s: unexpected object of type %s, skipping." +msgstr "%s: bá» qua đối tượng kiểu không rõ %s." + +#, c-format +msgid "tag points to object of unexpected type %s, skipping." +msgstr "bá» qua thẻ trỠđến đối tượng kiểu không rõ %s." + +#, c-format +msgid "unable to open marks file %s for writing." +msgstr "không thể mở file dấu '%s' để ghi." + +#, c-format +msgid "unable to write marks file %s." +msgstr "không thể ghi táºp tin dấu %s." + +#, c-format +msgid "corrupt mark line: %s" +msgstr "dòng đánh dấu há»ng: %s" + +#, c-format +msgid "object not found: %s" +msgstr "không tìm thấy đối tượng: %s" + +#, c-format +msgid "not a commit? can't happen: %s" +msgstr "không phải là lần chuyển giao? sao lại thế: %s" + +#, c-format +msgid "object %s already has a mark" +msgstr "đối tượng %s đã có dấu" msgid "--anonymize-map token cannot be empty" -msgstr "--anonymize-map thẻ không thể là rá»—ng" +msgstr "--anonymize-map token không thể là rá»—ng" msgid "show progress after <n> objects" msgstr "hiển thị tiến triển sau <n> đối tượng" @@ -5925,28 +6066,450 @@ msgid "label tags with mark ids" msgstr "gắn thẻ vá»›i các mã ID đánh dấu" #, c-format -msgid "Missing from marks for submodule '%s'" -msgstr "Thiếu các đánh dấu cho mô-Ä‘un-con '%s'" +msgid "can't write crash report %s" +msgstr "không thể ghi báo cáo crash %s" + +#, c-format +msgid "fast-import: dumping crash report to %s\n" +msgstr "fast-import: ghi báo cáo crash và o %s\n" + +#, c-format +msgid "mark :%<PRIuMAX> not declared" +msgstr "dấu chÆ°a định nghÄ©a :%<PRIuMAX>" #, c-format -msgid "Missing to marks for submodule '%s'" -msgstr "Thiếu đánh dấu cho mô-Ä‘un-con '%s'" +msgid "invalid attempt to create duplicate branch: %s" +msgstr "tạo nhánh gặp lá»—i trùng tên: %s" #, c-format -msgid "Expected 'mark' command, got %s" -msgstr "Cần lệnh 'mark', nhÆ°ng lại có %s" +msgid "branch name doesn't conform to Git standards: %s" +msgstr "tên nhánh không hợp quy chuẩn Git: %s" + +msgid "internal consistency error creating the index" +msgstr "lá»—i nhất quán khi tạo chỉ mục" + +msgid "cannot create keep file" +msgstr "không thể tạo keep file" + +msgid "failed to write keep file" +msgstr "không thể ghi keep file" + +msgid "cannot store pack file" +msgstr "không thể lÆ°u trữ gói" + +msgid "cannot store index file" +msgstr "không thể lÆ°u trữ táºp tin ghi chỉ mục" + +#, c-format +msgid "failed seeking to start of '%s'" +msgstr "gặp lá»—i khi seek vỠđầu '%s'" + +#, c-format +msgid "core Git rejected index %s" +msgstr "Git core từ chá»—i chỉ mục %s" + +msgid "cannot truncate pack to skip duplicate" +msgstr "không thể truncate gói để loại file trùng lặp" #, c-format -msgid "Expected 'to' command, got %s" -msgstr "Cần lệnh 'to', nhÆ°ng lại có %s" +msgid "EOF in data (%<PRIuMAX> bytes remaining)" +msgstr "hết dữ liệu (còn %<PRIuMAX> byte)" -msgid "Expected format name:filename for submodule rewrite option" -msgstr "Cần định dạng tên:tên_táºp tin cho tùy chá»n ghi lại mô-Ä‘un-con" +#, c-format +msgid "unexpected deflate failure: %d" +msgstr "gặp kết thúc táºp tin Ä‘á»™t xuất trong deflate: %d" + +#, c-format +msgid "not a tree: %s" +msgstr "không phải là cây: %s" + +#, c-format +msgid "can't load tree %s" +msgstr "không thể mở cây %s" + +#, c-format +msgid "corrupt mode in %s" +msgstr "chế Ä‘á»™ há»ng trong %s" + +msgid "root cannot be a non-directory" +msgstr "thÆ° mục gốc phải là thÆ° mục" + +msgid "empty path component found in input" +msgstr "Ä‘Æ°á»ng dẫn trống rá»—ng trong đầu và o" + +msgid "non-directories cannot have subtrees" +msgstr "không thể có cây thÆ° mục mà không có thÆ° mục" + +#, c-format +msgid "dropping %s since it would point to itself (i.e. to %s)" +msgstr "bá» %s vì nó trỠđến chÃnh có (tá»›i %s)" + +#, c-format +msgid "branch %s is missing commits." +msgstr "nhánh %s không có chuyển giao" + +#, c-format +msgid "not updating %s (new tip %s does not contain %s)" +msgstr "không cáºp nháºt %s (đầu nhánh %s không chứa %s)" + +#, c-format +msgid "unable to create leading directories of %s" +msgstr "không thể tạo các thÆ° mục dẫn đầu của '%s'" + +#, c-format +msgid "unable to write marks file %s" +msgstr "không thể ghi táºp tin dấu %s" + +#, c-format +msgid "unable to write marks file %s: %s" +msgstr "không thể ghi táºp tin dấu %s: %s" + +#, c-format +msgid "unable to write file %s" +msgstr "không thể ghi táºp tin %s" + +#, c-format +msgid "expected 'data n' command, found: %s" +msgstr "cần lệnh 'data n', nhÆ°ng lại có: %s" + +#, c-format +msgid "EOF in data (terminator '%s' not found)" +msgstr "hết dữ liệu (không tìm thấy kết '%s')" + +msgid "data is too large to use in this context" +msgstr "" + +#, c-format +msgid "EOF in data (%lu bytes remaining)" +msgstr "hết dữ liệu (còn %lu byte)" + +#, c-format +msgid "missing < in ident string: %s" +msgstr "dòng định danh thiếu < : %s" + +#, c-format +msgid "missing space before < in ident string: %s" +msgstr "dòng định danh thiếu dấu cách trÆ°á»›c < : %s" + +#, c-format +msgid "missing > in ident string: %s" +msgstr "dòng định danh thiếu > : %s" + +#, c-format +msgid "missing space after > in ident string: %s" +msgstr "dòng định danh thiếu dấu cách sau > : %s" + +#, c-format +msgid "invalid raw date \"%s\" in ident: %s" +msgstr "dòng định danh có ngà y tháng \"%s\" không hợp lệ: %s" + +#, c-format +msgid "invalid rfc2822 date \"%s\" in ident: %s" +msgstr "dòng định danh có ngà y tháng rfc2822 \"%s\" không hợp lệ: %s" + +#, c-format +msgid "date in ident must be 'now': %s" +msgstr "ngà y tháng phải là 'now': %s" + +#, c-format +msgid "too large fanout (%u)" +msgstr "" + +#, c-format +msgid "failed to remove path %s" +msgstr "gặp lá»—i khi xoá %s" + +#, c-format +msgid "no value after ':' in mark: %s" +msgstr "không có gì sau ':' ở dấu: %s" + +#, c-format +msgid "garbage after mark: %s" +msgstr "có rác sau dấu: %s" + +#, c-format +msgid "missing space after mark: %s" +msgstr "thiếu dấu cách sau dấu: %s" + +#, c-format +msgid "invalid %s: %s" +msgstr "%s không hợp lệ: %s" + +#, c-format +msgid "NUL in %s: %s" +msgstr "ký tá»± NUL trong %s: %s" + +#, c-format +msgid "garbage after %s: %s" +msgstr "có rác sau %s: %s" + +#, c-format +msgid "missing space after %s: %s" +msgstr "thiếu dấu cách sau %s: %s" + +#, c-format +msgid "corrupt mode: %s" +msgstr "chế Ä‘á»™ há»ng: %s" + +#, c-format +msgid "invalid dataref: %s" +msgstr "dataref không hợp lệ: '%s'" + +#, c-format +msgid "missing space after SHA1: %s" +msgstr "thiếu dấu cách sau SHA1: %s" + +#, c-format +msgid "Git links cannot be specified 'inline': %s" +msgstr "không thể 'inline' liên kết Git: %s" + +#, c-format +msgid "not a commit (actually a %s): %s" +msgstr "không phải là lần chuyển giao (thá»±c ra là %s): %s" + +#, c-format +msgid "directories cannot be specified 'inline': %s" +msgstr "không thể 'inline' thÆ° mục: %s" + +#, c-format +msgid "%s not found: %s" +msgstr "Không tìm thấy %s: %s" + +msgid "tree" +msgstr "cây" + +#, c-format +msgid "not a %s (actually a %s): %s" +msgstr "không phải là %s (thá»±c ra là %s): %s" + +#, c-format +msgid "path %s not in branch" +msgstr "Ä‘Æ°á»ng dẫn %s không trong nhánh" + +msgid "can't add a note on empty branch." +msgstr "không thể thêm ghi chú và o nhánh rá»—ng." + +#, c-format +msgid "mark :%<PRIuMAX> not a commit" +msgstr "dấu :%<PRIuMAX> không phải lần chuyển giao" + +#, c-format +msgid "not a valid commit: %s" +msgstr "không phải là lần chuyển giao hợp lệ: %s" + +#, c-format +msgid "invalid ref name or SHA1 expression: %s" +msgstr "tên tham chiếu hoặc SHA1 không hợp lệ: %s" + +#, c-format +msgid "not a blob (actually a %s): %s" +msgstr "không phải là blob (thá»±c ra là %s): %s" + +#, c-format +msgid "blob not found: %s" +msgstr "không tìm thấy blob: %s" + +#, c-format +msgid "the commit %s is corrupt" +msgstr "lần chuyển giao %s bị há»ng" + +#, c-format +msgid "can't create a branch from itself: %s" +msgstr "không thể tạo nhánh từ chÃnh nó: %s" + +#, c-format +msgid "" +"expected gpgsig format: 'gpgsig <hash-algo> <signature-format>', got 'gpgsig " +"%s'" +msgstr "" + +#, c-format +msgid "unknown git hash algorithm in gpgsig: '%s'" +msgstr "không hiểu thuáºt toán băm dữ liệu trong gpgsig '%s'" + +#, c-format +msgid "invalid signature format in gpgsig: '%s'" +msgstr "định dạng chữ ký không hợp lệ trong gpgsig: '%s'" + +msgid "'unknown' signature format in gpgsig" +msgstr "định dạng chữ ký 'unknown' trong gpgsig" + +#, c-format +msgid "multiple %s signatures found, ignoring additional signature" +msgstr "" + +msgid "parse_one_signature() returned unknown hash algo" +msgstr "" + +msgid "expected committer but didn't get one" +msgstr "cần ngÆ°á»i chuyển giao nhÆ°ng không có" + +msgid "encountered signed commit; use --signed-commits=<mode> to handle it" +msgstr "" + +msgid "stripping a commit signature" +msgstr "loại bá» chữ ký trong lần chuyển giao" + +msgid "importing a commit signature verbatim" +msgstr "" + +msgid "encountered signed tag; use --signed-tags=<mode> to handle it" +msgstr "" + +#, c-format +msgid "importing a tag signature verbatim for tag '%s'" +msgstr "" + +#, c-format +msgid "stripping a tag signature for tag '%s'" +msgstr "" + +#, c-format +msgid "expected 'from' command, got '%s'" +msgstr "Cần lệnh 'from', nhÆ°ng lại có '%s'" + +msgid "can't tag an empty branch." +msgstr "không thể đánh thẻ nhánh rá»—ng." + +#, c-format +msgid "not a valid object: %s" +msgstr "không phải là má»™t đối tượng hợp lệ: %s" + +msgid "write to frontend failed" +msgstr "" + +#, c-format +msgid "can't read object %s" +msgstr "không thể Ä‘á»c đối tượng %s" + +#, c-format +msgid "object %s is a %s but a blob was expected." +msgstr "đối tượng %s là %s, nhÆ°ng lại cần blob." + +#, c-format +msgid "not a mark: %s" +msgstr "không phải là dấu: %s" + +#, c-format +msgid "unknown mark: %s" +msgstr "không rõ dấu: %s" + +#, c-format +msgid "garbage after SHA1: %s" +msgstr "có rác sau SHA1: %s" + +#, c-format +msgid "not a tree-ish: %s" +msgstr "không phải má»™t tree-ish: %s" + +#, c-format +msgid "can't load object %s" +msgstr "không thể Ä‘á»c đối tượng %s" + +#, c-format +msgid "invalid SHA1 in tag: %s" +msgstr "SHA1 không hợp lệ cho thẻ: %s" + +#, c-format +msgid "invalid SHA1 in commit: %s" +msgstr "SHA1 không hợp lệ cho lần chuyển giao: %s" + +#, c-format +msgid "missing from marks for submodule '%s'" +msgstr "thiếu đánh dấu from cho mô-Ä‘un-con '%s'" + +#, c-format +msgid "missing to marks for submodule '%s'" +msgstr "thiếu đánh dấu to cho mô-Ä‘un-con '%s'" + +#, c-format +msgid "missing space after tree-ish: %s" +msgstr "thiếu dấu cách sau tree-ish: %s" + +#, c-format +msgid "not in a commit: %s" +msgstr "không phải là lần chuyển giao: %s" + +#, c-format +msgid "expected 'mark' command, got %s" +msgstr "cần lệnh 'mark', nhÆ°ng lại có %s" + +#, c-format +msgid "expected 'to' command, got %s" +msgstr "cần lệnh 'to', nhÆ°ng lại có %s" + +msgid "only one import-marks command allowed per stream" +msgstr "" + +#, c-format +msgid "unknown --date-format argument %s" +msgstr "không hiểu tham số --date-format: %s" + +#, c-format +msgid "%s: argument must be a non-negative integer" +msgstr "%s: đối số phải không âm" + +#, c-format +msgid "--depth cannot exceed %u" +msgstr "" + +#, c-format +msgid "--cat-blob-fd cannot exceed %d" +msgstr "" + +msgid "expected format name:filename for submodule rewrite option" +msgstr "cần định dạng tên:tên_táºp tin cho tùy chá»n ghi lại mô-Ä‘un-con" + +#, c-format +msgid "max-pack-size is now in bytes, assuming --max-pack-size=%lum" +msgstr "" + +msgid "minimum max-pack-size is 1 MiB" +msgstr "giá»›i hạn kÃch thÆ°á»›c tối thiểu của gói là 1 MiB" + +#, c-format +msgid "unknown --signed-commits mode '%s'" +msgstr "không hiểu chế Ä‘á»™ --signed-commits '%s'" + +#, c-format +msgid "unknown --signed-tags mode '%s'" +msgstr "không hiểu chế Ä‘á»™ --signed-tags '%s'" #, c-format msgid "feature '%s' forbidden in input without --allow-unsafe-features" msgstr "" -"tÃnh năng '%s' bị cấm chỉ trong đầu và o mà không có --allow-unsafe-features" +"tÃnh năng '%s' bị cấm trong đầu và o mà không có --allow-unsafe-features" + +#, c-format +msgid "got feature command '%s' after data command" +msgstr "" + +#, c-format +msgid "this version of fast-import does not support feature %s." +msgstr "fast-import bản nà y không há»— trợ tÃnh năng %s." + +#, c-format +msgid "got option command '%s' after data command" +msgstr "" + +#, c-format +msgid "this version of fast-import does not support option: %s" +msgstr "fast-import bản nà y không há»— trợ tuỳ chá»n %s" + +#, c-format +msgid "unknown option %s" +msgstr "không hiểu tùy chá»n %s" + +#, c-format +msgid "unknown option --%s" +msgstr "không hiểu tùy chá»n --%s" + +#, c-format +msgid "unsupported command: %s" +msgstr "không há»— trợ lệnh: %s" + +msgid "stream ends early" +msgstr "stream kết thúc sá»›m" #, c-format msgid "Lockfile created but not reported: %s" @@ -6022,7 +6585,7 @@ msgid "" msgstr "" "việc lấy vá» thÆ°á»ng chỉ ra các nhánh buá»™c phải cáºp nháºt,\n" "nhÆ°ng lá»±a chá»n bị tắt; để kÃch hoạt lại, sá» dụng cá»\n" -"'--show-forced-updates' hoặc chạy 'git config fetch.showForcedUpdates true'." +"'--show-forced-updates' hoặc chạy 'git config fetch.showForcedUpdates true'" #, c-format msgid "" @@ -6083,6 +6646,22 @@ msgstr "" "thông báo nà y. Cụ thể, 'git config set remote.%s.followRemoteHEAD %s'\n" "sẽ vô hiệu cảnh báo nà y tá»›i khi máy chủ đổi HEAD vá» chá»— khác." +msgid "" +"You're on a case-insensitive filesystem, and the remote you are\n" +"trying to fetch from has references that only differ in casing. It\n" +"is impossible to store such references with the 'files' backend. You\n" +"can either accept this as-is, in which case you won't be able to\n" +"store all remote references on disk. Or you can alternatively\n" +"migrate your repository to use the 'reftable' backend with the\n" +"following command:\n" +"\n" +" git refs migrate --ref-format=reftable\n" +"\n" +"Please keep in mind that not all implementations of Git support this\n" +"new format yet. So if you use tools other than Git to access this\n" +"repository it may not be an option to migrate to reftables.\n" +msgstr "" + #, c-format msgid "" "some local refs could not be updated; try running\n" @@ -6323,25 +6902,6 @@ msgstr "dùng <tên> thay cho nhánh Ä‘Ãch tháºt" msgid "file to read from" msgstr "táºp tin để Ä‘á»c dữ liệu từ đó" -msgid "git for-each-ref [<options>] [<pattern>]" -msgstr "git for-each-ref [<các tùy chá»n>] [<mẫu>]" - -msgid "git for-each-ref [--points-at <object>]" -msgstr "git for-each-ref [--points-at <đối tượng>]" - -msgid "git for-each-ref [--merged [<commit>]] [--no-merged [<commit>]]" -msgstr "" -"git for-each-ref [--merged [<lần-chuyển-giao>]] [--no-merged [<lần-chuyển-" -"giao>]]" - -msgid "git for-each-ref [--contains [<commit>]] [--no-contains [<commit>]]" -msgstr "" -"git for-each-ref [--contains [<lần-chuyển-giao>]] [--no-contains [<lần-" -"chuyển-giao>]]" - -msgid "git for-each-ref [--start-after <marker>]" -msgstr "git for-each-ref [--start-after <dấu>]" - msgid "quote placeholders suitably for shells" msgstr "trÃch dẫn dạng phù hợp cho shell" @@ -6396,6 +6956,9 @@ msgstr "đối số không rõ được chỉ định cùng vá»›i --stdin" msgid "cannot use --start-after with patterns" msgstr "không thể dùng tùy chá»n --start-after vá»›i mẫu" +msgid "git for-each-ref " +msgstr "git for-each-ref " + msgid "git for-each-repo --config=<config> [--] <arguments>" msgstr "git for-each-repo --config=<tùy chá»n> [--] <đối số>" @@ -6866,6 +7429,9 @@ msgid "" "skipping incremental-repack task because core.multiPackIndex is disabled" msgstr "bá» qua tác vụ incremental-repack vì core.multiPackIndex bị vô hiệu hóa" +msgid "failed to perform geometric repack" +msgstr "" + #, c-format msgid "task '%s' failed" msgstr "gặp lá»—i khi thá»±c hiện nhiệm vụ '%s'" @@ -6875,6 +7441,10 @@ msgid "lock file '%s' exists, skipping maintenance" msgstr "đã có khóa của táºp tin '%s', bá» qua bảo trì" #, c-format +msgid "unknown maintenance strategy: '%s'" +msgstr "không hiểu chiến lược bảo trì: '%s'" + +#, c-format msgid "'%s' is not a valid task" msgstr "'%s' không phải má»™t nhiệm vụ hợp lệ" @@ -7314,7 +7884,7 @@ msgid "" "'%s': path for unsupported man viewer.\n" "Please consider using 'man.<tool>.cmd' instead." msgstr "" -"'%s': Ä‘Æ°á»ng dẫn không há»— trợ bá»™ trình chiếu man.\n" +"'%s': Ä‘Æ°á»ng dẫn không há»— trợ trình xem man.\n" "Hãy cân nhắc đến việc sá» dụng 'man.<tool>.cmd' để thay thế." #, c-format @@ -7322,12 +7892,12 @@ msgid "" "'%s': cmd for supported man viewer.\n" "Please consider using 'man.<tool>.path' instead." msgstr "" -"'%s': cmd (lệnh) há»— trợ bá»™ trình chiếu man.\n" +"'%s': cmd (lệnh) há»— trợ trình xem man.\n" "Hãy cân nhắc đến việc sá» dụng 'man.<tool>.path' để thay thế." #, c-format msgid "'%s': unknown man viewer." -msgstr "'%s': không rõ chÆ°Æ¡ng trình xem man." +msgstr "'%s': không rõ trình xem man." msgid "no man viewer handled the request" msgstr "không có trình xem trợ giúp dạng manpage tiếp hợp vá»›i yêu cầu" @@ -7728,6 +8298,27 @@ msgstr "--trailer cùng vá»›i --only-input không hợp lý" msgid "no input file given for in-place editing" msgstr "không Ä‘Æ°a ra táºp tin đầu và o để sá»a tại-chá»—" +msgid "last-modified can only operate on one tree at a time" +msgstr "" + +#, c-format +msgid "unknown last-modified argument: %s" +msgstr "không hiểu tham số last-modified: %s" + +msgid "unable to setup last-modified" +msgstr "" + +msgid "" +"git last-modified [--recursive] [--show-trees] [<revision-range>] [[--] " +"<path>...]" +msgstr "" + +msgid "recurse into subtrees" +msgstr "đệ quy và o các thÆ° mục con" + +msgid "show tree entries when recursing into subtrees" +msgstr "hiển thị cây khi đệ quy" + msgid "git log [<options>] [<revision-range>] [[--] <path>...]" msgstr "git log [<các tùy chá»n>] [<vùng-xem-xét>] [[--] </Ä‘Æ°á»ng/dẫn>...]" @@ -7766,6 +8357,15 @@ msgstr "" msgid "-L<range>:<file> cannot be used with pathspec" msgstr "-L<vùng>:<táºp tin> không thể được sá» dụng vá»›i đặc tả Ä‘Æ°á»ng dẫn" +msgid "" +"\n" +"hint: You can replace 'git whatchanged <opts>' with:\n" +"hint:\tgit log <opts> --raw --no-merges\n" +"hint: Or make an alias:\n" +"hint:\tgit config set --global alias.whatchanged 'log --raw --no-merges'\n" +"\n" +msgstr "" + #, c-format msgid "git show %s: bad file" msgstr "git show %s: sai táºp tin" @@ -8206,9 +8806,6 @@ msgstr "git ls-tree [<các tùy chá»n>] <tree-ish> [</Ä‘Æ°á»ng/dẫn>...]" msgid "only show trees" msgstr "chỉ hiển thị các tree" -msgid "recurse into subtrees" -msgstr "đệ quy và o các thÆ° mục con" - msgid "show trees when recursing" msgstr "hiển thị cây khi đệ quy" @@ -8358,10 +8955,6 @@ msgid "Could not write object file" msgstr "Không thể ghi và o táºp tin" #, c-format -msgid "unknown option %s" -msgstr "không hiểu tùy chá»n %s" - -#, c-format msgid "could not parse object '%s'" msgstr "không thể Ä‘á»c đối tượng '%s'" @@ -8528,10 +9121,6 @@ msgstr "không thể chạy tạm cất." msgid "stash failed" msgstr "lệnh tạm cất gặp lá»—i" -#, c-format -msgid "not a valid object: %s" -msgstr "không phải là má»™t đối tượng hợp lệ: %s" - msgid "read-tree failed" msgstr "read-tree gặp lá»—i" @@ -9380,7 +9969,7 @@ msgstr "Nén delta dùng tá»›i %d tuyến trình" #, c-format msgid "unable to pack objects reachable from tag %s" -msgstr "không thể đóng gói các đối tượng tiếp cáºn được từ thẻ '%s'" +msgstr "không thể đóng gói các đối tượng tiếp cáºn được từ thẻ %s" #, c-format msgid "unable to get type of object %s" @@ -9673,27 +10262,8 @@ msgstr "" "Tổng %<PRIu32> (delta %<PRIu32>), dùng lại %<PRIu32> (delta %<PRIu32>), dùng " "lại pack %<PRIu32> (trong số %<PRIuMAX>)" -msgid "" -"git pack-refs [--all] [--no-prune] [--auto] [--include <pattern>] [--exclude " -"<pattern>]" -msgstr "" -"git pack-refs [--all] [--no-prune] [--auto] [--include <pattern>] [--exclude " -"<pattern>]" - -msgid "pack everything" -msgstr "đóng gói má»i thứ" - -msgid "prune loose refs (default)" -msgstr "prune (cắt cụt) những tham chiếu bị mất (mặc định)" - -msgid "auto-pack refs as needed" -msgstr "tá»± Ä‘á»™ng pack tham chiếu nếu cần" - -msgid "references to include" -msgstr "bao gồm các tham chiếu" - -msgid "references to exclude" -msgstr "loại trừ các tham chiếu" +msgid "git pack-refs " +msgstr "git pack-refs " msgid "git patch-id [--stable | --unstable | --verbatim]" msgstr "git patch-id [--stable | --unstable | --verbatim]" @@ -10210,6 +10780,10 @@ msgstr "git range-diff [<các tùy chá»n>] <old-tip>...<new-tip>" msgid "git range-diff [<options>] <base> <old-tip> <new-tip>" msgstr "git range-diff [<các tùy chá»n>] <base> <old-tip> <new-tip>" +#, c-format +msgid "invalid max-memory value: %s" +msgstr "giá trị max-memory không hợp lệ: %s" + msgid "use simple diff colors" msgstr "dùng mà u diff Ä‘Æ¡n giản" @@ -10219,6 +10793,12 @@ msgstr "ghi chú" msgid "passed to 'git log'" msgstr "chuyển cho 'git log'" +msgid "size" +msgstr "" + +msgid "maximum memory for cost matrix (default 4G)" +msgstr "" + msgid "only emit output related to the first range" msgstr "chỉ phát ra kết quả liên quan đến vùng đầu tiên" @@ -10778,16 +11358,11 @@ msgstr "git reflog [show] [<các tùy chá»n>] [<tham chiếu>]" msgid "git reflog list" msgstr "git reflog list" -msgid "" -"git reflog expire [--expire=<time>] [--expire-unreachable=<time>]\n" -" [--rewrite] [--updateref] [--stale-fix]\n" -" [--dry-run | -n] [--verbose] [--all [--single-worktree] | " -"<refs>...]" +msgid "git reflog exists <ref>" +msgstr "git reflog exists <tham_chiếu>" + +msgid "git reflog write <ref> <old-oid> <new-oid> <message>" msgstr "" -"git reflog expire [--expire=<time>] [--expire-unreachable=<time>]\n" -" [--rewrite] [--updateref] [--stale-fix]\n" -" [--dry-run | -n] [--verbose] [--all [--single-worktree] | " -"<refs>...]" msgid "" "git reflog delete [--rewrite] [--updateref]\n" @@ -10796,12 +11371,20 @@ msgstr "" "git reflog delete [--rewrite] [--updateref]\n" " [--dry-run | -n] [--verbose] <ref>@{<specifier>}..." -msgid "git reflog exists <ref>" -msgstr "git reflog exists <tham_chiếu>" - msgid "git reflog drop [--all [--single-worktree] | <refs>...]" msgstr "git reflog drop [--all [--single-worktree] | <tham_chiếu>...]" +msgid "" +"git reflog expire [--expire=<time>] [--expire-unreachable=<time>]\n" +" [--rewrite] [--updateref] [--stale-fix]\n" +" [--dry-run | -n] [--verbose] [--all [--single-worktree] | " +"<refs>...]" +msgstr "" +"git reflog expire [--expire=<time>] [--expire-unreachable=<time>]\n" +" [--rewrite] [--updateref] [--stale-fix]\n" +" [--dry-run | -n] [--verbose] [--all [--single-worktree] | " +"<refs>...]" + #, c-format msgid "invalid timestamp '%s' given to '--%s'" msgstr "dấu vết thá»i gian không hợp lệ '%s' Ä‘Æ°a cho '--%s'" @@ -10869,12 +11452,50 @@ msgstr "bá» reflogs chỉ từ thÆ° mục là m việc hiện tại" msgid "references specified along with --all" msgstr "chỉ định tham chiếu vá»›i tùy chá»n --all" +#, c-format +msgid "invalid reference name: %s" +msgstr "tham chiếu không hợp lệ: %s" + +#, c-format +msgid "invalid old object ID: '%s'" +msgstr "ID đối tượng cÅ© không hợp lệ: '%s'" + +#, c-format +msgid "old object '%s' does not exist" +msgstr "đối tượng cÅ© '%s' không tồn tại" + +#, c-format +msgid "invalid new object ID: '%s'" +msgstr "ID đối tượng má»›i không hợp lệ: %s" + +#, c-format +msgid "new object '%s' does not exist" +msgstr "đối tượng má»›i '%s' không tồn tại" + +#, c-format +msgid "cannot start transaction: %s" +msgstr "" + +#, c-format +msgid "cannot queue reflog update: %s" +msgstr "" + +#, c-format +msgid "cannot commit reflog update: %s" +msgstr "" + msgid "git refs migrate --ref-format=<format> [--no-reflog] [--dry-run]" msgstr "git refs migrate --ref-format=<định dạng> [--no-reflog] [--dry-run]" msgid "git refs verify [--strict] [--verbose]" msgstr "git refs verify [--strict] [--verbose]" +msgid "git refs exists <ref>" +msgstr "git refs exists <tham_chiếu>" + +msgid "git refs optimize " +msgstr "git refs optimize " + msgid "specify the reference format to convert to" msgstr "chỉ định định dạng tham chiếu để chuyển đổi sang" @@ -10897,6 +11518,18 @@ msgstr "cho phép kiểm tra nghiêm ngặt" msgid "'git refs verify' takes no arguments" msgstr "'git refs verify' không nháºn tham số" +msgid "git refs list " +msgstr "git refs list " + +msgid "'git refs exists' requires a reference" +msgstr "" + +msgid "reference does not exist" +msgstr "tham chiếu không tồn tại" + +msgid "failed to look up reference" +msgstr "gặp lá»—i khi tìm tham chiếu" + msgid "" "git remote add [-t <branch>] [-m <master>] [-f] [--tags | --no-tags] [--" "mirror=<fetch|push>] <name> <url>" @@ -11053,6 +11686,16 @@ msgstr "" "\t%s:%d\n" "bây giá» tên trên máy chủ không tồn tại '%s'" +msgid "" +"The remote you are trying to rename has conflicting references in the\n" +"new target refspec. This is most likely caused by you trying to nest\n" +"a remote into itself, e.g. by renaming 'parent' into 'parent/child'\n" +"or by unnesting a remote, e.g. the other way round.\n" +"\n" +"If that is the case, you can address this by first renaming the\n" +"remote to a different name.\n" +msgstr "" + #, c-format msgid "No such remote: '%s'" msgstr "Không có máy chủ nà o nhÆ° váºy: '%s'" @@ -11061,6 +11704,13 @@ msgstr "Không có máy chủ nà o nhÆ° váºy: '%s'" msgid "Could not rename config section '%s' to '%s'" msgstr "Không thể đổi tên phần của cấu hình từ '%s' thà nh '%s'" +msgid "Renaming remote references" +msgstr "Äổi tên các tham chiếu máy chủ" + +#, c-format +msgid "queueing remote ref renames failed: %s" +msgstr "" + #, c-format msgid "" "Not updating non-default fetch refspec\n" @@ -11071,16 +11721,9 @@ msgstr "" "\t%s\n" "\tXin hãy cáºp nháºt phần cấu hình má»™t cách thủ công nếu cần." -msgid "Renaming remote references" -msgstr "Äổi tên các tham chiếu máy chủ" - -#, c-format -msgid "deleting '%s' failed" -msgstr "gặp lá»—i khi xóa '%s'" - #, c-format -msgid "creating '%s' failed" -msgstr "gặp lá»—i khi tạo '%s'" +msgid "renaming remote refs failed: %s" +msgstr "đổi tên tham chiếu gặp lá»—i: %s" msgid "" "Note: A branch outside the refs/remotes/ hierarchy was not removed;\n" @@ -11354,48 +11997,6 @@ msgstr "" "Gia tăng các repack là không tÆ°Æ¡ng thÃch vá»›i chỉ mục bitmap. Dùng\n" "--no-write-bitmap-index hay tắt cấu hình pack.writeBitmaps." -msgid "could not start pack-objects to repack promisor objects" -msgstr "" -"không thể lấy thông tin thống kê pack-objects để đóng gói lại các đối tượng " -"promisor" - -msgid "failed to feed promisor objects to pack-objects" -msgstr "gặp lá»—i khi Ä‘Æ°a promisor object cho pack-objects" - -msgid "repack: Expecting full hex object ID lines only from pack-objects." -msgstr "" -"repack: Äang chỉ cần các dòng ID đối tượng dạng hexa đầy đủ từ pack-objects." - -msgid "could not finish pack-objects to repack promisor objects" -msgstr "không thể hoà n tất pack-objects để đóng gói các đối tượng promisor" - -#, c-format -msgid "cannot open index for %s" -msgstr "không thể mở chỉ mục cho %s" - -#, c-format -msgid "pack %s too large to consider in geometric progression" -msgstr "gói %s quá lá»›n để xem xét cấp số nhân" - -#, c-format -msgid "pack %s too large to roll up" -msgstr "gói %s quá lá»›n để cuá»™n lại" - -#, c-format -msgid "could not open tempfile %s for writing" -msgstr "không thể mở táºp tin tạm %s để ghi" - -msgid "could not close refs snapshot tempfile" -msgstr "không thể đóng táºp tin snapshot các tham chiếu" - -#, c-format -msgid "could not remove stale bitmap: %s" -msgstr "không thể xoá bá» bitmap đã cÅ©: %s" - -#, c-format -msgid "pack prefix %s does not begin with objdir %s" -msgstr "tiá»n tố gói '%s' không được bắt đầu vá»›i objdir '.%s'" - msgid "pack everything in a single pack" msgstr "đóng gói má»i thứ trong má»™t gói Ä‘Æ¡n" @@ -11492,18 +12093,6 @@ msgstr "tuỳ chá»n '%s' chỉ có thể được dùng vá»›i '%s'" msgid "Nothing new to pack." msgstr "Không có gì má»›i để đóng gói." -#, c-format -msgid "renaming pack to '%s' failed" -msgstr "gặp lá»—i khi đổi tên gói thà nh '%s'" - -#, c-format -msgid "pack-objects did not write a '%s' file for pack %s-%s" -msgstr "pack-objects không ghi táºp tin '%s' cho gói %s-%s" - -#, c-format -msgid "could not unlink: %s" -msgstr "không thể unlink: %s" - msgid "git replace [-f] <object> <replacement>" msgstr "git replace [-f] <đối-tượng> <thay-thế>" @@ -11754,6 +12343,62 @@ msgstr "chÆ°a há»— trợ phát lại đến lần chuyển giao gốc!" msgid "replaying merge commits is not supported yet!" msgstr "chÆ°a há»— trợ phát lại các lần hoà trá»™n!" +#, c-format +msgid "key '%s' not found" +msgstr "không tìm thấy khoá '%s'" + +#, c-format +msgid "invalid format '%s'" +msgstr "định dạng không hợp lệ '%s'" + +msgid "output format" +msgstr "định dạng kết quả" + +msgid "synonym for --format=nul" +msgstr "đồng nghÄ©a vá»›i --format=nul" + +msgid "unsupported output format" +msgstr "không há»— trợ định dạng kết quả: %s" + +msgid "References" +msgstr "kho tham chiếu" + +msgid "Count" +msgstr "Số lượng" + +msgid "Branches" +msgstr "Nhánh" + +msgid "Tags" +msgstr "Thẻ" + +msgid "Remotes" +msgstr "Máy chủ" + +msgid "Others" +msgstr "Khác" + +msgid "Reachable objects" +msgstr "Các đối tượng có thể tá»›i được" + +msgid "Commits" +msgstr "Lần chuyển giao" + +msgid "Trees" +msgstr "Cây" + +msgid "Blobs" +msgstr "Blob" + +msgid "Repository structure" +msgstr "Bố cục kho Git" + +msgid "Value" +msgstr "Giá trị" + +msgid "Counting references" +msgstr "Äang đếm tham chiếu" + msgid "" "git rerere [clear | forget <pathspec>... | diff | status | remaining | gc]" msgstr "" @@ -12335,12 +12980,6 @@ msgstr "git show-ref --exclude-existing[=<mẫu>]" msgid "git show-ref --exists <ref>" msgstr "git show-ref --exists <tham_chiếu>" -msgid "reference does not exist" -msgstr "tham chiếu không tồn tại" - -msgid "failed to look up reference" -msgstr "gặp lá»—i khi tìm tham chiếu" - msgid "only show tags (can be combined with --branches)" msgstr "chỉ hiển thị thẻ (có thể kết hợp vá»›i --branches)" @@ -12370,10 +13009,10 @@ msgstr "hiển thị các tham chiếu từ stdin mà không ở kho ná»™i bá»™" msgid "" "git sparse-checkout (init | list | set | add | reapply | disable | check-" -"rules) [<options>]" +"rules | clean) [<options>]" msgstr "" "git sparse-checkout (init | list | set | add | reapply | disable | check-" -"rules) [<các-tùy-chá»n>]" +"rules| clean) [<các-tùy-chá»n>]" msgid "this worktree is not sparse" msgstr "cây là m việc nà y không thÆ°a" @@ -12414,10 +13053,6 @@ msgid "toggle the use of a sparse index" msgstr "báºt tắt việc sá» dụng sparse index" #, c-format -msgid "unable to create leading directories of %s" -msgstr "không thể tạo các thÆ° mục dẫn đầu của '%s'" - -#, c-format msgid "failed to open '%s'" msgstr "gặp lá»—i khi mở '%s'" @@ -12496,6 +13131,30 @@ msgstr "" msgid "must be in a sparse-checkout to reapply sparsity patterns" msgstr "phải trong sparse-checkout để áp dụng lại các mẫu sparse" +msgid "report each affected file, not just directories" +msgstr "liệt kê các táºp tin cùng thÆ° mục" + +msgid "must be in a sparse-checkout to clean directories" +msgstr "phải trong sparse-checkout để là m sạch thÆ° mục" + +msgid "must be in a cone-mode sparse-checkout to clean directories" +msgstr "phải trong sparse-checkout chế Ä‘á»™ cone để là m sạch thÆ° mục" + +msgid "for safety, refusing to clean without one of --force or --dry-run" +msgstr "từ chối là m sạch mà không có tuỳ chá»n --force hoặc --dry-run" + +msgid "failed to read index" +msgstr "gặp lá»—i Ä‘á»c chỉ mục" + +msgid "" +"failed to convert index to a sparse index; resolve merge conflicts and try " +"again" +msgstr "" + +#, c-format +msgid "failed to remove '%s'" +msgstr "gặp lá»—i khi xoá '%s'" + msgid "error while refreshing working directory" msgstr "gặp lá»—i khi Ä‘á»c lại thÆ° mục là m việc" @@ -14196,9 +14855,6 @@ msgstr "ghi đối tượng cây (tree) cho <tiá»n tố> thÆ° mục con" msgid "only useful for debugging" msgstr "chỉ hữu Ãch khi cần gỡ lá»—i" -msgid "core.fsyncMethod = batch is unsupported on this platform" -msgstr "core.fsyncMethod = batch không được há»— trợ trên ná»n tảng nà y" - #, c-format msgid "could not parse bundle list key %s with value '%s'" msgstr "không thể Ä‘á»c danh sách bundle khoá %s giá trị '%s'" @@ -14596,6 +15252,9 @@ msgstr "Duyệt ngay kho là m việc của bạn trong gitweb" msgid "Add or parse structured information in commit messages" msgstr "Thêm hay Ä‘á»c thông tin cấu trúc trong ghi chú lần chuyển giao" +msgid "EXPERIMENTAL: Show when files were last modified" +msgstr "" + msgid "Show commit logs" msgstr "Hiển thị nháºt ký các lần chuyển giao" @@ -14720,6 +15379,9 @@ msgstr "" "ÄANG TRONG QUà TRÃŒNH THỬ NGHIỆM: Phát lại lần chuyển giao và o gốc má»›i, dùng " "được trong kho chứa bare" +msgid "Retrieve information about the repository" +msgstr "Äá»c thông tin kho chứa" + msgid "Generates a summary of pending changes" msgstr "Tạo ra má»™t tóm tắt các thay đổi còn treo" @@ -14803,8 +15465,8 @@ msgstr "Chuyển sang nhánh khác" msgid "Read, modify and delete symbolic refs" msgstr "Äá»c, sá»a và xóa tham chiếu má»m" -msgid "Create, list, delete or verify a tag object signed with GPG" -msgstr "Tạo, liệt kê, xóa hay xác minh má»™t đối tượng thẻ được ký bằng GPG" +msgid "Create, list, delete or verify tags" +msgstr "Tạo, liệt kê, xóa hay xác minh thẻ" msgid "Creates a temporary file with a blob's contents" msgstr "Tạo má»™t táºp tin tạm vá»›i ná»™i dung của blob" @@ -15650,6 +16312,34 @@ msgstr "không thể phân giải lần cải biên '%s'" msgid "unable to parse command-line config" msgstr "không thể Ä‘á»c cấu hình dòng lệnh" +#, c-format +msgid "" +"\n" +"To use the default comment string (#) please run\n" +"\n" +"%s" +msgstr "" + +msgid "<comment string>" +msgstr "<ghi chú>" + +#, c-format +msgid "" +"\n" +"To set a custom comment string please run\n" +"\n" +"%s\n" +"where '%s' is the string you wish to use.\n" +msgstr "" + +#, c-format +msgid "Support for '%s=auto' has been removed in Git 3.0" +msgstr "" + +#, c-format +msgid "Support for '%s=auto' is deprecated and will be removed in Git 3.0" +msgstr "" + msgid "unknown error occurred while reading the configuration files" msgstr "đã có lá»—i chÆ°a biết xảy ra trong khi Ä‘á»c các táºp tin cấu hình" @@ -16108,7 +16798,7 @@ msgid "skipping '%s', which is neither file nor directory" msgstr "Ä‘ang bá» qua '%s', không phải là má»™t táºp tin hay thÆ° mục" msgid "could not duplicate stdout" -msgstr "không thể nhân bản stdout" +msgstr "không thể dup stdout" #, c-format msgid "could not add directory '%s' to archiver" @@ -16117,8 +16807,14 @@ msgstr "không thể thêm thÆ° mục '%s' và o kho nén" msgid "failed to write archive" msgstr "gặp lá»—i khi ghi kho nén" +msgid "max-depth is not supported for worktree diffs" +msgstr "không há»— trợ max-depth cho diff ở cây là m việc" + +msgid "max-depth is not supported for index diffs" +msgstr "không há»— trợ max-depth cho diff chỉ mục" + msgid "--merge-base does not work with ranges" -msgstr "--merge-base không thể dùng vá»›i chỉ vùng" +msgstr "--merge-base không thể dùng vá»›i vùng" msgid "unable to get HEAD" msgstr "không thể lấy HEAD" @@ -16625,6 +17321,12 @@ msgstr "[(A|C|D|M|R|T|U|X|B)...[*]]" msgid "select files by diff type" msgstr "chá»n các táºp tin theo kiểu khác biệt" +msgid "<depth>" +msgstr "<Ä‘á»™-sâu>" + +msgid "maximum tree depth to recurse" +msgstr "Ä‘á»™ sâu đệ quy tối Ä‘a" + msgid "<file>" msgstr "<táºp tin>" @@ -16817,10 +17519,6 @@ msgid "invalid unshallow line: %s" msgstr "dòng unshallow không hợp lệ: %s" #, c-format -msgid "object not found: %s" -msgstr "không tìm thấy đối tượng: %s" - -#, c-format msgid "error in object: %s" msgstr "lá»—i trong đối tượng: %s" @@ -17103,6 +17801,11 @@ msgstr "là m trống bà danh cho %s" msgid "recursive alias: %s" msgstr "đệ quy các bà danh: %s" +#, c-format +msgid "alias loop detected: expansion of '%s' does not terminate:%s" +msgstr "" +"dò tìm thấy các bà danh quẩn tròn: biểu thức của '%s' không có Ä‘iểm kết:%s" + msgid "write failure on standard output" msgstr "lá»—i khi ghi ra stdout" @@ -17113,11 +17816,6 @@ msgid "close failed on standard output" msgstr "lá»—i khi đóng stdout" #, c-format -msgid "alias loop detected: expansion of '%s' does not terminate:%s" -msgstr "" -"dò tìm thấy các bà danh quẩn tròn: biểu thức của '%s' không có Ä‘iểm kết:%s" - -#, c-format msgid "cannot handle %s as a builtin" msgstr "không thể xá» lý %s nhÆ° là builtin" @@ -17168,7 +17866,11 @@ msgstr "chữ sai / không tÆ°Æ¡ng thÃch '%s'" #, c-format msgid "failed to get the ssh fingerprint for key '%s'" -msgstr "gặp lá»—i khi lấy dấu vân tay ssh cho khóa '%s'" +msgstr "gặp lá»—i khi lấy ssh fingerprint cho khóa '%s'" + +#, c-format +msgid "failed to get the ssh fingerprint for key %s" +msgstr "gặp lá»—i khi lấy ssh fingerprint cho khóa %s" msgid "" "either user.signingkey or gpg.ssh.defaultKeyCommand needs to be configured" @@ -17176,6 +17878,10 @@ msgstr "" "hoặc là user.signingkey hoặc gpg.ssh.defaultKeyCommand cần được cấu hình" #, c-format +msgid "malformed build-time gpg.ssh.defaultKeyCommand: %s" +msgstr "gpg.ssh.defaultKeyCommand sai quy cách: %s" + +#, c-format msgid "gpg.ssh.defaultKeyCommand succeeded but returned no keys: %s %s" msgstr "" "gpg.ssh.defaultKeyCommand thà nh công nhÆ°ng lại không trả vá» khóa nà o: %s %s" @@ -17425,6 +18131,11 @@ msgstr "" " há»i cho: %s\n" " chuyển hÆ°á»›ng: %s" +#, c-format +msgid "" +"number too large to represent as curl_off_t on this platform: %<PRIuMAX>" +msgstr "" + msgid "Author identity unknown\n" msgstr "ChÆ°a biết định danh tác giả\n" @@ -17880,10 +18591,6 @@ msgid "could not load pack" msgstr "không thể tải gói" #, c-format -msgid "could not open index for %s" -msgstr "không thể mở chỉ mục cho %s" - -#, c-format msgid "unable to link '%s' to '%s'" msgstr "không thể liên kết '%s' và o '%s'" @@ -17906,6 +18613,10 @@ msgid "unknown preferred pack: '%s'" msgstr "không hiểu preferred pack: %s" #, c-format +msgid "failed to open preferred pack %s" +msgstr "gặp lá»—i khi mở preferred pack %s" + +#, c-format msgid "cannot select preferred pack %s with no objects" msgstr "không thể chá»n gói Æ°a dùng %s vá»›i không đối tượng nà o" @@ -17929,6 +18640,9 @@ msgstr "không thể tạo lá»›p MIDX tạm thá»i" msgid "could not write multi-pack bitmap" msgstr "không thể ghi multi-pack bitmap" +msgid "too many multi-pack-indexes" +msgstr "quá nhiá»u multi-pack-indexes" + msgid "unable to open multi-pack-index chain file" msgstr "không thể mở táºp tin chain multi-pack-index" @@ -18192,10 +18906,6 @@ msgid "files '%s' and '%s' differ in contents" msgstr "táºp tin '%s' và '%s' có ná»™i dung khác nhau" #, c-format -msgid "unable to write file %s" -msgstr "không thể ghi táºp tin %s" - -#, c-format msgid "unable to write repeatedly vanishing file %s" msgstr "không thể ghi và o táºp tin biến mất liên tục %s" @@ -18203,6 +18913,9 @@ msgstr "không thể ghi và o táºp tin biến mất liên tục %s" msgid "unable to set permission to '%s'" msgstr "không thể đặt quyá»n thà nh '%s'" +msgid "core.fsyncMethod = batch is unsupported on this platform" +msgstr "core.fsyncMethod = batch không được há»— trợ trên ná»n tảng nà y" + msgid "error when closing loose object file" msgstr "gặp lá»—i trong khi đóng táºp tin đối tượng" @@ -18698,6 +19411,21 @@ msgstr "táºp tin mtimes %s có mã băm không được há»— trợ %<PRIu32>" msgid "mtimes file %s is corrupt" msgstr "táºp tin mtimes %s bị há»ng" +msgid "pack everything" +msgstr "đóng gói má»i thứ" + +msgid "prune loose refs (default)" +msgstr "prune (cắt cụt) những tham chiếu bị mất (mặc định)" + +msgid "auto-pack refs as needed" +msgstr "tá»± Ä‘á»™ng pack tham chiếu nếu cần" + +msgid "references to include" +msgstr "bao gồm các tham chiếu" + +msgid "references to exclude" +msgstr "loại trừ các tham chiếu" + #, c-format msgid "reverse-index file %s is too small" msgstr "táºp tin reverse-index %s quá nhá»" @@ -19121,6 +19849,10 @@ msgid "could not fetch %s from promisor remote" msgstr "không thể tải %s từ máy chủ promisor" #, c-format +msgid "unsupported field '%s' in '%s' config" +msgstr "" + +#, c-format msgid "no or empty URL advertised for remote '%s'" msgstr "URL máy chủ '%s' rá»—ng hoặc không có" @@ -19129,12 +19861,16 @@ msgid "known remote named '%s' but with URL '%s' instead of '%s'" msgstr "có máy chủ '%s' nhÆ°ng vá»›i URL '%s' thay vì '%s'" #, c-format -msgid "unknown '%s' value for '%s' config option" -msgstr "không hiểu giá trị '%s' cho cấu hình '%s'" +msgid "invalid element '%s' from remote info" +msgstr "không hiểu phần '%s' từ thông tin máy chủ" #, c-format -msgid "unknown element '%s' from remote info" -msgstr "không hiểu phần '%s' từ thông tin máy chủ" +msgid "server advertised a promisor remote without a name or URL: %s" +msgstr "" + +#, c-format +msgid "unknown '%s' value for '%s' config option" +msgstr "không hiểu giá trị '%s' cho cấu hình '%s'" #, c-format msgid "accepted promisor remote '%s' not found" @@ -19228,6 +19964,13 @@ msgid "failed to generate diff" msgstr "gặp lá»—i khi tạo khác biệt" #, c-format +msgid "" +"range-diff: unable to compute the range-diff, since it exceeds the maximum " +"memory for the cost matrix: %s (%<PRIuMAX> bytes) needed, limited to %s " +"(%<PRIuMAX> bytes)" +msgstr "" + +#, c-format msgid "could not parse log for '%s'" msgstr "không thể Ä‘á»c nháºt ký cho '%s'" @@ -19758,6 +20501,9 @@ msgstr "không phải má»™t reflog: %s" msgid "no reflog for '%s'" msgstr "không reflog cho '%s'" +msgid "Checking references consistency" +msgstr "Äang kiểm tra tÃnh nhất quán các tham chiếu" + #, c-format msgid "%s does not point to a valid object!" msgstr "'%s' không chỉ đến má»™t lần chuyển giao hợp lệ nà o cả!" @@ -19773,8 +20519,9 @@ msgstr "%s%s đã trở thà nh không đầu sau khi xoá %s!\n" #, c-format msgid "" "Using '%s' as the name for the initial branch. This default branch name\n" -"is subject to change. To configure the initial branch name to use in all\n" -"of your new repositories, which will suppress this warning, call:\n" +"will change to \"main\" in Git 3.0. To configure the initial branch name\n" +"to use in all of your new repositories, which will suppress this warning,\n" +"call:\n" "\n" "\tgit config --global init.defaultBranch <name>\n" "\n" @@ -19783,9 +20530,9 @@ msgid "" "\n" "\tgit branch -m <name>\n" msgstr "" -"Sá» dụng '%s' là m tên cho nhánh ban đầu. Tên nhánh mặc định nà y\n" -"có thể thay đổi. Äể cấu hình tên nhánh khởi đầu sá» dụng trong tất cả\n" -"kho lÆ°u trữ má»›i của bạn, cái mà sẽ ngăn chặn cảnh báo nà y, gá»i lệnh:\n" +"Sá» dụng '%s' là m tên cho nhánh ban đầu. Tên nhánh mặc định\n" +"sẽ thay đổi sang \"main\" từ Git 3.0. Äể cấu hình tên nhánh ban đầu cho\n" +"tất cả kho lÆ°u trữ má»›i của bạn, và ngăn chặn cảnh báo nà y, gá»i lệnh:\n" "\n" "\tgit config --global init.defaultBranch <tên>\n" "\n" @@ -19795,6 +20542,20 @@ msgstr "" "\tgit branch -m <tên>\n" #, c-format +msgid "" +"Using '%s' as the name for the initial branch since Git 3.0.\n" +"If you expected Git to create 'master', the just-created\n" +"branch can be renamed via this command:\n" +"\n" +"\tgit branch -m master\n" +msgstr "" +"Sá» dụng '%s' là m tên cho nhánh ban đầu kể từ Git 3.0. \n" +"Nếu bạn muốn git tạo nhánh 'master', nhánh vừa tạo có thể được\n" +"đổi tên thông qua lệnh:\n" +"\n" +"\tgit branch -m master\n" + +#, c-format msgid "could not retrieve `%s`" msgstr "không thể lấy vá» '%s'" @@ -19879,6 +20640,18 @@ msgstr "không thể xoá thÆ° mục tạm thá»i '%s'" msgid "migrated refs can be found at '%s'" msgstr "ydam chiếu đã di cÆ° tại '%s'" +msgid "" +"'core.preferSymlinkRefs=true' is nominated for removal.\n" +"hint: The use of symbolic links for symbolic refs is deprecated\n" +"hint: and will be removed in Git 3.0. The configuration that\n" +"hint: tells Git to use them is thus going away. You can unset\n" +"hint: it with:\n" +"hint:\n" +"hint:\tgit config unset core.preferSymlinkRefs\n" +"hint:\n" +"hint: Git will then use the textual symref format instead." +msgstr "" + #, c-format msgid "" "cannot lock ref '%s': expected symref with target '%s': but is a regular ref" @@ -19887,6 +20660,10 @@ msgstr "" "tham chiếu thÆ°á»ng" #, c-format +msgid "trying to write reflog for '%s' with incomplete values" +msgstr "thá» ghi tham chiếu cho '%s' không đầy đủ giá trị" + +#, c-format msgid "cannot read ref file '%s'" msgstr "không thể Ä‘á»c táºp tin ref '%s'" @@ -19894,9 +20671,6 @@ msgstr "không thể Ä‘á»c táºp tin ref '%s'" msgid "cannot open directory %s" msgstr "không thể mở thÆ° mục %s" -msgid "Checking references consistency" -msgstr "Äang kiểm tra tÃnh nhất quán các tham chiếu" - #, c-format msgid "unable to open '%s'" msgstr "không thể mở '%s'" @@ -19937,6 +20711,10 @@ msgstr "" "chiếu biểu trÆ°ng '%s')" #, c-format +msgid "cannot lock ref '%s': dangling symref already exists" +msgstr "không thể lock tham chiếu '%s': tham chiếu biểu trÆ°ng đã tồn tại" + +#, c-format msgid "cannot lock ref '%s': reference already exists" msgstr "không thể lock tham chiếu '%s': tham chiếu đã tồn tại" @@ -20036,9 +20814,6 @@ msgstr "remote-curl: gặp đáp ứng là gói kết thúc bất ngá»" msgid "RPC failed; %s" msgstr "RPC gặp lá»—i; %s" -msgid "cannot handle pushes this big" -msgstr "không thể xá» lý đẩy lá»›n cỡ nà y" - #, c-format msgid "cannot deflate request; zlib deflate error %d" msgstr "không thể giải nén yêu cầu; lá»—i zlib deflate %d" @@ -20226,6 +21001,11 @@ msgstr "" "'%s:refs/tags/%s'?" #, c-format +msgid "" +"The <src> part of the refspec ('%s') is an object ID that doesn't exist.\n" +msgstr "" + +#, c-format msgid "%s cannot be resolved to branch" msgstr "'%s' không thể được phân giải thà nh nhánh" @@ -20347,6 +21127,60 @@ msgid "cannot strip one component off url '%s'" msgstr "không thể cắt bá» má»™t thà nh phần ra khá»i '%s' url" #, c-format +msgid "cannot open index for %s" +msgstr "không thể mở chỉ mục cho %s" + +#, c-format +msgid "pack %s too large to consider in geometric progression" +msgstr "gói %s quá lá»›n để xem xét cấp số nhân" + +#, c-format +msgid "pack %s too large to roll up" +msgstr "gói %s quá lá»›n để cuá»™n lại" + +#, c-format +msgid "could not open tempfile %s for writing" +msgstr "không thể mở táºp tin tạm %s để ghi" + +msgid "could not close refs snapshot tempfile" +msgstr "không thể đóng táºp tin snapshot các tham chiếu" + +#, c-format +msgid "could not remove stale bitmap: %s" +msgstr "không thể xoá bá» bitmap đã cÅ©: %s" + +msgid "could not start pack-objects to repack promisor objects" +msgstr "" +"không thể lấy thông tin thống kê pack-objects để đóng gói lại các đối tượng " +"promisor" + +msgid "failed to feed promisor objects to pack-objects" +msgstr "gặp lá»—i khi Ä‘Æ°a promisor object cho pack-objects" + +msgid "repack: Expecting full hex object ID lines only from pack-objects." +msgstr "" +"repack: Äang chỉ cần các dòng ID đối tượng dạng hexa đầy đủ từ pack-objects." + +msgid "could not finish pack-objects to repack promisor objects" +msgstr "không thể hoà n tất pack-objects để đóng gói các đối tượng promisor" + +#, c-format +msgid "pack prefix %s does not begin with objdir %s" +msgstr "tiá»n tố gói '%s' không được bắt đầu vá»›i objdir '.%s'" + +#, c-format +msgid "renaming pack to '%s' failed" +msgstr "gặp lá»—i khi đổi tên gói thà nh '%s'" + +#, c-format +msgid "pack-objects did not write a '%s' file for pack %s-%s" +msgstr "pack-objects không ghi táºp tin '%s' cho gói %s-%s" + +#, c-format +msgid "could not unlink: %s" +msgstr "không thể unlink: %s" + +#, c-format msgid "bad replace ref name: %s" msgstr "tên tham chiếu thay thế bị sai: %s" @@ -21654,9 +22488,6 @@ msgstr "không phải là kho git: '%s'" msgid "cannot chdir to '%s'" msgstr "không thể chdir (chuyển thÆ° mục) sang '%s'" -msgid "cannot come back to cwd" -msgstr "không thể quay lại thÆ° mục là m việc hiện hà nh" - #, c-format msgid "failed to stat '%*s%s%s'" msgstr "gặp lá»—i khi stat'%*s%s%s'" @@ -22730,18 +23561,32 @@ msgid "warning: " msgstr "cảnh báo: " #, c-format +msgid "'%s' is nominated for removal.\n" +msgstr "'%s' được Ä‘á» cá» loại bá».\n" + +#, c-format msgid "" -"'%s' is nominated for removal.\n" -"If you still use this command, please add an extra\n" -"option, '--i-still-use-this', on the command line\n" -"and let us know you still use it by sending an e-mail\n" -"to <git@vger.kernel.org>. Thanks.\n" +"If you still use this command, here's what you can do:\n" +"\n" +"- read https://git-scm.com/docs/BreakingChanges.html\n" +"- check if anyone has discussed this on the mailing\n" +" list and if they came up with something that can\n" +" help you: https://lore.kernel.org/git/?q=%s\n" +"- send an email to <git@vger.kernel.org> to let us\n" +" know that you still use this command and were unable\n" +" to determine a suitable replacement\n" +"\n" msgstr "" -"'%s' đã được Ä‘á» cỠđể loại bá».\n" -"Nếu bạn vẫn còn sá» dụng lệnh nà y, vui lòng bổ sung\n" -"thêm má»™t tùy chá»n, '--i-still-use-this', trên dòng lệnh\n" -"và cho chúng tôi biết bạn vẫn sá» dụng nó bằng cách gá»i e-mail\n" -"đến <git@vger.kernel.org>. Xin cảm Æ¡n.\n" +"Nếu bạn vẫn còn dùng lệnh nà y, hãy là m theo các bÆ°á»›c sau:\n" +"\n" +"- Ä‘á»c https://git-scm.com/docs/BreakingChanges.html\n" +"- kiểm tra xem có ai khác đã thảo luáºn trên mailing\n" +" list và có cách giúp bạn:\n" +" https://lore.kernel.org/git/?q=%s\n" +"- gá»i email tá»›i <git@vger.kernel.org> để chúng tôi biết\n" +" bạn vẫn còng dùng lệnh nà y và không thể tìm phÆ°Æ¡ng án\n" +" thay thế\n" +"\n" msgid "refusing to run without --i-still-use-this" msgstr "từ chối chạy lệnh nà y mà không có --i-still-use-this" @@ -23604,6 +24449,9 @@ msgstr "Gá»i email nà y chứ? ([y]có|[n]không|[e]sá»a|[q]thoát|[a]tất cá msgid "Send this email reply required" msgstr "Hãy trả lá»i yêu cầu gá»i email" +msgid "The destination IMAP folder is not properly defined." +msgstr "ThÆ° mục IMAP Ä‘Ãch chÆ°a được định nghÄ©a đúng cách." + msgid "The required SMTP server is not properly defined." msgstr "Máy chủ SMTP chÆ°a được định nghÄ©a đúng cách." @@ -23727,6 +24575,64 @@ msgstr "Bá» qua %s vá»›i háºu tố sao lÆ°u '%s'.\n" msgid "Do you really want to send %s? [y|N]: " msgstr "Bạn có thá»±c sá»± muốn gá»i %s? [y|N](có/KHÔNG): " +#~ msgid "No previous hunk" +#~ msgstr "Không có khúc kế trÆ°á»›c" + +#~ msgid "No next hunk" +#~ msgstr "Không có khúc kế tiếp" + +#~ msgid "git for-each-ref [<options>] [<pattern>]" +#~ msgstr "git for-each-ref [<các tùy chá»n>] [<mẫu>]" + +#~ msgid "git for-each-ref [--merged [<commit>]] [--no-merged [<commit>]]" +#~ msgstr "" +#~ "git for-each-ref [--merged [<lần-chuyển-giao>]] [--no-merged [<lần-chuyển-" +#~ "giao>]]" + +#~ msgid "git for-each-ref [--contains [<commit>]] [--no-contains [<commit>]]" +#~ msgstr "" +#~ "git for-each-ref [--contains [<lần-chuyển-giao>]] [--no-contains [<lần-" +#~ "chuyển-giao>]]" + +#~ msgid "git for-each-ref [--start-after <marker>]" +#~ msgstr "git for-each-ref [--start-after <dấu>]" + +#~ msgid "" +#~ "git pack-refs [--all] [--no-prune] [--auto] [--include <pattern>] [--" +#~ "exclude <pattern>]" +#~ msgstr "" +#~ "git pack-refs [--all] [--no-prune] [--auto] [--include <pattern>] [--" +#~ "exclude <pattern>]" + +#, c-format +#~ msgid "deleting '%s' failed" +#~ msgstr "gặp lá»—i khi xóa '%s'" + +#, c-format +#~ msgid "creating '%s' failed" +#~ msgstr "gặp lá»—i khi tạo '%s'" + +#, c-format +#~ msgid "could not open index for %s" +#~ msgstr "không thể mở chỉ mục cho %s" + +#~ msgid "cannot handle pushes this big" +#~ msgstr "không thể xá» lý đẩy lá»›n cỡ nà y" + +#, c-format +#~ msgid "" +#~ "'%s' is nominated for removal.\n" +#~ "If you still use this command, please add an extra\n" +#~ "option, '--i-still-use-this', on the command line\n" +#~ "and let us know you still use it by sending an e-mail\n" +#~ "to <git@vger.kernel.org>. Thanks.\n" +#~ msgstr "" +#~ "'%s' đã được Ä‘á» cỠđể loại bá».\n" +#~ "Nếu bạn vẫn còn sá» dụng lệnh nà y, vui lòng bổ sung\n" +#~ "thêm má»™t tùy chá»n, '--i-still-use-this', trên dòng lệnh\n" +#~ "và cho chúng tôi biết bạn vẫn sá» dụng nó bằng cách gá»i e-mail\n" +#~ "đến <git@vger.kernel.org>. Xin cảm Æ¡n.\n" + #~ msgid "start-after" #~ msgstr "start-after" @@ -23778,10 +24684,6 @@ msgstr "Bạn có thá»±c sá»± muốn gá»i %s? [y|N](có/KHÔNG): " #~ msgstr "không thể dùng tùy chá»n --stdin-packs vá»›i --cruft" #, c-format -#~ msgid "%s points nowhere!" -#~ msgstr "%s chẳng chỉ đến đâu cả!" - -#, c-format #~ msgid "unreachable: invalid reference: %s" #~ msgstr "không tham chiếu được: tham chiếu không hợp lệ: %s" @@ -23986,10 +24888,6 @@ msgstr "Bạn có thá»±c sá»± muốn gá»i %s? [y|N](có/KHÔNG): " #~ "mục %s->%s trong %s" #, c-format -#~ msgid "cannot read object %s" -#~ msgstr "không thể Ä‘á»c đối tượng %s" - -#, c-format #~ msgid "object %s is not a blob" #~ msgstr "đối tượng %s không phải là má»™t blob" diff --git a/po/zh_CN.po b/po/zh_CN.po index a0d43c5333..db7518c9b8 100644 --- a/po/zh_CN.po +++ b/po/zh_CN.po @@ -155,8 +155,8 @@ msgid "" msgstr "" "Project-Id-Version: Git\n" "Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n" -"POT-Creation-Date: 2025-08-12 20:20-0400\n" -"PO-Revision-Date: 2025-08-17 08:14-0400\n" +"POT-Creation-Date: 2025-11-15 22:02+0800\n" +"PO-Revision-Date: 2025-11-16 01:03+0800\n" "Last-Translator: Teng Long <dyroneteng@gmail.com>\n" "Language-Team: GitHub <https://github.com/dyrone/git/>\n" "Language: zh_CN\n" @@ -782,26 +782,28 @@ msgstr "未应用。\n" #: add-patch.c msgid "" -"j - leave this hunk undecided, see next undecided hunk\n" -"J - leave this hunk undecided, see next hunk\n" -"k - leave this hunk undecided, see previous undecided hunk\n" -"K - leave this hunk undecided, see previous hunk\n" +"j - go to the next undecided hunk, roll over at the bottom\n" +"J - go to the next hunk, roll over at the bottom\n" +"k - go to the previous undecided hunk, roll over at the top\n" +"K - go to the previous hunk, roll over at the top\n" "g - select a hunk to go to\n" "/ - search for a hunk matching the given regex\n" "s - split the current hunk into smaller hunks\n" "e - manually edit the current hunk\n" -"p - print the current hunk, 'P' to use the pager\n" +"p - print the current hunk\n" +"P - print the current hunk using the pager\n" "? - print help\n" msgstr "" -"j - ç»´æŒè¯¥å—未决状æ€ï¼ŒæŸ¥çœ‹ä¸‹ä¸€ä¸ªæœªå†³å—\n" -"J - ç»´æŒè¯¥å—未决状æ€ï¼ŒæŸ¥çœ‹ä¸‹ä¸€ä¸ªå—\n" -"k - ç»´æŒè¯¥å—未决状æ€ï¼ŒæŸ¥çœ‹ä¸Šä¸€ä¸ªæœªå†³å—\n" -"K - ç»´æŒè¯¥å—未决状æ€ï¼ŒæŸ¥çœ‹ä¸Šä¸€ä¸ªå—\n" -"g - 选择跳转到一个å—\n" +"j - 跳转至下一个未决定å—，在底部翻页\n" +"J - 跳转至下一个å—，在底部翻页\n" +"k - 跳转至上一个未决定å—，在顶部翻页\n" +"K - 跳转至上一个å—，在顶部翻页\n" +"g - 选择è¦è·³è½¬çš„å—\n" "/ - 查找和给定æ£åˆ™è¡¨è¾¾å¼åŒ¹é…çš„å—\n" "s - 拆分当å‰å—为更å°çš„å—\n" "e - 手动编辑当å‰å—\n" -"p - 显示当å‰å—, 'P' 使用分页器\n" +"p - 显示当å‰å—\n" +"P - 使用分页器显示当å‰å—\n" "? - 显示帮助\n" #: add-patch.c @@ -810,12 +812,12 @@ msgid "Only one letter is expected, got '%s'" msgstr "预期åªæœ‰ä¸€ä¸ªå—æ¯ï¼Œå¾—到 '%s'" #: add-patch.c -msgid "No previous hunk" -msgstr "没有å‰ä¸€ä¸ªå—" +msgid "No other hunk" +msgstr "没有其它å—" #: add-patch.c -msgid "No next hunk" -msgstr "没有下一个å—" +msgid "No other undecided hunk" +msgstr "没有其它未决定的å—" #: add-patch.c msgid "No other hunks to goto" @@ -1060,7 +1062,8 @@ msgid "unclosed quote" msgstr "未关é—的引å·" #: alias.c builtin/cat-file.c builtin/notes.c builtin/prune-packed.c -#: builtin/receive-pack.c builtin/refs.c builtin/tag.c t/helper/test-pkt-line.c +#: builtin/receive-pack.c builtin/refs.c builtin/repo.c builtin/tag.c +#: t/helper/test-pkt-line.c msgid "too many arguments" msgstr "太多å‚æ•°" @@ -1374,7 +1377,7 @@ msgstr "%s：错误类型" msgid "%s has type %o, expected %o" msgstr "%s 的类型是 %o，应为 %o" -#: apply.c read-cache.c +#: apply.c builtin/fast-import.c read-cache.c #, c-format msgid "invalid path '%s'" msgstr "æ— æ•ˆè·¯å¾„ '%s'" @@ -1753,7 +1756,7 @@ msgstr "" msgid "git archive --remote <repo> [--exec <cmd>] --list" msgstr "git archive --remote <仓库> [--exec <命令>] --list" -#: archive.c builtin/gc.c builtin/notes.c builtin/tag.c +#: archive.c builtin/fast-import.c builtin/gc.c builtin/notes.c builtin/tag.c #, c-format msgid "cannot read '%s'" msgstr "ä¸èƒ½è¯»å– '%s'" @@ -2112,9 +2115,9 @@ msgstr "--contents å’Œ --reverse ä¸èƒ½æ··ç”¨ã€‚" msgid "--reverse and --first-parent together require specified latest commit" msgstr "--reverse å’Œ --first-parent 共用，需è¦æŒ‡å®šæœ€æ–°çš„æ交" -#: blame.c builtin/bisect.c builtin/commit.c builtin/log.c builtin/merge.c -#: builtin/pack-objects.c builtin/shortlog.c midx-write.c pack-bitmap.c -#: remote.c sequencer.c submodule.c +#: blame.c builtin/bisect.c builtin/commit.c builtin/fast-export.c +#: builtin/log.c builtin/merge.c builtin/pack-objects.c builtin/shortlog.c +#: midx-write.c pack-bitmap.c remote.c sequencer.c submodule.c msgid "revision walk setup failed" msgstr "版本é历åˆå§‹åŒ–失败" @@ -2353,7 +2356,7 @@ msgstr "ä¸‹åˆ—è·¯å¾„æ ¹æ®æ‚¨çš„一个 .gitignore 文件而被忽略：\n" #: builtin/add.c builtin/clean.c builtin/fetch.c builtin/mv.c #: builtin/prune-packed.c builtin/pull.c builtin/push.c builtin/remote.c -#: builtin/rm.c builtin/send-pack.c +#: builtin/rm.c builtin/send-pack.c builtin/sparse-checkout.c msgid "dry run" msgstr "æ¼”ä¹ " @@ -2508,8 +2511,8 @@ msgid "bad action '%s' for '%s'" msgstr "'%2$s' 的错误动作 '%1$s'" #: builtin/am.c builtin/blame.c builtin/fetch.c builtin/pack-objects.c -#: builtin/pull.c builtin/revert.c diff-merges.c environment.c gpg-interface.c -#: ls-refs.c parallel-checkout.c sequencer.c setup.c +#: builtin/pull.c builtin/revert.c diff-merges.c diff.c environment.c +#: gpg-interface.c ls-refs.c parallel-checkout.c sequencer.c setup.c #, c-format msgid "invalid value for '%s': '%s'" msgstr "'%s' çš„å€¼æ— æ•ˆï¼š'%s'" @@ -2845,7 +2848,8 @@ msgstr "n" #: builtin/am.c builtin/branch.c builtin/bugreport.c builtin/cat-file.c #: builtin/clone.c builtin/diagnose.c builtin/for-each-ref.c builtin/init-db.c #: builtin/ls-files.c builtin/ls-tree.c builtin/refs.c builtin/replace.c -#: builtin/submodule--helper.c builtin/tag.c builtin/verify-tag.c +#: builtin/repo.c builtin/submodule--helper.c builtin/tag.c +#: builtin/verify-tag.c msgid "format" msgstr "æ ¼å¼" @@ -2991,15 +2995,21 @@ msgstr "将缺少的对象é™åˆ¶åœ¨å½“å‰çš„稀ç–检出ä¸" #: builtin/bisect.c msgid "" -"git bisect start [--term-(new|bad)=<term> --term-(old|good)=<term>] [--no-" -"checkout] [--first-parent] [<bad> [<good>...]] [--] [<pathspec>...]" +"git bisect start [--term-(bad|new)=<term-new> --term-(good|old)=<term-old>]\n" +" [--no-checkout] [--first-parent] [<bad> [<good>...]] [--] " +"[<pathspec>...]" msgstr "" -"git bisect start [--term-{new|bad}=<术è¯> --term-{old|good}=<术è¯>] [--no-" -"checkout] [--first-parent] [<å> [<好>...]] [--] [<è·¯å¾„è§„æ ¼>...]" +"git bisect start [--term-(bad|new)=<新术è¯> --term-(good|old)=<旧术è¯>]\n" +" [--no-checkout] [--first-parent] [<å> [<好>...]] [--] [<è·¯" +"å¾„è§„æ ¼>...]" + +#: builtin/bisect.c +msgid "git bisect (bad|new|<term-new>) [<rev>]" +msgstr "git bisect (bad|new|<新术è¯>) [<版本>]" #: builtin/bisect.c -msgid "git bisect (good|bad) [<rev>...]" -msgstr "git bisect (good|bad) [<版本>...]" +msgid "git bisect (good|old|<term-old>) [<rev>...]" +msgstr "git bisect (good|old|<旧术è¯>) [<版本>...]" #: builtin/bisect.c msgid "git bisect skip [(<rev>|<range>)...]" @@ -3830,8 +3840,8 @@ msgstr "HEAD 没有ä½äºŽ /refs/heads 之下ï¼" #: builtin/branch.c msgid "" -"branch with --recurse-submodules can only be used if submodule." -"propagateBranches is enabled" +"branch with --recurse-submodules can only be used if " +"submodule.propagateBranches is enabled" msgstr "" "带有 --recurse-submodules 的分支åªèƒ½åœ¨ submodule.propagateBranches å¯ç”¨æ—¶ä½¿ç”¨" @@ -4380,7 +4390,7 @@ msgstr "è¿˜ä»Žæ ‡å‡†è¾“å…¥è¯»å–è”系地å€" msgid "read additional mailmap entries from file" msgstr "从文件ä¸è¯»å–é™„åŠ é‚®ä»¶æ˜ å°„æ¡ç›®" -#: builtin/check-mailmap.c +#: builtin/check-mailmap.c builtin/fast-import.c msgid "blob" msgstr "æ•°æ®å¯¹è±¡" @@ -4993,12 +5003,12 @@ msgid "" msgstr "" "git clean [-d] [-f] [-i] [-n] [-q] [-e <模å¼>] [-x | -X] [--] <è·¯å¾„è§„æ ¼>..." -#: builtin/clean.c +#: builtin/clean.c builtin/sparse-checkout.c #, c-format msgid "Removing %s\n" msgstr "æ£åˆ 除 %s\n" -#: builtin/clean.c +#: builtin/clean.c builtin/sparse-checkout.c #, c-format msgid "Would remove %s\n" msgstr "å°†åˆ é™¤ %s\n" @@ -5016,7 +5026,7 @@ msgstr "将忽略仓库 %s\n" #: builtin/clean.c midx.c #, c-format msgid "failed to remove %s" -msgstr "æ— æ³•åˆ é™¤ %s" +msgstr "æ— æ³•åˆ é™¤ '%s'" #: builtin/clean.c #, c-format @@ -5122,7 +5132,7 @@ msgstr "没有è¦æ¸…ç†çš„文件，退出。" msgid "do not print names of files removed" msgstr "ä¸æ‰“å°åˆ 除文件的å称" -#: builtin/clean.c +#: builtin/clean.c builtin/sparse-checkout.c msgid "force" msgstr "强制" @@ -5135,8 +5145,8 @@ msgid "remove whole directories" msgstr "åˆ é™¤æ•´ä¸ªç›®å½•" #: builtin/clean.c builtin/config.c builtin/describe.c builtin/grep.c -#: builtin/log.c builtin/ls-files.c builtin/name-rev.c builtin/pack-refs.c -#: builtin/show-ref.c ref-filter.h +#: builtin/log.c builtin/ls-files.c builtin/name-rev.c builtin/show-ref.c +#: pack-refs.c ref-filter.h msgid "pattern" msgstr "模å¼" @@ -6952,6 +6962,16 @@ msgstr "找到 %i ä¸ªæ ‡ç¾ï¼›åœ¨ %s 处放弃æœç´¢\n" #: builtin/describe.c #, c-format +msgid "cannot search for blob '%s' on an unborn branch" +msgstr "æ— æ³•åœ¨å°šæœªè¯žç”Ÿçš„åˆ†æ”¯ä¸Šæœç´¢æ•°æ®å¯¹è±¡ '%s'" + +#: builtin/describe.c +#, c-format +msgid "blob '%s' not reachable from HEAD" +msgstr "æ•°æ®å¯¹è±¡ '%s' 从 HEAD ä¸å¯è¾¾" + +#: builtin/describe.c +#, c-format msgid "describe %s\n" msgstr "æè¿° %s\n" @@ -7131,6 +7151,10 @@ msgstr "æ— æ•ˆé€‰é¡¹ï¼š%s" msgid "%s...%s: no merge base" msgstr "%s...%sï¼šæ— åˆå¹¶åŸºçº¿" +#: builtin/diff.c setup.c +msgid "cannot come back to cwd" +msgstr "æ— æ³•è¿”å›žå½“å‰å·¥ä½œç›®å½•" + #: builtin/diff.c msgid "Not a git repository" msgstr "ä¸æ˜¯ git 仓库" @@ -7269,8 +7293,162 @@ msgid "git fast-export [<rev-list-opts>]" msgstr "git fast-export [<rev-list 选项>]" #: builtin/fast-export.c -msgid "Error: Cannot export nested tags unless --mark-tags is specified." -msgstr "错误：除éžæŒ‡å®š --mark-tags，å¦åˆ™æ— æ³•å¯¼å‡ºåµŒå¥—æ ‡ç¾ã€‚" +#, c-format +msgid "unknown %s mode: %s" +msgstr "未知 %s 模å¼ï¼š%s" + +#: builtin/fast-export.c +#, c-format +msgid "unknown tag-of-filtered mode: %s" +msgstr "未知 tag-of-filtered 模å¼ï¼š%s" + +#: builtin/fast-export.c +#, c-format +msgid "unknown reencoding mode: %s" +msgstr "未知é‡ç¼–ç 模å¼ï¼š%s" + +#: builtin/fast-export.c +#, c-format +msgid "could not read blob %s" +msgstr "æ— æ³•è¯»å–æ•°æ®å¯¹è±¡ %s" + +#: builtin/fast-export.c +#, c-format +msgid "oid mismatch in blob %s" +msgstr "æ•°æ®å¯¹è±¡ %s ä¸çš„对象 ID ä¸åŒ¹é…" + +#: builtin/fast-export.c +#, c-format +msgid "could not write blob '%s'" +msgstr "æ— æ³•å†™å…¥æ•°æ®å¯¹è±¡ '%s'" + +#: builtin/fast-export.c +#, c-format +msgid "unexpected comparison status '%c' for %s, %s" +msgstr "对于 %2$sã€%3$s 出现éžé¢„æœŸçš„æ¯”è¾ƒçŠ¶æ€ '%1$c'" + +#: builtin/fast-export.c +msgid "none" +msgstr "æ— " + +#: builtin/fast-export.c +#, c-format +msgid "could not find author in commit %s" +msgstr "æ— æ³•åœ¨æ交 %s ä¸æ‰¾åˆ°ä½œè€…" + +#: builtin/fast-export.c +#, c-format +msgid "could not find committer in commit %s" +msgstr "æ— æ³•åœ¨æ交 %s ä¸æ‰¾åˆ°æ交者" + +#: builtin/fast-export.c +#, c-format +msgid "" +"encountered commit-specific encoding %.*s in commit %s; use --reencode=[yes|" +"no] to handle it" +msgstr "" +"在æ交 %3$s ä¸é‡åˆ°æ交特定编ç %2$.*1$s；使用 --reencode=[yes|no] æ¥å¤„ç†" + +#: builtin/fast-export.c +#, c-format +msgid "encountered signed commit %s; use --signed-commits=<mode> to handle it" +msgstr "é‡åˆ°å·²ç¾åæ交 %s；使用 --signed-commits=<模å¼> æ¥å¤„ç†" + +#: builtin/fast-export.c +#, c-format +msgid "exporting %<PRIuMAX> signature(s) for commit %s" +msgstr "æ£åœ¨å¯¼å‡ºæ交 %2$s çš„ %1$<PRIuMAX> 个ç¾å" + +#: builtin/fast-export.c +#, c-format +msgid "stripping signature(s) from commit %s" +msgstr "æ£åœ¨å‰¥ç¦»æ交 %s çš„ç¾å" + +#: builtin/fast-export.c +#, c-format +msgid "" +"omitting tag %s,\n" +"since tags of trees (or tags of tags of trees, etc.) are not supported." +msgstr "" +"å¿½ç•¥æ ‡ç¾ %s，\n" +"å› ä¸ºä¸æ”¯æŒæ ‘çš„æ ‡ç¾ï¼ˆæˆ–æ ‘çš„æ ‡ç¾çš„æ ‡ç¾ç‰ï¼‰ã€‚" + +#: builtin/fast-export.c +#, c-format +msgid "could not read tag %s" +msgstr "æ— æ³•è¯»å–æ ‡ç¾ %s" + +#: builtin/fast-export.c +#, c-format +msgid "encountered signed tag %s; use --signed-tags=<mode> to handle it" +msgstr "é‡åˆ°å·²ç¾åæ ‡ç¾ %s；使用 --signed-tags=<模å¼> æ¥å¤„ç†" + +#: builtin/fast-export.c +#, c-format +msgid "exporting signed tag %s" +msgstr "æ£åœ¨å¯¼å‡ºå·²ç¾åæ ‡ç¾ %s" + +#: builtin/fast-export.c +#, c-format +msgid "stripping signature from tag %s" +msgstr "æ£åœ¨ä»Žæ ‡ç¾ %s ä¸å‰¥ç¦»ç¾å" + +#: builtin/fast-export.c +#, c-format +msgid "" +"tag %s tags unexported object; use --tag-of-filtered-object=<mode> to handle " +"it" +msgstr "" +"æ ‡ç¾ %s 指å‘未导出的对象；使用 --tag-of-filtered-object=<模å¼> æ¥å¤„ç†å®ƒ" + +#: builtin/fast-export.c +msgid "cannot export nested tags unless --mark-tags is specified." +msgstr "除éžæŒ‡å®š --mark-tags，å¦åˆ™æ— æ³•å¯¼å‡ºåµŒå¥—æ ‡ç¾ã€‚" + +#: builtin/fast-export.c +#, c-format +msgid "tag %s points nowhere?" +msgstr "æ ‡ç¾ %s 没有指å‘任何对象？" + +#: builtin/fast-export.c +#, c-format +msgid "%s: unexpected object of type %s, skipping." +msgstr "%s：é‡åˆ°ç±»åž‹ä¸º %s çš„éžé¢„期对象，跳过。" + +#: builtin/fast-export.c +#, c-format +msgid "tag points to object of unexpected type %s, skipping." +msgstr "æ ‡ç¾æŒ‡å‘éžé¢„期类型 %s 的对象，跳过。" + +#: builtin/fast-export.c +#, c-format +msgid "unable to open marks file %s for writing." +msgstr "æ— æ³•æ‰“å¼€æ ‡è®°æ–‡ä»¶ %s 以写入。" + +#: builtin/fast-export.c +#, c-format +msgid "unable to write marks file %s." +msgstr "æ— æ³•å†™å…¥æ ‡è®°æ–‡ä»¶ %s。" + +#: builtin/fast-export.c builtin/fast-import.c +#, c-format +msgid "corrupt mark line: %s" +msgstr "æŸåçš„æ ‡è®°è¡Œï¼š%s" + +#: builtin/fast-export.c builtin/fast-import.c fetch-pack.c +#, c-format +msgid "object not found: %s" +msgstr "对象未找到：%s" + +#: builtin/fast-export.c +#, c-format +msgid "not a commit? can't happen: %s" +msgstr "ä¸æ˜¯ä¸€ä¸ªæ交？ä¸åº”该å‘生：%s" + +#: builtin/fast-export.c +#, c-format +msgid "object %s already has a mark" +msgstr "对象 %s å·²ç»æœ‰ä¸€ä¸ªæ ‡è®°" #: builtin/fast-export.c msgid "--anonymize-map token cannot be empty" @@ -7358,33 +7536,567 @@ msgstr "å¯¹å¸¦æœ‰æ ‡è®° ID çš„æ ‡ç¾åšæ ‡è®°" #: builtin/fast-import.c #, c-format -msgid "Missing from marks for submodule '%s'" +msgid "can't write crash report %s" +msgstr "æ— æ³•å†™å…¥å´©æºƒæŠ¥å‘Š %s" + +#: builtin/fast-import.c +#, c-format +msgid "fast-import: dumping crash report to %s\n" +msgstr "fast-import：æ£åœ¨è½¬å‚¨å´©æºƒæŠ¥å‘Šåˆ° %s\n" + +#: builtin/fast-import.c +#, c-format +msgid "mark :%<PRIuMAX> not declared" +msgstr "æ ‡è®° :%<PRIuMAX> 未声明" + +#: builtin/fast-import.c +#, c-format +msgid "invalid attempt to create duplicate branch: %s" +msgstr "å°è¯•åˆ›å»ºé‡å¤åˆ†æ”¯çš„æ— æ•ˆæ“作：%s" + +#: builtin/fast-import.c +#, c-format +msgid "branch name doesn't conform to Git standards: %s" +msgstr "分支å称ä¸ç¬¦åˆ Git æ ‡å‡†ï¼š%s" + +#: builtin/fast-import.c +msgid "internal consistency error creating the index" +msgstr "创建索引时出现内部一致性错误" + +#: builtin/fast-import.c +msgid "cannot create keep file" +msgstr "æ— æ³•åˆ›å»º keep 文件" + +#: builtin/fast-import.c +msgid "failed to write keep file" +msgstr "æ— æ³•å†™å…¥ keep 文件" + +#: builtin/fast-import.c +msgid "cannot store pack file" +msgstr "æ— æ³•å˜å‚¨åŒ…文件" + +#: builtin/fast-import.c +msgid "cannot store index file" +msgstr "æ— æ³•å˜å‚¨ç´¢å¼•æ–‡ä»¶" + +#: builtin/fast-import.c +#, c-format +msgid "failed seeking to start of '%s'" +msgstr "æ— æ³•å¯»æ‰¾åˆ° '%s' 的开始ä½ç½®" + +#: builtin/fast-import.c +#, c-format +msgid "core Git rejected index %s" +msgstr "Git æ ¸å¿ƒæ‹’ç»ç´¢å¼• %s" + +#: builtin/fast-import.c +msgid "cannot truncate pack to skip duplicate" +msgstr "æ— æ³•æˆªæ–包以跳过é‡å¤" + +#: builtin/fast-import.c +#, c-format +msgid "EOF in data (%<PRIuMAX> bytes remaining)" +msgstr "æ•°æ®ä¸ EOF（剩余 %<PRIuMAX> å—节）" + +#: builtin/fast-import.c +#, c-format +msgid "unexpected deflate failure: %d" +msgstr "æ„外的压缩失败：%d" + +#: builtin/fast-import.c +#, c-format +msgid "not a tree: %s" +msgstr "ä¸æ˜¯ä¸€ä¸ªæ ‘对象：%s" + +#: builtin/fast-import.c +#, c-format +msgid "can't load tree %s" +msgstr "æ— æ³•åŠ è½½æ ‘ %s" + +#: builtin/fast-import.c +#, c-format +msgid "corrupt mode in %s" +msgstr "%s ä¸æŸå的模å¼" + +#: builtin/fast-import.c +msgid "root cannot be a non-directory" +msgstr "æ ¹ç›®å½•ä¸èƒ½æ˜¯éžç›®å½•" + +#: builtin/fast-import.c +msgid "empty path component found in input" +msgstr "在输入ä¸å‘现空路径组件" + +#: builtin/fast-import.c +msgid "non-directories cannot have subtrees" +msgstr "éžç›®å½•ä¸èƒ½æœ‰åæ ‘" + +#: builtin/fast-import.c +#, c-format +msgid "dropping %s since it would point to itself (i.e. to %s)" +msgstr "丢弃 %s å› ä¸ºå®ƒå°†æŒ‡å‘è‡ªèº«ï¼ˆå³ %s）" + +#: builtin/fast-import.c +#, c-format +msgid "branch %s is missing commits." +msgstr "分支 %s 缺少æ交。" + +#: builtin/fast-import.c +#, c-format +msgid "not updating %s (new tip %s does not contain %s)" +msgstr "未更新 %s（新的分支顶端 %s ä¸åŒ…å« %s）" + +#: builtin/fast-import.c builtin/sparse-checkout.c commit-graph.c midx-write.c +#: sequencer.c +#, c-format +msgid "unable to create leading directories of %s" +msgstr "ä¸èƒ½ä¸º %s 创建先导目录" + +#: builtin/fast-import.c +#, c-format +msgid "unable to write marks file %s" +msgstr "æ— æ³•å†™å…¥æ ‡è®°æ–‡ä»¶ %s" + +#: builtin/fast-import.c +#, c-format +msgid "unable to write marks file %s: %s" +msgstr "æ— æ³•å†™å…¥æ ‡è®°æ–‡ä»¶ %s：%s" + +#: builtin/fast-import.c object-file.c +#, c-format +msgid "unable to write file %s" +msgstr "æ— æ³•å†™æ–‡ä»¶ %s" + +#: builtin/fast-import.c +#, c-format +msgid "expected 'data n' command, found: %s" +msgstr "预期 'data n' 命令，实际：%s" + +#: builtin/fast-import.c +#, c-format +msgid "EOF in data (terminator '%s' not found)" +msgstr "æ•°æ®ä¸ EOF（未找到终æ¢ç¬¦ '%s'）" + +#: builtin/fast-import.c +msgid "data is too large to use in this context" +msgstr "æ•°æ®å¤ªå¤§æ— 法在æ¤ä¸Šä¸‹æ–‡ä¸ä½¿ç”¨" + +#: builtin/fast-import.c +#, c-format +msgid "EOF in data (%lu bytes remaining)" +msgstr "æ•°æ®ä¸ EOF（剩余 %lu å—节）" + +#: builtin/fast-import.c +#, c-format +msgid "missing < in ident string: %s" +msgstr "èº«ä»½æ ‡è¯†å—符串ä¸ç¼ºå°‘ <：%s" + +#: builtin/fast-import.c +#, c-format +msgid "missing space before < in ident string: %s" +msgstr "èº«ä»½æ ‡è¯†å—ç¬¦ä¸²ä¸ < 之å‰ç¼ºå°‘ç©ºæ ¼ï¼š%s" + +#: builtin/fast-import.c +#, c-format +msgid "missing > in ident string: %s" +msgstr "èº«ä»½æ ‡è¯†å—符串ä¸ç¼ºå°‘ >：%s" + +#: builtin/fast-import.c +#, c-format +msgid "missing space after > in ident string: %s" +msgstr "èº«ä»½æ ‡è¯†å—ç¬¦ä¸²ä¸ > 之åŽç¼ºå°‘ç©ºæ ¼ï¼š%s" + +#: builtin/fast-import.c +#, c-format +msgid "invalid raw date \"%s\" in ident: %s" +msgstr "èº«ä»½æ ‡è¯†ä¸æ— 效的原始日期 \"%s\"：%s" + +#: builtin/fast-import.c +#, c-format +msgid "invalid rfc2822 date \"%s\" in ident: %s" +msgstr "èº«ä»½æ ‡è¯†ä¸æ— 效的 rfc2822 日期 \"%s\"：%s" + +#: builtin/fast-import.c +#, c-format +msgid "date in ident must be 'now': %s" +msgstr "ident ä¸çš„日期必须为 'now'：%s" + +#: builtin/fast-import.c +#, c-format +msgid "too large fanout (%u)" +msgstr "扇出值过大 (%u)" + +#: builtin/fast-import.c +#, c-format +msgid "failed to remove path %s" +msgstr "æ— æ³•åˆ é™¤è·¯å¾„ %s" + +#: builtin/fast-import.c +#, c-format +msgid "no value after ':' in mark: %s" +msgstr "æ ‡è®°ä¸ ':' åŽé¢æ²¡æœ‰å€¼ï¼š%s" + +#: builtin/fast-import.c +#, c-format +msgid "garbage after mark: %s" +msgstr "æ ‡è®°åŽé¢æœ‰åžƒåœ¾å†…容：%s" + +#: builtin/fast-import.c +#, c-format +msgid "missing space after mark: %s" +msgstr "æ ‡è®°åŽé¢ç¼ºå°‘ç©ºæ ¼ï¼š%s" + +#: builtin/fast-import.c +#, c-format +msgid "invalid %s: %s" +msgstr "æ— æ•ˆ %s：%s" + +#: builtin/fast-import.c +#, c-format +msgid "NUL in %s: %s" +msgstr "在 %s ä¸å˜åœ¨ NUL：%s" + +#: builtin/fast-import.c +#, c-format +msgid "garbage after %s: %s" +msgstr "在 %s åŽé¢æœ‰åžƒåœ¾å†…容：%s" + +#: builtin/fast-import.c +#, c-format +msgid "missing space after %s: %s" +msgstr "在 %s åŽé¢ç¼ºå°‘ç©ºæ ¼ï¼š%s" + +#: builtin/fast-import.c +#, c-format +msgid "corrupt mode: %s" +msgstr "æŸå的模å¼ï¼š%s" + +#: builtin/fast-import.c +#, c-format +msgid "invalid dataref: %s" +msgstr "æ— æ•ˆçš„æ•°æ®å¼•ç”¨ï¼š%s" + +#: builtin/fast-import.c +#, c-format +msgid "missing space after SHA1: %s" +msgstr "SHA1 åŽé¢ç¼ºå°‘ç©ºæ ¼ï¼š%s" + +#: builtin/fast-import.c +#, c-format +msgid "Git links cannot be specified 'inline': %s" +msgstr "Git 链接ä¸èƒ½æŒ‡å®šä¸º 'inline'：%s" + +#: builtin/fast-import.c +#, c-format +msgid "not a commit (actually a %s): %s" +msgstr "ä¸æ˜¯ä¸€ä¸ªæ交（实际为 %s）：%s" + +#: builtin/fast-import.c +#, c-format +msgid "directories cannot be specified 'inline': %s" +msgstr "目录ä¸èƒ½æŒ‡å®šä¸º 'inline'：%s" + +#: builtin/fast-import.c +#, c-format +msgid "%s not found: %s" +msgstr "未找到%s：%s" + +#: builtin/fast-import.c +msgid "tree" +msgstr "æ ‘" + +#: builtin/fast-import.c +#, c-format +msgid "not a %s (actually a %s): %s" +msgstr "ä¸æ˜¯ä¸€ä¸ª %s（实际为 %s）：%s" + +#: builtin/fast-import.c +#, c-format +msgid "path %s not in branch" +msgstr "路径 %s ä¸åœ¨åˆ†æ”¯ä¸" + +#: builtin/fast-import.c +msgid "can't add a note on empty branch." +msgstr "ä¸èƒ½åœ¨ç©ºåˆ†æ”¯ä¸Šæ·»åŠ 注释。" + +#: builtin/fast-import.c +#, c-format +msgid "mark :%<PRIuMAX> not a commit" +msgstr "æ ‡è®° :%<PRIuMAX> ä¸æ˜¯ä¸€ä¸ªæ交" + +#: builtin/fast-import.c +#, c-format +msgid "not a valid commit: %s" +msgstr "ä¸æ˜¯ä¸€ä¸ªæœ‰æ•ˆçš„æ交：%s" + +#: builtin/fast-import.c +#, c-format +msgid "invalid ref name or SHA1 expression: %s" +msgstr "æ— æ•ˆçš„å¼•ç”¨å或 SHA1 表达å¼ï¼š%s" + +#: builtin/fast-import.c +#, c-format +msgid "not a blob (actually a %s): %s" +msgstr "ä¸æ˜¯ä¸€ä¸ªæ•°æ®å¯¹è±¡ï¼ˆå®žé™…为 %s）：%s" + +#: builtin/fast-import.c +#, c-format +msgid "blob not found: %s" +msgstr "æ•°æ®å¯¹è±¡æœªæ‰¾åˆ°ï¼š%s" + +#: builtin/fast-import.c +#, c-format +msgid "the commit %s is corrupt" +msgstr "æ交 %s æŸå" + +#: builtin/fast-import.c +#, c-format +msgid "can't create a branch from itself: %s" +msgstr "æ— æ³•ä»Žè‡ªèº«åˆ›å»ºåˆ†æ”¯ï¼š%s" + +#: builtin/fast-import.c +#, c-format +msgid "" +"expected gpgsig format: 'gpgsig <hash-algo> <signature-format>', got 'gpgsig " +"%s'" +msgstr "期望的 gpgsig æ ¼å¼ï¼š'gpgsig <哈希算法> <ç¾åæ ¼å¼>'，å´å¾—到 'gpgsig %s'" + +#: builtin/fast-import.c +#, c-format +msgid "unknown git hash algorithm in gpgsig: '%s'" +msgstr "gpgsig ä¸æœªçŸ¥çš„ git 哈希算法：'%s'" + +#: builtin/fast-import.c +#, c-format +msgid "invalid signature format in gpgsig: '%s'" +msgstr "gpgsig ä¸æ— 效的ç¾åæ ¼å¼ï¼š'%s'" + +#: builtin/fast-import.c +msgid "'unknown' signature format in gpgsig" +msgstr "gpgsig ä¸çš„ 'unknown' ç¾åæ ¼å¼" + +#: builtin/fast-import.c +#, c-format +msgid "multiple %s signatures found, ignoring additional signature" +msgstr "å‘现多个 %s ç¾åï¼Œå¿½ç•¥é™„åŠ çš„ç¾å" + +#: builtin/fast-import.c +msgid "parse_one_signature() returned unknown hash algo" +msgstr "parse_one_signature() 返回了未知的哈希算法" + +#: builtin/fast-import.c +msgid "expected committer but didn't get one" +msgstr "预期æ交者但未获å–" + +#: builtin/fast-import.c +msgid "encountered signed commit; use --signed-commits=<mode> to handle it" +msgstr "é‡åˆ°å·²ç¾åæ交；使用 --signed-commits=<模å¼> æ¥å¤„ç†å®ƒ" + +#: builtin/fast-import.c +msgid "stripping a commit signature" +msgstr "æ£åœ¨å‰¥ç¦»æ交ç¾å" + +#: builtin/fast-import.c +msgid "importing a commit signature verbatim" +msgstr "é€å—导入æ交ç¾å" + +#: builtin/fast-import.c +msgid "encountered signed tag; use --signed-tags=<mode> to handle it" +msgstr "é‡åˆ°å·²ç¾åæ ‡ç¾ï¼›ä½¿ç”¨ --signed-tags=<模å¼> æ¥å¤„ç†å®ƒ" + +#: builtin/fast-import.c +#, c-format +msgid "importing a tag signature verbatim for tag '%s'" +msgstr "é€å—å¯¼å…¥æ ‡ç¾ '%s' çš„ç¾å" + +#: builtin/fast-import.c +#, c-format +msgid "stripping a tag signature for tag '%s'" +msgstr "æ£åœ¨å‰¥ç¦»æ ‡ç¾ '%s' çš„ç¾å" + +#: builtin/fast-import.c +#, c-format +msgid "expected 'from' command, got '%s'" +msgstr "预期 'from' 命令，实际：'%s'" + +#: builtin/fast-import.c +msgid "can't tag an empty branch." +msgstr "æ— æ³•æ ‡è®°ä¸€ä¸ªç©ºåˆ†æ”¯ã€‚" + +#: builtin/fast-import.c builtin/merge.c +#, c-format +msgid "not a valid object: %s" +msgstr "ä¸æ˜¯ä¸€ä¸ªæœ‰æ•ˆå¯¹è±¡ï¼š%s" + +#: builtin/fast-import.c +msgid "write to frontend failed" +msgstr "写入å‰ç«¯å¤±è´¥" + +#: builtin/fast-import.c +#, c-format +msgid "can't read object %s" +msgstr "æ— æ³•è¯»å–对象 %s" + +#: builtin/fast-import.c +#, c-format +msgid "object %s is a %s but a blob was expected." +msgstr "对象 %s 是一个 %s，但预期是数æ®å¯¹è±¡ã€‚" + +#: builtin/fast-import.c +#, c-format +msgid "not a mark: %s" +msgstr "ä¸æ˜¯ä¸€ä¸ªæ ‡è®°ï¼š%s" + +#: builtin/fast-import.c +#, c-format +msgid "unknown mark: %s" +msgstr "æœªçŸ¥æ ‡è®°ï¼š%s" + +#: builtin/fast-import.c +#, c-format +msgid "garbage after SHA1: %s" +msgstr "SHA1 åŽé¢æœ‰åžƒåœ¾å†…容：%s" + +#: builtin/fast-import.c +#, c-format +msgid "not a tree-ish: %s" +msgstr "ä¸æ˜¯ä¸€ä¸ªæ ‘对象：%s" + +#: builtin/fast-import.c +#, c-format +msgid "can't load object %s" +msgstr "æ— æ³•åŠ è½½å¯¹è±¡ %s" + +#: builtin/fast-import.c +#, c-format +msgid "invalid SHA1 in tag: %s" +msgstr "æ ‡ç¾ä¸æ— 效的 SHA1：%s" + +#: builtin/fast-import.c +#, c-format +msgid "invalid SHA1 in commit: %s" +msgstr "æ交ä¸æ— 效的 SHA1：%s" + +#: builtin/fast-import.c +#, c-format +msgid "missing from marks for submodule '%s'" msgstr "å模组 '%s' 缺少 from æ ‡è®°" #: builtin/fast-import.c #, c-format -msgid "Missing to marks for submodule '%s'" +msgid "missing to marks for submodule '%s'" msgstr "å模组 '%s' 缺少 to æ ‡è®°" #: builtin/fast-import.c #, c-format -msgid "Expected 'mark' command, got %s" -msgstr "预期 'mark' 命令，得到 %s" +msgid "missing space after tree-ish: %s" +msgstr "æ ‘å¯¹è±¡åŽé¢ç¼ºå°‘ç©ºæ ¼ï¼š%s" + +#: builtin/fast-import.c +#, c-format +msgid "not in a commit: %s" +msgstr "ä¸åœ¨ä¸€ä¸ªæ交ä¸ï¼š%s" + +#: builtin/fast-import.c +#, c-format +msgid "expected 'mark' command, got %s" +msgstr "预期 'mark' 命令，实际：%s" #: builtin/fast-import.c #, c-format -msgid "Expected 'to' command, got %s" -msgstr "预期 'to' 命令，得到 %s" +msgid "expected 'to' command, got %s" +msgstr "预期 'to' 命令，实际：%s" #: builtin/fast-import.c -msgid "Expected format name:filename for submodule rewrite option" +msgid "only one import-marks command allowed per stream" +msgstr "æ¯ä¸ªæµåªå…许一个 import-marks 命令" + +#: builtin/fast-import.c +#, c-format +msgid "unknown --date-format argument %s" +msgstr "未知的 --date-format å‚æ•° %s" + +#: builtin/fast-import.c +#, c-format +msgid "%s: argument must be a non-negative integer" +msgstr "%s：å‚数必须为éžè´Ÿæ•´æ•°" + +#: builtin/fast-import.c +#, c-format +msgid "--depth cannot exceed %u" +msgstr "--depth ä¸èƒ½è¶…过 %u" + +#: builtin/fast-import.c +#, c-format +msgid "--cat-blob-fd cannot exceed %d" +msgstr "--cat-blob-fd ä¸èƒ½è¶…过 %d" + +#: builtin/fast-import.c +msgid "expected format name:filename for submodule rewrite option" msgstr "å模组é‡å†™é€‰é¡¹çš„é¢„æœŸæ ¼å¼ä¸º name:filename" #: builtin/fast-import.c #, c-format +msgid "max-pack-size is now in bytes, assuming --max-pack-size=%lum" +msgstr "max-pack-size 现在以å—节为å•ä½ï¼Œå‡å®šä¸º --max-pack-size=%lum" + +#: builtin/fast-import.c +msgid "minimum max-pack-size is 1 MiB" +msgstr "æœ€å° max-pack-size 为 1 MiB" + +#: builtin/fast-import.c +#, c-format +msgid "unknown --signed-commits mode '%s'" +msgstr "未知的 --signed-commits æ¨¡å¼ '%s'" + +#: builtin/fast-import.c +#, c-format +msgid "unknown --signed-tags mode '%s'" +msgstr "未知的 --signed-tags æ¨¡å¼ '%s'" + +#: builtin/fast-import.c +#, c-format msgid "feature '%s' forbidden in input without --allow-unsafe-features" msgstr "ä¸å¸¦ --allow-unsafe-features 的输入ä¸ç¦æ¢ä½¿ç”¨åŠŸèƒ½ '%s'" +#: builtin/fast-import.c +#, c-format +msgid "got feature command '%s' after data command" +msgstr "在 data 命令åŽå¾—到 feature 命令 '%s'" + +#: builtin/fast-import.c +#, c-format +msgid "this version of fast-import does not support feature %s." +msgstr "æ¤ç‰ˆæœ¬çš„ fast-import ä¸æ”¯æŒç‰¹æ€§ %s。" + +#: builtin/fast-import.c +#, c-format +msgid "got option command '%s' after data command" +msgstr "在 data 命令åŽå¾—到 option 命令 '%s'" + +#: builtin/fast-import.c +#, c-format +msgid "this version of fast-import does not support option: %s" +msgstr "æ¤ç‰ˆæœ¬çš„ fast-import ä¸æ”¯æŒé€‰é¡¹ï¼š%s" + +#: builtin/fast-import.c builtin/merge-recursive.c +#, c-format +msgid "unknown option %s" +msgstr "未知选项 %s" + +#: builtin/fast-import.c +#, c-format +msgid "unknown option --%s" +msgstr "未知选项 --%s" + +#: builtin/fast-import.c +#, c-format +msgid "unsupported command: %s" +msgstr "ä¸æ”¯æŒçš„命令：%s" + +#: builtin/fast-import.c +msgid "stream ends early" +msgstr "æµè¿‡æ—©ç»“æŸ" + #: builtin/fetch-pack.c #, c-format msgid "Lockfile created but not reported: %s" @@ -7552,6 +8264,32 @@ msgstr "" "以ç¦ç”¨è¯¥è¦å‘Šï¼Œç›´åˆ°è¿œç¨‹å°† HEAD 更改为其他内容。" #: builtin/fetch.c +msgid "" +"You're on a case-insensitive filesystem, and the remote you are\n" +"trying to fetch from has references that only differ in casing. It\n" +"is impossible to store such references with the 'files' backend. You\n" +"can either accept this as-is, in which case you won't be able to\n" +"store all remote references on disk. Or you can alternatively\n" +"migrate your repository to use the 'reftable' backend with the\n" +"following command:\n" +"\n" +" git refs migrate --ref-format=reftable\n" +"\n" +"Please keep in mind that not all implementations of Git support this\n" +"new format yet. So if you use tools other than Git to access this\n" +"repository it may not be an option to migrate to reftables.\n" +msgstr "" +"您处于ä¸åŒºåˆ†å¤§å°å†™çš„文件系统ä¸ï¼Œè€Œæ‚¨æ£åœ¨å°è¯•èŽ·å–的远程仓库具有仅在\n" +"大å°å†™ä¸Šä¸åŒçš„引用。使用 'files' åŽç«¯æ— 法å˜å‚¨æ¤ç±»å¼•ç”¨ã€‚您å¯ä»¥æŽ¥å—\n" +"è¿™ç§æƒ…况，但这æ„味ç€æ‚¨æ— 法在ç£ç›˜ä¸Šå˜å‚¨æ‰€æœ‰è¿œç¨‹å¼•ç”¨ã€‚或者，您也å¯ä»¥\n" +"使用以下命令将仓库è¿ç§»åˆ°ä½¿ç”¨ 'reftable' åŽç«¯ï¼š\n" +"\n" +" git refs migrate --ref-format=reftable\n" +"\n" +"请注æ„，并éžæ‰€æœ‰ Git 实现都支æŒè¿™ç§æ–°æ ¼å¼ã€‚å› æ¤ï¼Œå¦‚果您使用 Git\n" +"以外的工具访问æ¤ä»“库，è¿ç§»åˆ° reftables å¯èƒ½ä¸æ˜¯ä¸€ä¸ªå¯é€‰é¡¹ã€‚\n" + +#: builtin/fetch.c #, c-format msgid "" "some local refs could not be updated; try running\n" @@ -7804,8 +8542,8 @@ msgstr "åè®®ä¸æ”¯æŒ --negotiate-only，退出" #: builtin/fetch.c msgid "" -"--filter can only be used with the remote configured in extensions." -"partialclone" +"--filter can only be used with the remote configured in " +"extensions.partialclone" msgstr "åªå¯ä»¥å°† --filter 用于在 extensions.partialclone ä¸é…置的远程仓库" #: builtin/fetch.c @@ -7846,26 +8584,6 @@ msgid "file to read from" msgstr "从文件ä¸è¯»å–" #: builtin/for-each-ref.c -msgid "git for-each-ref [<options>] [<pattern>]" -msgstr "git for-each-ref [<选项>] [<模å¼>]" - -#: builtin/for-each-ref.c -msgid "git for-each-ref [--points-at <object>]" -msgstr "git for-each-ref [--points-at <对象>]" - -#: builtin/for-each-ref.c -msgid "git for-each-ref [--merged [<commit>]] [--no-merged [<commit>]]" -msgstr "git for-each-ref [--merged [<æ交>]] [--no-merged [<æ交>]]" - -#: builtin/for-each-ref.c -msgid "git for-each-ref [--contains [<commit>]] [--no-contains [<commit>]]" -msgstr "git for-each-ref [--contains [<æ交>]] [--no-contains [<æ交>]]" - -#: builtin/for-each-ref.c -msgid "git for-each-ref [--start-after <marker>]" -msgstr "git for-each-ref [--start-after <æ ‡è®°>]" - -#: builtin/for-each-ref.c msgid "quote placeholders suitably for shells" msgstr "引用å ä½ç¬¦é€‚用于 shells" @@ -7937,6 +8655,10 @@ msgstr "为 --stdin æ供了未知的命令å‚æ•°" msgid "cannot use --start-after with patterns" msgstr "ä¸èƒ½å°† --start-after 与模å¼åŒ¹é…一åŒä½¿ç”¨" +#: builtin/for-each-ref.c +msgid "git for-each-ref " +msgstr "git for-each-ref " + #: builtin/for-each-repo.c msgid "git for-each-repo --config=<config> [--] <arguments>" msgstr "git for-each-repo --config=<é…ç½®> [--] <命令å‚æ•°>" @@ -8226,7 +8948,7 @@ msgstr "å¯ç”¨æ›´ä¸¥æ ¼çš„检查" msgid "write dangling objects in .git/lost-found" msgstr "将悬空对象写入 .git/lost-found ä¸" -#: builtin/fsck.c builtin/prune.c +#: builtin/fsck.c builtin/prune.c builtin/repo.c msgid "show progress" msgstr "显示进度" @@ -8528,6 +9250,10 @@ msgid "" msgstr "跳过增é‡é‡æ–°æ‰“åŒ…ä»»åŠ¡ï¼Œå› ä¸º core.multiPackIndex 被ç¦ç”¨" #: builtin/gc.c +msgid "failed to perform geometric repack" +msgstr "æ— æ³•æ‰§è¡Œå‡ ä½•æ‰“åŒ…" + +#: builtin/gc.c #, c-format msgid "task '%s' failed" msgstr "任务 '%s' 失败" @@ -8539,6 +9265,11 @@ msgstr "é”文件 '%s' å·²å˜åœ¨ï¼Œè·³è¿‡ç»´æŠ¤" #: builtin/gc.c #, c-format +msgid "unknown maintenance strategy: '%s'" +msgstr "未知的维护ç–略：'%s'" + +#: builtin/gc.c +#, c-format msgid "'%s' is not a valid task" msgstr "'%s' ä¸æ˜¯ä¸€ä¸ªæœ‰æ•ˆçš„任务" @@ -9627,6 +10358,34 @@ msgstr "--trailer å’Œ --only-input åŒæ—¶ä½¿ç”¨æ²¡æœ‰æ„义" msgid "no input file given for in-place editing" msgstr "没有给出è¦åŽŸä½ç¼–辑的文件" +#: builtin/last-modified.c +msgid "last-modified can only operate on one tree at a time" +msgstr "last-modified 一次åªèƒ½åœ¨ä¸€ä¸ªæ ‘对象上æ“作" + +#: builtin/last-modified.c +#, c-format +msgid "unknown last-modified argument: %s" +msgstr "未知的 last-modified å‚数：%s" + +#: builtin/last-modified.c +msgid "unable to setup last-modified" +msgstr "æ— æ³•è®¾ç½® last-modified" + +#: builtin/last-modified.c +msgid "" +"git last-modified [--recursive] [--show-trees] [<revision-range>] [[--] " +"<path>...]" +msgstr "" +"git last-modified [--recursive] [--show-trees] [<版本范围>] [[--] <路径>...]" + +#: builtin/last-modified.c builtin/ls-tree.c +msgid "recurse into subtrees" +msgstr "递归到åæ ‘" + +#: builtin/last-modified.c +msgid "show tree entries when recursing into subtrees" +msgstr "递归进入åç›®å½•æ—¶ï¼Œæ˜¾ç¤ºæ ‘çš„æ¡ç›®" + #: builtin/log.c msgid "git log [<options>] [<revision-range>] [[--] <path>...]" msgstr "git log [<选项>] [<版本范围>] [[--] <路径>...]" @@ -9675,6 +10434,22 @@ msgid "-L<range>:<file> cannot be used with pathspec" msgstr "-L<范围>:<文件> ä¸èƒ½å’Œè·¯å¾„表达å¼å…±ç”¨" #: builtin/log.c +msgid "" +"\n" +"hint: You can replace 'git whatchanged <opts>' with:\n" +"hint:\tgit log <opts> --raw --no-merges\n" +"hint: Or make an alias:\n" +"hint:\tgit config set --global alias.whatchanged 'log --raw --no-merges'\n" +"\n" +msgstr "" +"\n" +"æ示：您å¯ä»¥å°† 'git whatchanged <选项>' 替æ¢ä¸ºï¼š\n" +"æ示：\tgit log <选项> --raw --no-merges\n" +"æ示：或者创建一个别å：\n" +"æ示：\tgit config set --global alias.whatchanged 'log --raw --no-merges'\n" +"\n" + +#: builtin/log.c #, c-format msgid "git show %s: bad file" msgstr "git show %s: æŸå的文件" @@ -10237,10 +11012,6 @@ msgid "only show trees" msgstr "åªæ˜¾ç¤ºæ ‘" #: builtin/ls-tree.c -msgid "recurse into subtrees" -msgstr "递归到åæ ‘" - -#: builtin/ls-tree.c msgid "show trees when recursing" msgstr "å½“é€’å½’æ—¶æ˜¾ç¤ºæ ‘" @@ -10433,11 +11204,6 @@ msgstr "ä¸èƒ½å†™å…¥å¯¹è±¡æ–‡ä»¶" #: builtin/merge-recursive.c #, c-format -msgid "unknown option %s" -msgstr "未知选项 %s" - -#: builtin/merge-recursive.c -#, c-format msgid "could not parse object '%s'" msgstr "ä¸èƒ½è§£æžå¯¹è±¡ '%s'" @@ -10656,11 +11422,6 @@ msgid "stash failed" msgstr "è´®è—失败" #: builtin/merge.c -#, c-format -msgid "not a valid object: %s" -msgstr "ä¸æ˜¯ä¸€ä¸ªæœ‰æ•ˆå¯¹è±¡ï¼š%s" - -#: builtin/merge.c msgid "read-tree failed" msgstr "读å–æ ‘å¤±è´¥" @@ -11108,7 +11869,7 @@ msgstr "ä¸èƒ½åŒæ—¶ç§»åŠ¨ '%s' åŠå…¶çˆ¶ç›®å½• '%s'" msgid "Renaming %s to %s\n" msgstr "é‡å‘½å %s 至 %s\n" -#: builtin/mv.c builtin/remote.c +#: builtin/mv.c #, c-format msgid "renaming '%s' failed" msgstr "é‡å‘½å '%s' 失败" @@ -11660,7 +12421,7 @@ msgstr "%s åŽ‹ç¼©ä¸ delta 基准å移越界" msgid "delta base offset out of bound for %s" msgstr "%s çš„ delta 基准å移越界" -#: builtin/pack-objects.c +#: builtin/pack-objects.c builtin/repo.c msgid "Counting objects" msgstr "对象计数ä¸" @@ -12070,32 +12831,8 @@ msgstr "" "%<PRIu32>（æ¥è‡ª %<PRIuMAX> 个包）" #: builtin/pack-refs.c -msgid "" -"git pack-refs [--all] [--no-prune] [--auto] [--include <pattern>] [--exclude " -"<pattern>]" -msgstr "" -"git pack-refs [--all] [--no-prune] [--auto] [--include <模å¼>] [--exclude <模" -"å¼>]" - -#: builtin/pack-refs.c -msgid "pack everything" -msgstr "打包一切" - -#: builtin/pack-refs.c -msgid "prune loose refs (default)" -msgstr "清除æ¾æ•£çš„引用（默认）" - -#: builtin/pack-refs.c -msgid "auto-pack refs as needed" -msgstr "按需对引用自动打包" - -#: builtin/pack-refs.c -msgid "references to include" -msgstr "需包å«çš„引用" - -#: builtin/pack-refs.c -msgid "references to exclude" -msgstr "需排除的引用" +msgid "git pack-refs " +msgstr "git pack-refs " #: builtin/patch-id.c msgid "git patch-id [--stable | --unstable | --verbatim]" @@ -12426,8 +13163,8 @@ msgid "" "upstream, see 'push.autoSetupRemote' in 'git help config'.\n" msgstr "" "\n" -"为了让没有追踪上游的分支自动é…置，å‚è§ 'git help config' ä¸çš„ 'push." -"autoSetupRemote'。\n" +"为了让没有追踪上游的分支自动é…置，å‚è§ 'git help config' ä¸çš„ " +"'push.autoSetupRemote'。\n" #: builtin/push.c #, c-format @@ -12672,6 +13409,11 @@ msgid "git range-diff [<options>] <base> <old-tip> <new-tip>" msgstr "git range-diff [<选项>] <base> <old-tip> <new-tip>" #: builtin/range-diff.c +#, c-format +msgid "invalid max-memory value: %s" +msgstr "æ— æ•ˆçš„ max-memory 值：%s" + +#: builtin/range-diff.c msgid "use simple diff colors" msgstr "使用简å•å·®å¼‚颜色" @@ -12684,6 +13426,14 @@ msgid "passed to 'git log'" msgstr "ä¼ é€’ç»™ 'git log'" #: builtin/range-diff.c +msgid "size" +msgstr "大å°" + +#: builtin/range-diff.c +msgid "maximum memory for cost matrix (default 4G)" +msgstr "æˆæœ¬çŸ©é˜µçš„最大内å˜ï¼ˆé»˜è®¤ 4G）" + +#: builtin/range-diff.c msgid "only emit output related to the first range" msgstr "仅显示与第一个范围有关的输出" @@ -12893,8 +13643,8 @@ msgstr "--empty=ask 已弃用；请使用 '--empty=stop'。" #: builtin/rebase.c #, c-format msgid "" -"unrecognized empty type '%s'; valid values are \"drop\", \"keep\", and \"stop" -"\"." +"unrecognized empty type '%s'; valid values are \"drop\", \"keep\", and " +"\"stop\"." msgstr "æ— æ³•è¯†åˆ«çš„ç©ºç±»åž‹ '%s'；有效值有 \"drop\"ã€\"keep\" å’Œ \"stop\"。" #: builtin/rebase.c @@ -13340,16 +14090,12 @@ msgid "git reflog list" msgstr "git reflog list" #: builtin/reflog.c -msgid "" -"git reflog expire [--expire=<time>] [--expire-unreachable=<time>]\n" -" [--rewrite] [--updateref] [--stale-fix]\n" -" [--dry-run | -n] [--verbose] [--all [--single-worktree] | " -"<refs>...]" -msgstr "" -"git reflog expire [--expire=<时间>] [--expire-unreachable=<时间>]\n" -" [--rewrite] [--updateref] [--stale-fix]\n" -" [--dry-run | -n] [--verbose] [--all [--single-worktree] | <" -"引用>...]" +msgid "git reflog exists <ref>" +msgstr "git reflog exists <引用>" + +#: builtin/reflog.c +msgid "git reflog write <ref> <old-oid> <new-oid> <message>" +msgstr "git reflog write <引用> <æ—§oid> <æ–°oid> <消æ¯>" #: builtin/reflog.c msgid "" @@ -13360,14 +14106,22 @@ msgstr "" " [--dry-run | -n] [--verbose] <引用>@{<指定符>}..." #: builtin/reflog.c -msgid "git reflog exists <ref>" -msgstr "git reflog exists <引用>" - -#: builtin/reflog.c msgid "git reflog drop [--all [--single-worktree] | <refs>...]" msgstr "git reflog drop [--all [--single-worktree] | <引用>...]" #: builtin/reflog.c +msgid "" +"git reflog expire [--expire=<time>] [--expire-unreachable=<time>]\n" +" [--rewrite] [--updateref] [--stale-fix]\n" +" [--dry-run | -n] [--verbose] [--all [--single-worktree] | " +"<refs>...]" +msgstr "" +"git reflog expire [--expire=<时间>] [--expire-unreachable=<时间>]\n" +" [--rewrite] [--updateref] [--stale-fix]\n" +" [--dry-run | -n] [--verbose] [--all [--single-worktree] | <" +"引用>...]" + +#: builtin/reflog.c #, c-format msgid "invalid timestamp '%s' given to '--%s'" msgstr "ç»™ '--%2$s' 的时间戳 '%1$s' æ— æ•ˆ" @@ -13418,7 +14172,7 @@ msgstr "处ç†æ‰€æœ‰å¼•ç”¨çš„引用日志" #: builtin/reflog.c msgid "limits processing to reflogs from the current worktree only" -msgstr "仅处ç†å½“å‰å·¥ä½œæ ‘的引用日志" +msgstr "仅处ç†å½“å‰å·¥ä½œåŒºçš„引用日志" #: builtin/reflog.c #, c-format @@ -13451,6 +14205,46 @@ msgstr "仅从当å‰å·¥ä½œåŒºä¸ä¸¢å¼ƒå¼•ç”¨æ—¥å¿—" msgid "references specified along with --all" msgstr "--all 选项ä¸èƒ½ä¸Žå…·ä½“引用åŒæ—¶ä½¿ç”¨" +#: builtin/reflog.c +#, c-format +msgid "invalid reference name: %s" +msgstr "æ— æ•ˆå¼•ç”¨å称：%s" + +#: builtin/reflog.c +#, c-format +msgid "invalid old object ID: '%s'" +msgstr "æ— æ•ˆå¯¹è±¡ ID：%s" + +#: builtin/reflog.c +#, c-format +msgid "old object '%s' does not exist" +msgstr "旧对象 '%s' ä¸å˜åœ¨" + +#: builtin/reflog.c +#, c-format +msgid "invalid new object ID: '%s'" +msgstr "æ— æ•ˆçš„æ–°å¯¹è±¡ ID：'%s'" + +#: builtin/reflog.c +#, c-format +msgid "new object '%s' does not exist" +msgstr "新对象 '%s' ä¸å˜åœ¨" + +#: builtin/reflog.c +#, c-format +msgid "cannot start transaction: %s" +msgstr "ä¸èƒ½å¯åŠ¨äº‹åŠ¡ï¼š%s" + +#: builtin/reflog.c +#, c-format +msgid "cannot queue reflog update: %s" +msgstr "æ— æ³•å°†å¼•ç”¨æ—¥å¿—æ›´æ–°åŠ å…¥é˜Ÿåˆ—ï¼š%s" + +#: builtin/reflog.c +#, c-format +msgid "cannot commit reflog update: %s" +msgstr "æ— æ³•æ交引用日志更新：%s" + #: builtin/refs.c msgid "git refs migrate --ref-format=<format> [--no-reflog] [--dry-run]" msgstr "git refs migrate --ref-format=<æ ¼å¼> [--no-reflog] [--dry-run]" @@ -13460,6 +14254,14 @@ msgid "git refs verify [--strict] [--verbose]" msgstr "git refs verify [--strict] [--verbose]" #: builtin/refs.c +msgid "git refs exists <ref>" +msgstr "git reflog exists <引用>" + +#: builtin/refs.c +msgid "git refs optimize " +msgstr "git refs optimize " + +#: builtin/refs.c msgid "specify the reference format to convert to" msgstr "指定è¦è½¬æ¢çš„å¼•ç”¨æ ¼å¼" @@ -13488,6 +14290,22 @@ msgstr "å¯ç”¨ä¸¥æ ¼çš„检查" msgid "'git refs verify' takes no arguments" msgstr "'git refs verify' ä¸æŽ¥å—任何å‚æ•°" +#: builtin/refs.c +msgid "git refs list " +msgstr "git reflog list" + +#: builtin/refs.c +msgid "'git refs exists' requires a reference" +msgstr "'git refs exists' 需è¦ä¸€ä¸ªå¼•ç”¨" + +#: builtin/refs.c builtin/show-ref.c +msgid "reference does not exist" +msgstr "引用ä¸å˜åœ¨" + +#: builtin/refs.c builtin/show-ref.c +msgid "failed to look up reference" +msgstr "æ— æ³•æ‰¾åˆ°å¼•ç”¨" + #: builtin/remote.c msgid "" "git remote add [-t <branch>] [-m <master>] [-f] [--tags | --no-tags] [--" @@ -13683,6 +14501,22 @@ msgstr "" "现在在为ä¸å˜åœ¨çš„远程å '%s' 命å" #: builtin/remote.c +msgid "" +"The remote you are trying to rename has conflicting references in the\n" +"new target refspec. This is most likely caused by you trying to nest\n" +"a remote into itself, e.g. by renaming 'parent' into 'parent/child'\n" +"or by unnesting a remote, e.g. the other way round.\n" +"\n" +"If that is the case, you can address this by first renaming the\n" +"remote to a different name.\n" +msgstr "" +"您å°è¯•é‡å‘½åçš„è¿œç¨‹ä»“åº“åœ¨æ–°ç›®æ ‡å¼•ç”¨è§„æ ¼ä¸å˜åœ¨å†²çªçš„引用。这很å¯èƒ½\n" +"是由于您å°è¯•å°†è¿œç¨‹ä»“库嵌套到自身，例如将 'parent' é‡å‘½å为 'parent/child'，\n" +"或者å–消嵌套远程仓库（åå‘æ“作）。\n" +"\n" +"如果是这ç§æƒ…况，您å¯ä»¥å…ˆå°†è¿œç¨‹ä»“库é‡å‘½å为ä¸åŒçš„å称æ¥è§£å†³æ¤é—®é¢˜ã€‚\n" + +#: builtin/remote.c #, c-format msgid "No such remote: '%s'" msgstr "没有æ¤è¿œç¨‹ä»“库：'%s'" @@ -13693,6 +14527,15 @@ msgid "Could not rename config section '%s' to '%s'" msgstr "ä¸èƒ½é‡å‘½åé…ç½®å°èŠ‚ '%s' 到 '%s'" #: builtin/remote.c +msgid "Renaming remote references" +msgstr "é‡å‘½å远程引用ä¸" + +#: builtin/remote.c +#, c-format +msgid "queueing remote ref renames failed: %s" +msgstr "æ— æ³•å°†è¿œç¨‹å¼•ç”¨é‡å‘½åæ“ä½œåŠ å…¥é˜Ÿåˆ—ï¼š%s" + +#: builtin/remote.c #, c-format msgid "" "Not updating non-default fetch refspec\n" @@ -13704,18 +14547,9 @@ msgstr "" "\t如果必è¦è¯·æ‰‹åŠ¨æ›´æ–°é…置。" #: builtin/remote.c -msgid "Renaming remote references" -msgstr "æ£åœ¨é‡å‘½å远程引用" - -#: builtin/remote.c #, c-format -msgid "deleting '%s' failed" -msgstr "åˆ é™¤ '%s' 失败" - -#: builtin/remote.c -#, c-format -msgid "creating '%s' failed" -msgstr "创建 '%s' 失败" +msgid "renaming remote refs failed: %s" +msgstr "é‡å‘½å远程引用失败：%s" #: builtin/remote.c msgid "" @@ -14059,56 +14893,6 @@ msgstr "" "或ç¦ç”¨ pack.writeBitmaps é…置。" #: builtin/repack.c -msgid "could not start pack-objects to repack promisor objects" -msgstr "æ— æ³•å¼€å§‹ pack-objects æ¥é‡æ–°æ‰“包 promisor 对象" - -#: builtin/repack.c -msgid "failed to feed promisor objects to pack-objects" -msgstr "æ— æ³•å°†æ‰¿è¯ºè€…å¯¹è±¡æ供给 pack-objects" - -#: builtin/repack.c -msgid "repack: Expecting full hex object ID lines only from pack-objects." -msgstr "repack：期望æ¥è‡ª pack-objects 的完整åå…进制对象 ID。" - -#: builtin/repack.c -msgid "could not finish pack-objects to repack promisor objects" -msgstr "æ— æ³•å®Œæˆ pack-objects æ¥é‡æ–°æ‰“包 promisor 对象" - -#: builtin/repack.c -#, c-format -msgid "cannot open index for %s" -msgstr "ä¸èƒ½æ‰“å¼€ %s 的索引" - -#: builtin/repack.c -#, c-format -msgid "pack %s too large to consider in geometric progression" -msgstr "包 %s 太大，ä¸åœ¨å‡ 何级数ä¸è€ƒè™‘" - -#: builtin/repack.c -#, c-format -msgid "pack %s too large to roll up" -msgstr "包 %s 太大导致数å—溢出" - -#: builtin/repack.c -#, c-format -msgid "could not open tempfile %s for writing" -msgstr "æ— æ³•æ‰“å¼€ä¸´æ—¶æ–‡ä»¶ %s 进行写入" - -#: builtin/repack.c -msgid "could not close refs snapshot tempfile" -msgstr "ä¸èƒ½å…³é—引用快照临时文件" - -#: builtin/repack.c -#, c-format -msgid "could not remove stale bitmap: %s" -msgstr "æ— æ³•åˆ é™¤è¿‡æœŸçš„ä½å›¾ï¼š %s" - -#: builtin/repack.c -#, c-format -msgid "pack prefix %s does not begin with objdir %s" -msgstr "包å‰ç¼€ %s 没有以对象目录 %s 开始" - -#: builtin/repack.c msgid "pack everything in a single pack" msgstr "所有内容打包到一个包文件ä¸" @@ -14234,21 +15018,6 @@ msgstr "选项 '%s' åªèƒ½å’Œ '%s' æé…使用" msgid "Nothing new to pack." msgstr "没有新的è¦æ‰“包。" -#: builtin/repack.c -#, c-format -msgid "renaming pack to '%s' failed" -msgstr "é‡å‘½å包至 '%s' 失败" - -#: builtin/repack.c -#, c-format -msgid "pack-objects did not write a '%s' file for pack %s-%s" -msgstr "pack-objects 未为包 %2$s-%3$s 写入 '%1$s' 文件" - -#: builtin/repack.c sequencer.c -#, c-format -msgid "could not unlink: %s" -msgstr "ä¸èƒ½åˆ 除：%s" - #: builtin/replace.c msgid "git replace [-f] <object> <replacement>" msgstr "git replace [-f] <对象> <替æ¢ç‰©>" @@ -14562,6 +15331,80 @@ msgstr "ç›®å‰è¿˜ä¸æ”¯æŒé‡æ”¾åˆ°æ ¹æ交ï¼" msgid "replaying merge commits is not supported yet!" msgstr "ç›®å‰è¿˜ä¸æ”¯æŒé‡æ”¾åˆ°åˆå¹¶æ交ï¼" +#: builtin/repo.c +#, c-format +msgid "key '%s' not found" +msgstr "未找到键 '%s'" + +#: builtin/repo.c +#, c-format +msgid "invalid format '%s'" +msgstr "æ— æ•ˆæ ¼å¼ '%s'" + +#: builtin/repo.c +msgid "output format" +msgstr "è¾“å‡ºæ ¼å¼" + +#: builtin/repo.c +msgid "synonym for --format=nul" +msgstr "å’Œ --format=nul åŒä¹‰" + +#: builtin/repo.c +msgid "unsupported output format" +msgstr "ä¸æ”¯æŒçš„è¾“å‡ºæ ¼å¼" + +#: builtin/repo.c +msgid "References" +msgstr "引用" + +#: builtin/repo.c +msgid "Count" +msgstr "计数" + +#: builtin/repo.c +msgid "Branches" +msgstr "分支" + +#: builtin/repo.c +msgid "Tags" +msgstr "æ ‡ç¾" + +#: builtin/repo.c +msgid "Remotes" +msgstr "远程" + +#: builtin/repo.c +msgid "Others" +msgstr "其它" + +#: builtin/repo.c +msgid "Reachable objects" +msgstr "å¯è¾¾çš„对象" + +#: builtin/repo.c +msgid "Commits" +msgstr "æ交" + +#: builtin/repo.c +msgid "Trees" +msgstr "æ ‘" + +#: builtin/repo.c +msgid "Blobs" +msgstr "æ•°æ®å¯¹è±¡" + +#: builtin/repo.c +msgid "Repository structure" +msgstr "仓库结构" + +#: builtin/repo.c +msgid "Value" +msgstr "值" + +#: builtin/repo.c +msgid "Counting references" +msgstr "æ£åœ¨å¼•ç”¨è®¡æ•°" + #: builtin/rerere.c msgid "" "git rerere [clear | forget <pathspec>... | diff | status | remaining | gc]" @@ -15294,14 +16137,6 @@ msgid "git show-ref --exists <ref>" msgstr "git show-ref --exists <引用>" #: builtin/show-ref.c -msgid "reference does not exist" -msgstr "引用ä¸å˜åœ¨" - -#: builtin/show-ref.c -msgid "failed to look up reference" -msgstr "æ— æ³•æ‰¾åˆ°å¼•ç”¨" - -#: builtin/show-ref.c msgid "only show tags (can be combined with --branches)" msgstr "ä»…æ˜¾ç¤ºæ ‡ç¾ï¼ˆå¯ä¸Ž --branches 组åˆä½¿ç”¨ï¼‰" @@ -15340,10 +16175,10 @@ msgstr "æ˜¾ç¤ºä»Žæ ‡å‡†è¾“å…¥ä¸è¯»å…¥çš„ä¸åœ¨æœ¬åœ°ä»“库ä¸çš„引用" #: builtin/sparse-checkout.c msgid "" "git sparse-checkout (init | list | set | add | reapply | disable | check-" -"rules) [<options>]" +"rules | clean) [<options>]" msgstr "" "git sparse-checkout (init | list | set | add | reapply | disable | check\n" -"-rules) [<选项>]" +"-rules | clean) [<选项>]" #: builtin/sparse-checkout.c msgid "this worktree is not sparse" @@ -15376,7 +16211,7 @@ msgstr "ä¸èƒ½ fdopen %s" #: builtin/sparse-checkout.c msgid "failed to initialize worktree config" -msgstr "æ— æ³•åˆå§‹åŒ–å·¥ä½œæ ‘é…ç½®" +msgstr "æ— æ³•åˆå§‹åŒ–工作区é…ç½®" #: builtin/sparse-checkout.c msgid "failed to modify sparse-index config" @@ -15390,11 +16225,6 @@ msgstr "åˆå§‹åŒ–稀ç–检出为锥形模å¼" msgid "toggle the use of a sparse index" msgstr "切æ¢ç¨€ç–索引的使用" -#: builtin/sparse-checkout.c commit-graph.c midx-write.c sequencer.c -#, c-format -msgid "unable to create leading directories of %s" -msgstr "ä¸èƒ½ä¸º %s 创建先导目录" - #: builtin/sparse-checkout.c #, c-format msgid "failed to open '%s'" @@ -15485,6 +16315,37 @@ msgid "must be in a sparse-checkout to reapply sparsity patterns" msgstr "必须在稀ç–检出ä¸é‡åº”用稀ç–模å¼" #: builtin/sparse-checkout.c +msgid "report each affected file, not just directories" +msgstr "报告æ¯ä¸ªå—å½±å“的文件，而ä¸ä»…是目录" + +#: builtin/sparse-checkout.c +msgid "must be in a sparse-checkout to clean directories" +msgstr "必须在稀ç–检出ä¸æ‰èƒ½æ¸…ç†ç›®å½•" + +#: builtin/sparse-checkout.c +msgid "must be in a cone-mode sparse-checkout to clean directories" +msgstr "必须在锥形模å¼çš„稀ç–检出ä¸æ‰èƒ½æ¸…ç†ç›®å½•" + +#: builtin/sparse-checkout.c +msgid "for safety, refusing to clean without one of --force or --dry-run" +msgstr "为了安全，在没有 --force 或 --dry-run 选项的情况下拒ç»æ‰§è¡Œæ¸…ç†" + +#: builtin/sparse-checkout.c +msgid "failed to read index" +msgstr "æ— æ³•è¯»å–索引" + +#: builtin/sparse-checkout.c +msgid "" +"failed to convert index to a sparse index; resolve merge conflicts and try " +"again" +msgstr "æ— æ³•å°†ç´¢å¼•è½¬æ¢ä¸ºç¨€ç–索引；解决åˆå¹¶å†²çªåŽé‡è¯•" + +#: builtin/sparse-checkout.c +#, c-format +msgid "failed to remove '%s'" +msgstr "æ— æ³•åˆ é™¤ %s" + +#: builtin/sparse-checkout.c msgid "error while refreshing working directory" msgstr "刷新工作目录时出错" @@ -17295,7 +18156,7 @@ msgstr "æ— æ³•å°† '%s' å¤åˆ¶è‡³ '%s'；稀ç–检出å¯èƒ½æ— 法æ£ç¡®å·¥ä½œ" #: builtin/worktree.c #, c-format msgid "failed to copy worktree config from '%s' to '%s'" -msgstr "æ— æ³•æŠŠå·¥ä½œæ ‘é…置从 '%s' æ‹·è´åˆ° '%s'" +msgstr "æ— æ³•æŠŠå·¥ä½œåŒºé…置从 '%s' æ‹·è´åˆ° '%s'" #: builtin/worktree.c #, c-format @@ -17314,7 +18175,7 @@ msgstr "åˆå§‹åŒ–" #: builtin/worktree.c #, c-format msgid "could not find created worktree '%s'" -msgstr "æ— æ³•æ‰¾åˆ°å·²åˆ›å»ºçš„å·¥ä½œæ ‘ '%s'" +msgstr "æ— æ³•æ‰¾åˆ°å·²åˆ›å»ºçš„å·¥ä½œåŒº '%s'" #: builtin/worktree.c #, c-format @@ -17561,10 +18422,6 @@ msgstr "å°† <å‰ç¼€> åç›®å½•å†…å®¹å†™åˆ°ä¸€ä¸ªæ ‘å¯¹è±¡" msgid "only useful for debugging" msgstr "åªå¯¹è°ƒè¯•æœ‰ç”¨" -#: bulk-checkin.c -msgid "core.fsyncMethod = batch is unsupported on this platform" -msgstr "core.fsyncMethod = batch ä¸æ”¯æŒæœ¬å¹³å°" - #: bundle-uri.c #, c-format msgid "could not parse bundle list key %s with value '%s'" @@ -18069,6 +18926,10 @@ msgid "Add or parse structured information in commit messages" msgstr "æ·»åŠ æˆ–è§£æžæ交说明ä¸çš„结构化信æ¯" #: command-list.h +msgid "EXPERIMENTAL: Show when files were last modified" +msgstr "实验性功能：显示文件最åŽä¿®æ”¹çš„时间" + +#: command-list.h msgid "Show commit logs" msgstr "显示æ交日志" @@ -18118,7 +18979,7 @@ msgstr "与 git-merge-index ä¸€èµ·ä½¿ç”¨çš„æ ‡å‡†å‘导程åº" #: command-list.h msgid "Perform merge without touching index or working tree" -msgstr "在ä¸è§¦ç¢°ç´¢å¼•æˆ–å·¥ä½œæ ‘æƒ…å†µä¸‹åº”ç”¨åˆå¹¶" +msgstr "在ä¸è§¦ç¢°ç´¢å¼•æˆ–工作区情况下应用åˆå¹¶" #: command-list.h msgid "Run merge conflict resolution tools to resolve merge conflicts" @@ -18230,6 +19091,10 @@ msgid "EXPERIMENTAL: Replay commits on a new base, works with bare repos too" msgstr "试验ä¸ï¼šåŸºäºŽä¸€ä¸ªæ–°åŸºçº¿é‡æ”¾æ交，åŒæ ·é€‚用于纯仓库" #: command-list.h +msgid "Retrieve information about the repository" +msgstr "检索仓库信æ¯" + +#: command-list.h msgid "Generates a summary of pending changes" msgstr "生æˆå¾…定更改的摘è¦" @@ -18304,7 +19169,7 @@ msgstr "显示本地仓库ä¸çš„引用" # 译者：ä¸æ–‡å—符串拼接，å¯åˆ 除å‰å¯¼ç©ºæ ¼ #: command-list.h msgid "Reduce your working tree to a subset of tracked files" -msgstr "å°†æ‚¨çš„å·¥ä½œæ ‘ç¼©å‡è‡³å·²è¿½è¸ªæ–‡ä»¶çš„å集" +msgstr "将您的工作区缩å‡è‡³å·²è¿½è¸ªæ–‡ä»¶çš„å集" #: command-list.h msgid "Add file contents to the staging area" @@ -18339,8 +19204,8 @@ msgid "Read, modify and delete symbolic refs" msgstr "读å–ã€ä¿®æ”¹å’Œåˆ 除符å·å¼•ç”¨" #: command-list.h -msgid "Create, list, delete or verify a tag object signed with GPG" -msgstr "创建ã€åˆ—出ã€åˆ é™¤æˆ–æ ¡éªŒä¸€ä¸ª GPG ç¾åçš„æ ‡ç¾å¯¹è±¡" +msgid "Create, list, delete or verify tags" +msgstr "创建ã€åˆ—出ã€åˆ é™¤æˆ–æ ¡éªŒæ ‡ç¾" #: command-list.h msgid "Creates a temporary file with a blob's contents" @@ -18755,8 +19620,7 @@ msgstr "æ— æ³•é‡å‘½å临时æ交图文件" #: commit-graph.c #, c-format msgid "cannot merge graphs with %<PRIuMAX>, %<PRIuMAX> commits" -msgstr "" -"æ— æ³•åˆå¹¶æäº¤å›¾ï¼Œæ€»å…±å·²ç´¯åŠ æ交数：%<PRIuMAX>，当å‰å¾…ç´¯åŠ æ交数：%<PRIuMAX>" +msgstr "æ— æ³•åˆå¹¶æ交图，其æ交数分别为 %<PRIuMAX> å’Œ %<PRIuMAX>" #: commit-graph.c #, c-format @@ -18778,8 +19642,8 @@ msgstr "æ£å°è¯•å†™æ交图，但是 'core.commitGraph' 被ç¦ç”¨" #: commit-graph.c #, c-format msgid "" -"attempting to write a commit-graph, but 'commitGraph." -"changedPathsVersion' (%d) is not supported" +"attempting to write a commit-graph, but 'commitGraph.changedPathsVersion' " +"(%d) is not supported" msgstr "å°è¯•å†™å…¥æ交图，但ä¸æ”¯æŒ 'commitGraph.changedPathsVersion' (%d)" #: commit-graph.c @@ -19202,8 +20066,8 @@ msgid "" "remote URLs cannot be configured in file directly or indirectly included by " "includeIf.hasconfig:remote.*.url" msgstr "" -"远程 URL ä¸èƒ½åœ¨æ–‡ä»¶ä¸é…置，ä¸ç®¡ç›´æŽ¥åœ°è¿˜æ˜¯é€šè¿‡ includeIf.hasconfig:remote.*." -"url 间接地包å«" +"远程 URL ä¸èƒ½åœ¨æ–‡ä»¶ä¸é…置，ä¸ç®¡ç›´æŽ¥åœ°è¿˜æ˜¯é€šè¿‡ " +"includeIf.hasconfig:remote.*.url 间接地包å«" #: config.c #, c-format @@ -19382,6 +20246,48 @@ msgid "unable to parse command-line config" msgstr "æ— æ³•è§£æžå‘½ä»¤è¡Œä¸çš„é…ç½®" #: config.c +#, c-format +msgid "" +"\n" +"To use the default comment string (#) please run\n" +"\n" +"%s" +msgstr "" +"\n" +"è¦ä½¿ç”¨é»˜è®¤çš„注释å—符串（#）时请è¿è¡Œ\n" +"\n" +"%s" + +#: config.c +msgid "<comment string>" +msgstr "<注释å—符串>" + +#: config.c +#, c-format +msgid "" +"\n" +"To set a custom comment string please run\n" +"\n" +"%s\n" +"where '%s' is the string you wish to use.\n" +msgstr "" +"\n" +"è¦è®¾ç½®è‡ªå®šä¹‰æ³¨é‡Šå—符串时请è¿è¡Œ\n" +"\n" +"%s\n" +"å…¶ä¸ '%s' 是您希望使用的å—符串。\n" + +#: config.c +#, c-format +msgid "Support for '%s=auto' has been removed in Git 3.0" +msgstr "对 '%s=auto' 的支æŒå·²åœ¨ Git 3.0 ä¸ç§»é™¤" + +#: config.c +#, c-format +msgid "Support for '%s=auto' is deprecated and will be removed in Git 3.0" +msgstr "对 '%s=auto' 的支æŒå·²è¿‡æ—¶ï¼Œå°†åœ¨ Git 3.0 ä¸ç§»é™¤" + +#: config.c msgid "unknown error occurred while reading the configuration files" msgstr "在读å–é…置文件时é‡åˆ°æœªçŸ¥é”™è¯¯" @@ -19961,6 +20867,14 @@ msgid "failed to write archive" msgstr "æ— æ³•å†™å…¥å½’æ¡£" #: diff-lib.c +msgid "max-depth is not supported for worktree diffs" +msgstr "工作区差异ä¸æ”¯æŒ max-depth" + +#: diff-lib.c +msgid "max-depth is not supported for index diffs" +msgstr "索引差异ä¸æ”¯æŒ max-depth" + +#: diff-lib.c msgid "--merge-base does not work with ranges" msgstr "--merge-base ä¸é€‚用于范围" @@ -20237,7 +21151,7 @@ msgstr "åªæ˜¾ç¤ºå˜æ›´æ–‡ä»¶çš„文件å和状æ€" #: diff.c msgid "<width>[,<name-width>[,<count>]]" -msgstr "<宽度>[,<文件å宽度>[,<次数>]]" +msgstr "<宽度>[,<文件å宽度>[,<计数>]]" #: diff.c msgid "generate diffstat" @@ -20261,7 +21175,7 @@ msgstr "使用给定的图形长度生æˆå·®å¼‚统计" #: diff.c msgid "<count>" -msgstr "<次数>" +msgstr "<计数>" #: diff.c msgid "generate diffstat with limited lines" @@ -20586,6 +21500,14 @@ msgid "select files by diff type" msgstr "通过差异类型选择文件" #: diff.c +msgid "<depth>" +msgstr "<深度>" + +#: diff.c +msgid "maximum tree depth to recurse" +msgstr "é€’å½’çš„æœ€å¤§æ ‘æ·±åº¦" + +#: diff.c msgid "<file>" msgstr "<文件>" @@ -20824,11 +21746,6 @@ msgstr "æ— æ•ˆçš„ unshallow ä¿¡æ¯ï¼š%s" #: fetch-pack.c #, c-format -msgid "object not found: %s" -msgstr "对象未找到：%s" - -#: fetch-pack.c -#, c-format msgid "error in object: %s" msgstr "对象ä¸å‡ºé”™ï¼š%s" @@ -21172,6 +22089,11 @@ msgid "recursive alias: %s" msgstr "递归的别å：%s" #: git.c +#, c-format +msgid "alias loop detected: expansion of '%s' does not terminate:%s" +msgstr "检测到别å循环：'%s'的扩展未终æ¢ï¼š%s" + +#: git.c msgid "write failure on standard output" msgstr "åœ¨æ ‡å‡†è¾“å‡ºå†™å…¥å¤±è´¥" @@ -21185,11 +22107,6 @@ msgstr "æ ‡å‡†è¾“å‡ºå…³é—失败" #: git.c #, c-format -msgid "alias loop detected: expansion of '%s' does not terminate:%s" -msgstr "检测到别å循环：'%s'的扩展未终æ¢ï¼š%s" - -#: git.c -#, c-format msgid "cannot handle %s as a builtin" msgstr "ä¸èƒ½ä½œä¸ºå†…ç½®å‘½ä»¤å¤„ç† %s" @@ -21251,12 +22168,22 @@ msgid "failed to get the ssh fingerprint for key '%s'" msgstr "æ— æ³•å¾—åˆ°å¯†é’¥ '%s' çš„ ssh 指纹" #: gpg-interface.c +#, c-format +msgid "failed to get the ssh fingerprint for key %s" +msgstr "æ— æ³•å¾—åˆ°å¯†é’¥ '%s' çš„ ssh 指纹" + +#: gpg-interface.c msgid "" "either user.signingkey or gpg.ssh.defaultKeyCommand needs to be configured" msgstr "需è¦é…ç½® user.signingkey 或者 gpg.ssh.defaultKeyCommand å…¶ä¸ä¹‹ä¸€" #: gpg-interface.c #, c-format +msgid "malformed build-time gpg.ssh.defaultKeyCommand: %s" +msgstr "构建时 gpg.ssh.defaultKeyCommand æ ¼å¼é”™è¯¯ï¼š%s" + +#: gpg-interface.c +#, c-format msgid "gpg.ssh.defaultKeyCommand succeeded but returned no keys: %s %s" msgstr "gpg.ssh.defaultKeyCommand æˆåŠŸï¼Œä½†æ²¡æœ‰è¿”回密钥：%s %s" @@ -21564,6 +22491,12 @@ msgstr "" " 请求：%s\n" " é‡å®šå‘：%s" +#: http.h +#, c-format +msgid "" +"number too large to represent as curl_off_t on this platform: %<PRIuMAX>" +msgstr "æ•°å—å¤ªå¤§ï¼Œæ— æ³•åœ¨æ¤å¹³å°ä¸Šè¡¨ç¤ºä¸º curl_off_t：%<PRIuMAX>" + #: ident.c msgid "Author identity unknown\n" msgstr "作者身份未知\n" @@ -22092,11 +23025,6 @@ msgstr "ä¸èƒ½è½½å…¥åŒ…" #: midx-write.c #, c-format -msgid "could not open index for %s" -msgstr "ä¸èƒ½æ‰“å¼€ %s 的索引" - -#: midx-write.c -#, c-format msgid "unable to link '%s' to '%s'" msgstr "æ— æ³•å°† '%s' 链接至 '%s'" @@ -22125,6 +23053,11 @@ msgstr "未知的首选包：'%s'" #: midx-write.c #, c-format +msgid "failed to open preferred pack %s" +msgstr "æ— æ³•æ‰“å¼€é¦–é€‰åŒ… %s" + +#: midx-write.c +#, c-format msgid "cannot select preferred pack %s with no objects" msgstr "ä¸èƒ½é€‰æ‹©æ²¡æœ‰å¯¹è±¡çš„首选包 %s" @@ -22155,6 +23088,10 @@ msgid "could not write multi-pack bitmap" msgstr "æ— æ³•å†™å…¥å¤šåŒ…ä½å›¾" #: midx-write.c +msgid "too many multi-pack-indexes" +msgstr "过多的多包索引" + +#: midx-write.c msgid "unable to open multi-pack-index chain file" msgstr "æ— æ³•æ‰“å¼€å¤šåŒ…ç´¢å¼•é“¾æ–‡ä»¶" @@ -22484,11 +23421,6 @@ msgstr "文件 '%s' å’Œ '%s' 的内容ä¸åŒ" #: object-file.c #, c-format -msgid "unable to write file %s" -msgstr "æ— æ³•å†™æ–‡ä»¶ %s" - -#: object-file.c -#, c-format msgid "unable to write repeatedly vanishing file %s" msgstr "æ— æ³•å†™å…¥åå¤æ¶ˆå¤±çš„文件 %s" @@ -22498,6 +23430,10 @@ msgid "unable to set permission to '%s'" msgstr "æ— æ³•ä¸º '%s' 设置æƒé™" #: object-file.c +msgid "core.fsyncMethod = batch is unsupported on this platform" +msgstr "core.fsyncMethod = batch ä¸æ”¯æŒæœ¬å¹³å°" + +#: object-file.c msgid "error when closing loose object file" msgstr "å…³é—æ¾æ•£å¯¹è±¡æ–‡ä»¶æ—¶å‡ºé”™" @@ -23098,6 +24034,26 @@ msgstr "mtimes 文件 %s 有ä¸æ”¯æŒçš„哈希 ID %<PRIu32>" msgid "mtimes file %s is corrupt" msgstr "mtimes 文件 %s æŸå" +#: pack-refs.c +msgid "pack everything" +msgstr "打包一切" + +#: pack-refs.c +msgid "prune loose refs (default)" +msgstr "清除æ¾æ•£çš„引用（默认）" + +#: pack-refs.c +msgid "auto-pack refs as needed" +msgstr "按需对引用自动打包" + +#: pack-refs.c +msgid "references to include" +msgstr "需包å«çš„引用" + +#: pack-refs.c +msgid "references to exclude" +msgstr "需排除的引用" + #: pack-revindex.c #, c-format msgid "reverse-index file %s is too small" @@ -23616,6 +24572,11 @@ msgstr "æ— æ³•ä»Žæ‰¿è¯ºè€…è¿œç¨‹èŽ·å– %s" #: promisor-remote.c #, c-format +msgid "unsupported field '%s' in '%s' config" +msgstr "é…ç½® '%2$s' ä¸å˜åœ¨ä¸æ”¯æŒçš„å—段 '%1$s'" + +#: promisor-remote.c +#, c-format msgid "no or empty URL advertised for remote '%s'" msgstr "远程 '%s' çš„ URL 没有公布或为空" @@ -23626,13 +24587,18 @@ msgstr "已知远程å称为 '%s'，但 URL 是 '%s' è€Œéž '%s'" #: promisor-remote.c #, c-format -msgid "unknown '%s' value for '%s' config option" -msgstr "é…置项 '%2$s' 为未知的å–值 '%1$s'" +msgid "invalid element '%s' from remote info" +msgstr "远程信æ¯ä¸çš„æ— æ•ˆå…ƒç´ '%s'" #: promisor-remote.c #, c-format -msgid "unknown element '%s' from remote info" -msgstr "远程信æ¯ä¸çš„æœªçŸ¥å…ƒç´ '%s'" +msgid "server advertised a promisor remote without a name or URL: %s" +msgstr "æœåŠ¡å™¨é€šå‘Šäº†ä¸€ä¸ªæ²¡æœ‰å称或 URL 的承诺者远程：%s" + +#: promisor-remote.c +#, c-format +msgid "unknown '%s' value for '%s' config option" +msgstr "é…置项 '%2$s' 为未知的å–值 '%1$s'" #: promisor-remote.c #, c-format @@ -23744,6 +24710,16 @@ msgstr "æ— æ³•ç”Ÿæˆ diff" #: range-diff.c #, c-format +msgid "" +"range-diff: unable to compute the range-diff, since it exceeds the maximum " +"memory for the cost matrix: %s (%<PRIuMAX> bytes) needed, limited to %s " +"(%<PRIuMAX> bytes)" +msgstr "" +"range-diffï¼šæ— æ³•è®¡ç®— range-diffï¼Œå› ä¸ºå®ƒè¶…å‡ºäº†æˆæœ¬çŸ©é˜µçš„最大内å˜ï¼šéœ€è¦ %s" +"（%<PRIuMAX> å—节），é™åˆ¶ä¸º %s（%<PRIuMAX> å—节）" + +#: range-diff.c +#, c-format msgid "could not parse log for '%s'" msgstr "ä¸èƒ½è§£æž '%s' 的日志" @@ -24368,6 +25344,10 @@ msgid "no reflog for '%s'" msgstr "没有 '%s' 的引用日志" #: refs.c +msgid "Checking references consistency" +msgstr "æ£åœ¨æ£€æŸ¥å¼•ç”¨ä¸€è‡´æ€§" + +#: refs.c #, c-format msgid "%s does not point to a valid object!" msgstr "%s 没有指å‘一个有效的对象ï¼" @@ -24388,8 +25368,9 @@ msgstr "%s%s 已在 %s è¢«åˆ é™¤åŽå˜ä¸ºæ‚¬ç©ºå¼•ç”¨\n" #, c-format msgid "" "Using '%s' as the name for the initial branch. This default branch name\n" -"is subject to change. To configure the initial branch name to use in all\n" -"of your new repositories, which will suppress this warning, call:\n" +"will change to \"main\" in Git 3.0. To configure the initial branch name\n" +"to use in all of your new repositories, which will suppress this warning,\n" +"call:\n" "\n" "\tgit config --global init.defaultBranch <name>\n" "\n" @@ -24398,18 +25379,32 @@ msgid "" "\n" "\tgit branch -m <name>\n" msgstr "" -"使用 '%s' 作为åˆå§‹åˆ†æ”¯çš„å称。这个默认分支å称å¯èƒ½ä¼šæ›´æ”¹ã€‚è¦åœ¨æ–°ä»“库ä¸\n" -"é…置使用åˆå§‹åˆ†æ”¯å，并消除这æ¡è¦å‘Šï¼Œè¯·æ‰§è¡Œï¼š\n" +"使用 '%s' 作为åˆå§‹åˆ†æ”¯çš„å称。这个默认分支å称在 Git 3.0 ä¸å°†ä¼šä¿®æ”¹ä¸º\n" +"\"main\"。è¦ä¸ºæ‚¨çš„所有新仓库é…ç½®åˆå§‹åˆ†æ”¯å称（这将ç¦ç”¨æ¤è¦å‘Šï¼‰ï¼Œè¯·è¿è¡Œï¼š\n" "\n" "\tgit config --global init.defaultBranch <å称>\n" "\n" "除了 'master' 之外，通常选定的åå—有 'main'ã€'trunk' å’Œ 'development'。\n" -"å¯ä»¥é€šè¿‡ä»¥ä¸‹å‘½ä»¤é‡å‘½å刚创建的分支：\n" +"å¯ä»¥é€šè¿‡ä»¥ä¸‹å‘½ä»¤é‡å‘½å新创建的分支：\n" "\n" "\tgit branch -m <name>\n" #: refs.c #, c-format +msgid "" +"Using '%s' as the name for the initial branch since Git 3.0.\n" +"If you expected Git to create 'master', the just-created\n" +"branch can be renamed via this command:\n" +"\n" +"\tgit branch -m master\n" +msgstr "" +"从 Git 3.0 开始，使用 '%s' 作为åˆå§‹åˆ†æ”¯çš„å称。如果您期望 Git\n" +"创建 'master'，新创建的分支å¯ä»¥é€šè¿‡ä»¥ä¸‹å‘½ä»¤é‡å‘½å：\n" +"\n" +"\tgit branch -m master\n" + +#: refs.c +#, c-format msgid "could not retrieve `%s`" msgstr "æ— æ³•èŽ·å– `%s`" @@ -24515,12 +25510,38 @@ msgstr "æ— æ³•åˆ é™¤ä¸´æ—¶è¿ç§»ç›®å½• '%s'" msgid "migrated refs can be found at '%s'" msgstr "è¿ç§»çš„引用å¯ä»¥åœ¨ '%s' 处找到" +#: refs/files-backend.c +msgid "" +"'core.preferSymlinkRefs=true' is nominated for removal.\n" +"hint: The use of symbolic links for symbolic refs is deprecated\n" +"hint: and will be removed in Git 3.0. The configuration that\n" +"hint: tells Git to use them is thus going away. You can unset\n" +"hint: it with:\n" +"hint:\n" +"hint:\tgit config unset core.preferSymlinkRefs\n" +"hint:\n" +"hint: Git will then use the textual symref format instead." +msgstr "" +"'core.preferSymlinkRefs=true' 已被列入移除计划。\n" +"æ示：使用符å·é“¾æŽ¥è¡¨ç¤ºç¬¦å·å¼•ç”¨çš„功能已被弃用，\n" +"æ示：并将在 Git 3.0 ä¸ç§»é™¤ã€‚å› æ¤ï¼Œç”¨äºŽå¯ç”¨è¯¥æ–¹å¼çš„\n" +"æ示：é…置也将éšä¹‹åºŸå¼ƒã€‚您å¯ä»¥ç”¨ä»¥ä¸‹å‘½ä»¤å–消该é…置：\n" +"æ示：\n" +"æ示：\tgit config unset core.preferSymlinkRefs\n" +"æ示：\n" +"æ示：Git 将改为使用文本 symref æ ¼å¼ã€‚" + #: refs/files-backend.c refs/reftable-backend.c #, c-format msgid "" "cannot lock ref '%s': expected symref with target '%s': but is a regular ref" msgstr "æ— æ³•é”定引用 '%s'ï¼šé¢„æœŸç›®æ ‡ä¸º '%s' 的符å·å¼•ç”¨ï¼šä½†æ˜¯æ˜¯æ™®é€šå¼•ç”¨" +#: refs/files-backend.c refs/reftable-backend.c +#, c-format +msgid "trying to write reflog for '%s' with incomplete values" +msgstr "å°è¯•ä¸º '%s' 写入引用日志时使用了ä¸å®Œæ•´çš„值" + #: refs/files-backend.c #, c-format msgid "cannot read ref file '%s'" @@ -24531,10 +25552,6 @@ msgstr "æ— æ³•è¯»å–引用文件 '%s'" msgid "cannot open directory %s" msgstr "æ— æ³•æ‰“å¼€ç›®å½• %s" -#: refs/files-backend.c -msgid "Checking references consistency" -msgstr "æ£åœ¨æ£€æŸ¥å¼•ç”¨ä¸€è‡´æ€§" - #: refs/packed-backend.c #, c-format msgid "unable to open '%s'" @@ -24580,6 +25597,11 @@ msgstr "ä¸å…许对 '%s' 进行多次更新（包括通过符å·å¼•ç”¨ '%s' æ›´ #: refs/reftable-backend.c #, c-format +msgid "cannot lock ref '%s': dangling symref already exists" +msgstr "æ— æ³•é”定引用 '%s'：悬空符å·å¼•ç”¨å·²å˜åœ¨" + +#: refs/reftable-backend.c +#, c-format msgid "cannot lock ref '%s': reference already exists" msgstr "æ— æ³•é”定引用 '%s'：引用已å˜åœ¨" @@ -24704,10 +25726,6 @@ msgid "RPC failed; %s" msgstr "RPC 失败。%s" #: remote-curl.c -msgid "cannot handle pushes this big" -msgstr "ä¸èƒ½å¤„ç†è¿™ä¹ˆå¤§çš„推é€" - -#: remote-curl.c #, c-format msgid "cannot deflate request; zlib deflate error %d" msgstr "ä¸èƒ½åŽ‹ç¼©è¯·æ±‚，zlib 压缩错误 %d" @@ -24922,6 +25940,12 @@ msgstr "" #: remote.c #, c-format +msgid "" +"The <src> part of the refspec ('%s') is an object ID that doesn't exist.\n" +msgstr "å¼•ç”¨è§„æ ¼çš„ <src> 部分（'%s'）是一个ä¸å˜åœ¨çš„对象 ID。\n" + +#: remote.c +#, c-format msgid "%s cannot be resolved to branch" msgstr "%s æ— æ³•è¢«è§£æžä¸ºåˆ†æ”¯" @@ -25071,6 +26095,71 @@ msgstr "æ— æ³•è§£æžæœŸæœ›çš„对象å '%s'" msgid "cannot strip one component off url '%s'" msgstr "æ— æ³•ä»Ž url '%s' 剥离一个组件" +#: repack-geometry.c +#, c-format +msgid "cannot open index for %s" +msgstr "ä¸èƒ½æ‰“å¼€ %s 的索引" + +#: repack-geometry.c +#, c-format +msgid "pack %s too large to consider in geometric progression" +msgstr "包 %s 太大，ä¸åœ¨å‡ 何打包过程ä¸è€ƒè™‘" + +#: repack-geometry.c +#, c-format +msgid "pack %s too large to roll up" +msgstr "包 %s 太大导致数å—溢出" + +#: repack-midx.c +#, c-format +msgid "could not open tempfile %s for writing" +msgstr "æ— æ³•æ‰“å¼€ä¸´æ—¶æ–‡ä»¶ %s 进行写入" + +#: repack-midx.c +msgid "could not close refs snapshot tempfile" +msgstr "ä¸èƒ½å…³é—引用快照临时文件" + +#: repack-midx.c +#, c-format +msgid "could not remove stale bitmap: %s" +msgstr "æ— æ³•åˆ é™¤è¿‡æœŸçš„ä½å›¾ï¼š %s" + +#: repack-promisor.c +msgid "could not start pack-objects to repack promisor objects" +msgstr "æ— æ³•å¼€å§‹ pack-objects æ¥é‡æ–°æ‰“包承诺者对象" + +#: repack-promisor.c +msgid "failed to feed promisor objects to pack-objects" +msgstr "æ— æ³•å°†æ‰¿è¯ºè€…å¯¹è±¡æ供给 pack-objects" + +#: repack-promisor.c repack.c +msgid "repack: Expecting full hex object ID lines only from pack-objects." +msgstr "repack：æ¥è‡ª pack-objects 的输入必须为完整的åå…进制对象 ID 行。" + +#: repack-promisor.c +msgid "could not finish pack-objects to repack promisor objects" +msgstr "æ— æ³•å®Œæˆ pack-objects æ¥é‡æ–°æ‰“包 promisor 对象" + +#: repack.c +#, c-format +msgid "pack prefix %s does not begin with objdir %s" +msgstr "包å‰ç¼€ %s 没有以对象目录 %s 开始" + +#: repack.c +#, c-format +msgid "renaming pack to '%s' failed" +msgstr "é‡å‘½å包至 '%s' 失败" + +#: repack.c +#, c-format +msgid "pack-objects did not write a '%s' file for pack %s-%s" +msgstr "pack-objects 未为包 %2$s-%3$s 写入 '%1$s' 文件" + +#: repack.c sequencer.c +#, c-format +msgid "could not unlink: %s" +msgstr "ä¸èƒ½åˆ 除：%s" + #: replace-object.c #, c-format msgid "bad replace ref name: %s" @@ -25255,7 +26344,7 @@ msgstr "需è¦ä¸€ä¸ªå·¥ä½œç›®å½•" #: scalar.c msgid "Scalar enlistments require a worktree" -msgstr "Scalar 登记需è¦ä¸€ä¸ªå·¥ä½œæ ‘" +msgstr "Scalar 登记需è¦ä¸€ä¸ªå·¥ä½œåŒº" #: scalar.c #, c-format @@ -26648,10 +27737,6 @@ msgid "cannot chdir to '%s'" msgstr "ä¸èƒ½åˆ‡æ¢ç›®å½•åˆ° '%s'" #: setup.c -msgid "cannot come back to cwd" -msgstr "æ— æ³•è¿”å›žå½“å‰å·¥ä½œç›®å½•" - -#: setup.c #, c-format msgid "failed to stat '%*s%s%s'" msgstr "æ— æ³•èŽ·å– '%*s%s%s' 状æ€ï¼ˆstat）" @@ -27859,7 +28944,7 @@ msgstr "æ£åœ¨æ›´æ–°ç´¢å¼•æ ‡å¿—" #: unpack-trees.c #, c-format msgid "worktree and untracked commit have duplicate entries: %s" -msgstr "å·¥ä½œæ ‘å’Œæœªè·Ÿè¸ªæ交具有é‡å¤æ¡ç›®ï¼š%s" +msgstr "工作区和未跟踪æ交具有é‡å¤æ¡ç›®ï¼š%s" #: upload-pack.c msgid "expected flush after fetch arguments" @@ -27917,17 +29002,32 @@ msgstr "è¦å‘Šï¼š" #: usage.c #, c-format +msgid "'%s' is nominated for removal.\n" +msgstr "'%s' 被æå以移除。\n" + +#: usage.c +#, c-format msgid "" -"'%s' is nominated for removal.\n" -"If you still use this command, please add an extra\n" -"option, '--i-still-use-this', on the command line\n" -"and let us know you still use it by sending an e-mail\n" -"to <git@vger.kernel.org>. Thanks.\n" +"If you still use this command, here's what you can do:\n" +"\n" +"- read https://git-scm.com/docs/BreakingChanges.html\n" +"- check if anyone has discussed this on the mailing\n" +" list and if they came up with something that can\n" +" help you: https://lore.kernel.org/git/?q=%s\n" +"- send an email to <git@vger.kernel.org> to let us\n" +" know that you still use this command and were unable\n" +" to determine a suitable replacement\n" +"\n" msgstr "" -"'%s' 命令已被æå移除。\n" -"如果您ä»åœ¨ä½¿ç”¨è¯¥å‘½ä»¤ï¼Œè¯·åœ¨å‘½ä»¤è¡Œä¸æ·»åŠ é¢å¤–选项\n" -"'--i-still-use-this'，并通过å‘é€é‚®ä»¶è‡³ <git@vger.kernel.org> \n" -"通知我们您ä»åœ¨ä½¿ç”¨å®ƒã€‚谢谢。\n" +"如果您ä»åœ¨ä½¿ç”¨æ¤å‘½ä»¤ï¼Œä»¥ä¸‹æ˜¯æ‚¨å¯ä»¥åšçš„事情：\n" +"\n" +"- 阅读 https://git-scm.com/docs/BreakingChanges.html\n" +"- 检查邮件列表ä¸æ˜¯å¦æœ‰äººè®¨è®ºè¿‡æ¤é—®é¢˜ï¼Œ\n" +" 以åŠä»–们是å¦æ出了å¯ä»¥å¸®åŠ©æ‚¨çš„建议：\n" +" https://lore.kernel.org/git/?q=%s\n" +"- å‘é€ç”µå邮件至 <git@vger.kernel.org>，让我们知é“\n" +" 您ä»åœ¨ä½¿ç”¨æ¤å‘½ä»¤ä¸”æ— æ³•ç¡®å®šåˆé€‚的替代方案\n" +"\n" #: usage.c msgid "refusing to run without --i-still-use-this" @@ -28997,6 +30097,10 @@ msgid "Send this email reply required" msgstr "å‘é€è¦æ±‚的邮件回å¤" #: git-send-email.perl +msgid "The destination IMAP folder is not properly defined." +msgstr "ç›®æ ‡ IMAP 文件夹没有æ£ç¡®å®šä¹‰ã€‚" + +#: git-send-email.perl msgid "The required SMTP server is not properly defined." msgstr "è¦æ±‚çš„ SMTP æœåŠ¡å™¨æœªè¢«æ£ç¡®å®šä¹‰ã€‚" diff --git a/po/zh_TW.po b/po/zh_TW.po index 6fe5dbccd2..5301aff339 100644 --- a/po/zh_TW.po +++ b/po/zh_TW.po @@ -30,9 +30,9 @@ msgid "" msgstr "" "Project-Id-Version: Git\n" "Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n" -"POT-Creation-Date: 2025-08-16 12:10+0800\n" -"PO-Revision-Date: 2025-08-16 12:11+0800\n" -"Last-Translator: hms5232 <hms5232@hhming.moe>\n" +"POT-Creation-Date: 2025-11-12 20:14+0800\n" +"PO-Revision-Date: 2025-11-15 10:02+0000\n" +"Last-Translator: Lumynous <lumynou5.tw@gmail.com>\n" "Language-Team: Chinese (Traditional Han script) <https://weblate.slat.org/" "projects/git-po/git-cli/zh_Hant/>\n" "Language: zh_TW\n" @@ -40,9 +40,9 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=1; plural=0;\n" -"X-Generator: Poedit 3.6\n" -"X-ZhConverter: ç¹åŒ–姬 dict-f4bc617e-r910 @ 2019/11/16 20:23:12 | https://" -"zhconvert.org\n" +"X-Generator: Weblate 5.13.2\n" +"X-ZhConverter: ç¹åŒ–姬 dict-f4bc617e-r910 @ 2019/11/16 20:23:12 | " +"https://zhconvert.org\n" #: add-interactive.c #, c-format @@ -660,26 +660,28 @@ msgstr "未套用。\n" #: add-patch.c msgid "" -"j - leave this hunk undecided, see next undecided hunk\n" -"J - leave this hunk undecided, see next hunk\n" -"k - leave this hunk undecided, see previous undecided hunk\n" -"K - leave this hunk undecided, see previous hunk\n" +"j - go to the next undecided hunk, roll over at the bottom\n" +"J - go to the next hunk, roll over at the bottom\n" +"k - go to the previous undecided hunk, roll over at the top\n" +"K - go to the previous hunk, roll over at the top\n" "g - select a hunk to go to\n" "/ - search for a hunk matching the given regex\n" "s - split the current hunk into smaller hunks\n" "e - manually edit the current hunk\n" -"p - print the current hunk, 'P' to use the pager\n" +"p - print the current hunk\n" +"P - print the current hunk using the pager\n" "? - print help\n" msgstr "" -"j - ç¶æŒæ¤å€å¡Šæœªæ±ºå®šç‹€æ…‹ï¼Œæª¢è¦–下一個未決定å€å¡Š\n" -"J - ç¶æŒæ¤å€å¡Šæœªæ±ºå®šç‹€æ…‹ï¼Œæª¢è¦–下一個å€å¡Š\n" -"k - ç¶æŒæ¤å€å¡Šæœªæ±ºå®šç‹€æ…‹ï¼Œæª¢è¦–上一個未決定å€å¡Š\n" -"K - ç¶æŒæ¤å€å¡Šæœªæ±ºå®šç‹€æ…‹ï¼Œæª¢è¦–上一個å€å¡Š\n" +"j - å‰å¾€ä¸‹ä¸€å€‹æœªæ±ºå€å¡Šï¼Œåœ¨çµå°¾æ™‚回到開é \n" +"J - å‰å¾€ä¸‹ä¸€å€‹å€å¡Šï¼Œåœ¨çµå°¾æ™‚回到開é \n" +"k - å‰å¾€ä¸Šä¸€å€‹æœªæ±ºå€å¡Šï¼Œåœ¨é–‹é 時回到çµå°¾\n" +"K - å‰å¾€ä¸Šä¸€å€‹å€å¡Šï¼Œåœ¨é–‹é 時回到çµå°¾\n" "g - é¸æ“‡è¦è·³è½‰è‡³çš„å€å¡Š\n" "/ - 尋找符åˆæ供之常è¦è¡¨ç¤ºå¼çš„å€å¡Š\n" "s - 分割目å‰å€å¡Šç‚ºæ›´å°çš„å€å¡Š\n" "e - 手動編輯目å‰å€å¡Š\n" -"p - 輸出目å‰å€å¡Šï¼Œã€ŒPã€åˆ†é 顯示\n" +"p - 輸出目å‰å€å¡Š\n" +"P - 分é 輸出目å‰å€å¡Š\n" "? - 顯示說明\n" #: add-patch.c @@ -688,16 +690,16 @@ msgid "Only one letter is expected, got '%s'" msgstr "é 期收到一個å—æ¯ï¼Œå»æ”¶åˆ°ã€Œ%sã€" #: add-patch.c -msgid "No previous hunk" -msgstr "沒有上一個å€å¡Š" +msgid "No other hunk" +msgstr "沒有其他å€å¡Š" #: add-patch.c -msgid "No next hunk" -msgstr "沒有下一個å€å¡Š" +msgid "No other undecided hunk" +msgstr "沒有其他未決å€å¡Š" #: add-patch.c msgid "No other hunks to goto" -msgstr "沒有其它å¯ä»¥è·³è½‰çš„å€å¡Š" +msgstr "沒有其他å¯ä»¥è·³è½‰çš„å€å¡Š" #: add-patch.c msgid "go to which hunk (<ret> to see more)? " @@ -720,7 +722,7 @@ msgstr[0] "å°ä¸èµ·ï¼Œåªæœ‰ %d 個å¯ç”¨å€å¡Šã€‚" #: add-patch.c msgid "No other hunks to search" -msgstr "沒有其它å¯ä»¥å°‹æ‰¾çš„å€å¡Š" +msgstr "沒有其他å¯ä»¥å°‹æ‰¾çš„å€å¡Š" #: add-patch.c msgid "search for regex? " @@ -939,7 +941,8 @@ msgid "unclosed quote" msgstr "未閉åˆçš„引號" #: alias.c builtin/cat-file.c builtin/notes.c builtin/prune-packed.c -#: builtin/receive-pack.c builtin/refs.c builtin/tag.c t/helper/test-pkt-line.c +#: builtin/receive-pack.c builtin/refs.c builtin/repo.c builtin/tag.c +#: t/helper/test-pkt-line.c msgid "too many arguments" msgstr "引數éŽå¤š" @@ -1251,7 +1254,7 @@ msgstr "%s：錯誤類型" msgid "%s has type %o, expected %o" msgstr "%s 的類型是 %o，é 期是 %o" -#: apply.c read-cache.c +#: apply.c builtin/fast-import.c read-cache.c #, c-format msgid "invalid path '%s'" msgstr "路徑「%sã€ç„¡æ•ˆ" @@ -1626,7 +1629,7 @@ msgstr "" msgid "git archive --remote <repo> [--exec <cmd>] --list" msgstr "git archive --remote <repo> [--exec <cmd>] --list" -#: archive.c builtin/gc.c builtin/notes.c builtin/tag.c +#: archive.c builtin/fast-import.c builtin/gc.c builtin/notes.c builtin/tag.c #, c-format msgid "cannot read '%s'" msgstr "無法讀å–「%sã€" @@ -1983,9 +1986,9 @@ msgstr "--contents å’Œ --reverse ä¸èƒ½æ··ç”¨ã€‚" msgid "--reverse and --first-parent together require specified latest commit" msgstr "--reverse å’Œ --first-parent 共用，需è¦æŒ‡å®šæœ€æ–°çš„æ交" -#: blame.c builtin/bisect.c builtin/commit.c builtin/log.c builtin/merge.c -#: builtin/pack-objects.c builtin/shortlog.c midx-write.c pack-bitmap.c -#: remote.c sequencer.c submodule.c +#: blame.c builtin/bisect.c builtin/commit.c builtin/fast-export.c +#: builtin/log.c builtin/merge.c builtin/pack-objects.c builtin/shortlog.c +#: midx-write.c pack-bitmap.c remote.c sequencer.c submodule.c msgid "revision walk setup failed" msgstr "修訂版éæ·è¨å®šå¤±æ•—" @@ -2225,7 +2228,7 @@ msgstr "ä¸‹åˆ—è·¯å¾‘æ ¹æ“šå…¶ä¸ä¸€å€‹ .gitignore 檔案而被忽略：\n" #: builtin/add.c builtin/clean.c builtin/fetch.c builtin/mv.c #: builtin/prune-packed.c builtin/pull.c builtin/push.c builtin/remote.c -#: builtin/rm.c builtin/send-pack.c +#: builtin/rm.c builtin/send-pack.c builtin/sparse-checkout.c msgid "dry run" msgstr "測試執行" @@ -2313,7 +2316,7 @@ msgid "" "See \"git help submodule\" for more information." msgstr "" "您在目å‰çš„版本庫ä¸åŠ 進å¦ä¸€å€‹ Git 版本庫。\n" -"複製外層的版本庫，將ä¸åŒ…å«åµŒå…¥ç‰ˆæœ¬åº«çš„內容，\n" +"拓製外層的版本庫，將ä¸åŒ…å«åµŒå…¥ç‰ˆæœ¬åº«çš„內容，\n" "並且ä¸åŒ…å«å–å¾—æ¤ç‰ˆæœ¬åº«çš„æ–¹å¼ã€‚\n" "如果您è¦åŠ å…¥å模組，請使用：\n" "\n" @@ -2383,8 +2386,8 @@ msgid "bad action '%s' for '%s'" msgstr "「%sã€å‹•ä½œå°ã€Œ%sã€ç„¡æ•ˆ" #: builtin/am.c builtin/blame.c builtin/fetch.c builtin/pack-objects.c -#: builtin/pull.c builtin/revert.c diff-merges.c environment.c gpg-interface.c -#: ls-refs.c parallel-checkout.c sequencer.c setup.c +#: builtin/pull.c builtin/revert.c diff-merges.c diff.c environment.c +#: gpg-interface.c ls-refs.c parallel-checkout.c sequencer.c setup.c #, c-format msgid "invalid value for '%s': '%s'" msgstr "「%sã€çš„值無效：「%sã€" @@ -2416,7 +2419,7 @@ msgstr "æ ¼å¼éŒ¯èª¤çš„輸入列：「%sã€ã€‚" #: builtin/am.c #, c-format msgid "Failed to copy notes from '%s' to '%s'" -msgstr "從「%sã€æ‹·è²è¨»è§£åˆ°ã€Œ%sã€å¤±æ•—" +msgstr "從「%sã€è¤‡è£½è¨»è§£åˆ°ã€Œ%sã€å¤±æ•—" #: builtin/am.c msgid "fseek failed" @@ -2613,7 +2616,7 @@ msgid "" "already introduced the same changes; you might want to skip this patch." msgstr "" "沒有變更：是å¦å¿˜è¨˜åŸ·è¡Œã€Œgit addã€ï¼Ÿ\n" -"如果沒有其他è¦æ–°å¢žåˆ°æš«å˜å€çš„，則很å¯èƒ½æ˜¯å…¶å®ƒæ交\n" +"如果沒有其他è¦æ–°å¢žåˆ°æš«å˜å€çš„，則很å¯èƒ½æ˜¯å…¶ä»–æ交\n" "已經引入了相åŒçš„變更。您也許想è¦ç•¥éŽé€™å€‹ä¿®è£œæª”。" #: builtin/am.c @@ -2723,7 +2726,8 @@ msgstr "n" #: builtin/am.c builtin/branch.c builtin/bugreport.c builtin/cat-file.c #: builtin/clone.c builtin/diagnose.c builtin/for-each-ref.c builtin/init-db.c #: builtin/ls-files.c builtin/ls-tree.c builtin/refs.c builtin/replace.c -#: builtin/submodule--helper.c builtin/tag.c builtin/verify-tag.c +#: builtin/repo.c builtin/submodule--helper.c builtin/tag.c +#: builtin/verify-tag.c msgid "format" msgstr "format" @@ -2869,15 +2873,21 @@ msgstr "將缺少的物件é™åˆ¶æ–¼ç›®å‰çš„稀ç–簽出" #: builtin/bisect.c msgid "" -"git bisect start [--term-(new|bad)=<term> --term-(old|good)=<term>] [--no-" -"checkout] [--first-parent] [<bad> [<good>...]] [--] [<pathspec>...]" +"git bisect start [--term-(bad|new)=<term-new> --term-(good|old)=<term-old>]\n" +" [--no-checkout] [--first-parent] [<bad> [<good>...]] [--] " +"[<pathspec>...]" msgstr "" -"git bisect start [--term-(new|bad)=<term> --term-(old|good)=<term>] [--no-" -"checkout] [--first-parent] [<bad> [<good>...]] [--] [<pathspec>...]" +"git bisect start [--term-(bad|new)=<term-new> --term-(good|old)=<term-old>]\n" +" [--no-checkout] [--first-parent] [<bad> [<good>...]] [--] " +"[<pathspec>...]" + +#: builtin/bisect.c +msgid "git bisect (bad|new|<term-new>) [<rev>]" +msgstr "git bisect (bad|new|<term-new>) [<rev>]" #: builtin/bisect.c -msgid "git bisect (good|bad) [<rev>...]" -msgstr "git bisect (good|bad) [<rev>...]" +msgid "git bisect (good|old|<term-old>) [<rev>...]" +msgstr "git bisect (good|old|<term-old>) [<rev>...]" #: builtin/bisect.c msgid "git bisect skip [(<rev>|<range>)...]" @@ -3327,7 +3337,7 @@ msgstr "score" #: builtin/blame.c msgid "find line copies within and across files" -msgstr "尋找檔案內åŠè·¨æª”案拷è²çš„列" +msgstr "尋找檔案內åŠè·¨æª”案複製的列" #: builtin/blame.c msgid "find line movements within and across files" @@ -3529,7 +3539,7 @@ msgstr "é‡æ–°å‘½å分支失敗" #: builtin/branch.c msgid "branch copy failed" -msgstr "æ‹·è²åˆ†æ”¯å¤±æ•—" +msgstr "複製分支失敗" #: builtin/branch.c #, c-format @@ -3552,7 +3562,7 @@ msgstr "分支已é‡æ–°å‘½å，但組態檔案更新失敗" #: builtin/branch.c msgid "branch is copied, but update of config-file failed" -msgstr "分支已拷è²ï¼Œä½†çµ„態檔案更新失敗" +msgstr "分支已複製，但組態檔案更新失敗" #: builtin/branch.c #, c-format @@ -3643,11 +3653,11 @@ msgstr "åœ¨æ ¼å¼åŒ–為空å—串的引用之後ä¸è¼¸å‡ºæ›åˆ—符號" #: builtin/branch.c msgid "copy a branch and its reflog" -msgstr "æ‹·è²åˆ†æ”¯åŠå…¶å¼•ç”¨æ—¥èªŒ" +msgstr "複製分支åŠå…¶å¼•ç”¨æ—¥èªŒ" #: builtin/branch.c msgid "copy a branch, even if target exists" -msgstr "å³ä½¿ç›®æ¨™å·²å˜åœ¨ä»æ‹·è²åˆ†æ”¯" +msgstr "å³ä½¿ç›®æ¨™å·²å˜åœ¨ä»è¤‡è£½åˆ†æ”¯" #: builtin/branch.c msgid "list branch names" @@ -3735,7 +3745,7 @@ msgstr "無法編輯超éŽä¸€å€‹åˆ†æ”¯çš„æè¿°" #: builtin/branch.c msgid "cannot copy the current branch while not on any" -msgstr "ä¸åœ¨ä»»ä½•åˆ†æ”¯ä¸Šï¼Œä¸èƒ½æ‹·è²ç›®å‰åˆ†æ”¯" +msgstr "ä¸åœ¨ä»»ä½•åˆ†æ”¯ä¸Šï¼Œä¸èƒ½è¤‡è£½ç›®å‰åˆ†æ”¯" #: builtin/branch.c msgid "cannot rename the current branch while not on any" @@ -3743,7 +3753,7 @@ msgstr "ä¸åœ¨ä»»ä½•åˆ†æ”¯ä¸Šï¼Œä¸èƒ½é‡æ–°å‘½åç›®å‰åˆ†æ”¯" #: builtin/branch.c msgid "too many branches for a copy operation" -msgstr "è¦é€²è¡Œæ‹·è²å‹•ä½œçš„分支太多" +msgstr "è¦é€²è¡Œè¤‡è£½å‹•ä½œçš„分支太多" #: builtin/branch.c msgid "too many arguments for a rename operation" @@ -4265,7 +4275,7 @@ msgstr "亦從 stdin 讀å–è¯çµ¡åœ°å€" msgid "read additional mailmap entries from file" msgstr "從檔案讀å–é¡å¤– mailmap é …ç›®" -#: builtin/check-mailmap.c +#: builtin/check-mailmap.c builtin/fast-import.c msgid "blob" msgstr "資料物件" @@ -4494,7 +4504,7 @@ msgstr "已切æ›è‡³åˆ†æ”¯ã€Œ%sã€\n" #: builtin/checkout.c #, c-format msgid " ... and %d more.\n" -msgstr " …… åŠå…¶å®ƒ %d 個。\n" +msgstr " …… åŠå…¶ä»– %d 個。\n" #: builtin/checkout.c #, c-format @@ -4868,12 +4878,12 @@ msgstr "" "git clean [-d] [-f] [-i] [-n] [-q] [-e <pattern>] [-x | -X] [--] " "[<pathspec>...]" -#: builtin/clean.c +#: builtin/clean.c builtin/sparse-checkout.c #, c-format msgid "Removing %s\n" msgstr "æ£åœ¨åˆªé™¤ %s\n" -#: builtin/clean.c +#: builtin/clean.c builtin/sparse-checkout.c #, c-format msgid "Would remove %s\n" msgstr "將會刪除 %s\n" @@ -4996,7 +5006,7 @@ msgstr "沒有è¦æ¸…ç†çš„檔案，離開。" msgid "do not print names of files removed" msgstr "ä¸è¼¸å‡ºç§»é™¤çš„檔案的å稱" -#: builtin/clean.c +#: builtin/clean.c builtin/sparse-checkout.c msgid "force" msgstr "force" @@ -5009,8 +5019,8 @@ msgid "remove whole directories" msgstr "移除整個目錄" #: builtin/clean.c builtin/config.c builtin/describe.c builtin/grep.c -#: builtin/log.c builtin/ls-files.c builtin/name-rev.c builtin/pack-refs.c -#: builtin/show-ref.c ref-filter.h +#: builtin/log.c builtin/ls-files.c builtin/name-rev.c builtin/show-ref.c +#: pack-refs.c ref-filter.h msgid "pattern" msgstr "pattern" @@ -5048,7 +5058,7 @@ msgstr "%s å˜åœ¨ä¸”ä¸æ˜¯ç›®éŒ„" #: builtin/clone.c #, c-format msgid "'%s' is a symlink, refusing to clone with --local" -msgstr "「%sã€æ˜¯ç¬¦è™Ÿé€£çµï¼Œæ•…ä¸èƒ½ä½¿ç”¨ --local 複製" +msgstr "「%sã€æ˜¯ç¬¦è™Ÿé€£çµï¼Œæ•…ä¸èƒ½ä½¿ç”¨ --local 拓製" #: builtin/clone.c #, c-format @@ -5058,7 +5068,7 @@ msgstr "無法在「%sã€ä¸Šå•Ÿå‹•è¿ä»£å™¨" #: builtin/clone.c #, c-format msgid "symlink '%s' exists, refusing to clone with --local" -msgstr "符號連çµã€Œ%sã€å·²å˜åœ¨ï¼Œæ‹’絕使用 --local 複製" +msgstr "符號連çµã€Œ%sã€å·²å˜åœ¨ï¼Œæ‹’絕使用 --local 拓製" #: builtin/clone.c compat/precompose_utf8.c #, c-format @@ -5083,7 +5093,7 @@ msgstr "建立連çµã€Œ%sã€å¤±æ•—" #: builtin/clone.c #, c-format msgid "failed to copy file to '%s'" -msgstr "æ‹·è²æª”案至「%sã€å¤±æ•—" +msgstr "複製檔案至「%sã€å¤±æ•—" #: builtin/clone.c refs/files-backend.c #, c-format @@ -5101,7 +5111,7 @@ msgid "" "You can inspect what was checked out with 'git status'\n" "and retry with 'git restore --source=HEAD :/'\n" msgstr "" -"複製æˆåŠŸï¼Œä½†æ˜¯ç°½å‡ºå¤±æ•—。\n" +"拓製æˆåŠŸï¼Œä½†æ˜¯ç°½å‡ºå¤±æ•—。\n" "您å¯ä»¥é€éŽã€Œgit statusã€æª¢æŸ¥å“ªäº›å·²è¢«ç°½å‡ºï¼Œç„¶å¾Œä½¿ç”¨æŒ‡ä»¤\n" "「git restore --source=HEAD :/ã€é‡è©¦\n" @@ -5140,7 +5150,7 @@ msgstr "ç„¡æ³•åˆªé™¤æš«å˜ alternates 檔案" #: builtin/clone.c msgid "don't clone shallow repository" -msgstr "ä¸è¦è¤‡è£½æ·ºå±¤ç‰ˆæœ¬åº«" +msgstr "ä¸è¦æ‹“製淺層版本庫" #: builtin/clone.c msgid "don't create a checkout" @@ -5156,11 +5166,11 @@ msgstr "建立é¡åƒç‰ˆæœ¬åº«ï¼ˆéš±å« --bare）" #: builtin/clone.c msgid "to clone from a local repository" -msgstr "從本機版本庫複製" +msgstr "從本機版本庫拓製" #: builtin/clone.c msgid "don't use local hardlinks, always copy" -msgstr "ä¸ä½¿ç”¨æœ¬æ©Ÿç¡¬é€£çµï¼Œå§‹çµ‚æ‹·è²" +msgstr "ä¸ä½¿ç”¨æœ¬æ©Ÿç¡¬é€£çµï¼Œå§‹çµ‚複製" #: builtin/clone.c msgid "setup as shared repository" @@ -5172,11 +5182,11 @@ msgstr "路徑è¦æ ¼" #: builtin/clone.c msgid "initialize submodules in the clone" -msgstr "在複製時åˆå§‹åŒ–å模組" +msgstr "在拓製時åˆå§‹åŒ–å模組" #: builtin/clone.c msgid "number of submodules cloned in parallel" -msgstr "平行複製的å模組數é‡" +msgstr "平行拓製的å模組數é‡" #: builtin/clone.c builtin/init-db.c msgid "template-directory" @@ -5192,7 +5202,7 @@ msgstr "引用版本庫" #: builtin/clone.c builtin/submodule--helper.c msgid "use --reference only while cloning" -msgstr "僅在複製時使用 --reference" +msgstr "僅在拓製時使用 --reference" #: builtin/clone.c builtin/column.c builtin/fmt-merge-msg.c builtin/init-db.c #: builtin/merge-file.c builtin/merge.c builtin/pack-objects.c builtin/repack.c @@ -5210,7 +5220,7 @@ msgstr "簽出 <branch> 而ä¸æ˜¯é 端 HEAD" #: builtin/clone.c msgid "clone single revision <rev> and check out" -msgstr "複製單個修訂版 <rev> 並簽出" +msgstr "拓製單個修訂版 <rev> 並簽出" #: builtin/clone.c msgid "path to git-upload-pack on the remote" @@ -5222,11 +5232,11 @@ msgstr "depth" #: builtin/clone.c msgid "create a shallow clone of that depth" -msgstr "建立指定深度的淺層複製" +msgstr "建立指定深度的淺層拓製" #: builtin/clone.c msgid "create a shallow clone since a specific time" -msgstr "建立從指定時間到ç¾åœ¨çš„淺層複製" +msgstr "建立從指定時間到ç¾åœ¨çš„淺層拓製" #: builtin/clone.c builtin/fetch.c builtin/pull.c msgid "ref" @@ -5234,19 +5244,19 @@ msgstr "ref" #: builtin/clone.c builtin/fetch.c builtin/pull.c msgid "deepen history of shallow clone, excluding ref" -msgstr "å–得更多淺層複製的éŽå¾€æ·å²è¨˜éŒ„，除了特定修訂版" +msgstr "å–得更多淺層拓製的éŽå¾€æ·å²è¨˜éŒ„，除了特定修訂版" #: builtin/clone.c builtin/submodule--helper.c msgid "clone only one branch, HEAD or --branch" -msgstr "åªè¤‡è£½ä¸€å€‹åˆ†æ”¯ã€HEAD 或 --branch" +msgstr "åªæ‹“製一個分支ã€HEAD 或 --branch" #: builtin/clone.c msgid "clone tags, and make later fetches not to follow them" -msgstr "複製標籤，並使後續抓å–ä¸è¦è¿½è¹¤é€™äº›æ¨™ç±¤" +msgstr "拓製標籤，並使後續抓å–ä¸è¦è¿½è¹¤é€™äº›æ¨™ç±¤" #: builtin/clone.c msgid "any cloned submodules will be shallow" -msgstr "å模組將以淺下載模å¼è¤‡è£½" +msgstr "å模組將以淺下載模å¼æ‹“製" #: builtin/clone.c builtin/init-db.c msgid "gitdir" @@ -5280,11 +5290,11 @@ msgstr "傳輸é¸é …" #: builtin/clone.c msgid "apply partial clone filters to submodules" -msgstr "將部分複製éŽæ¿¾å™¨å¥—用至å模組" +msgstr "將部分拓製éŽæ¿¾å™¨å¥—用至å模組" #: builtin/clone.c msgid "any cloned submodules will use their remote-tracking branch" -msgstr "任何複製的å模組都將使用它們的é 端追蹤分支" +msgstr "任何拓製的å模組都將使用它們的é 端追蹤分支" #: builtin/clone.c msgid "initialize sparse-checkout file to include only files at root" @@ -5308,7 +5318,7 @@ msgstr "太多åƒæ•¸ã€‚" #: builtin/clone.c scalar.c msgid "You must specify a repository to clone." -msgstr "æ‚¨å¿…é ˆæŒ‡å®šè¦è¤‡è£½çš„版本庫。" +msgstr "æ‚¨å¿…é ˆæŒ‡å®šè¦æ‹“製的版本庫。" #: builtin/clone.c builtin/init-db.c builtin/refs.c builtin/submodule--helper.c #: setup.c @@ -5354,12 +5364,12 @@ msgstr "無法建立工作å€ç›®éŒ„「%sã€" #: builtin/clone.c #, c-format msgid "Cloning into bare repository '%s'...\n" -msgstr "複製到純版本庫 '%s'...\n" +msgstr "拓製到純版本庫 '%s'...\n" #: builtin/clone.c #, c-format msgid "Cloning into '%s'...\n" -msgstr "æ£è¤‡è£½åˆ° '%s'...\n" +msgstr "æ£æ‹“製到 '%s'...\n" #: builtin/clone.c msgid "" @@ -5374,27 +5384,27 @@ msgstr "'%s' ä¸æ˜¯ä¸€å€‹æœ‰æ•ˆçš„é 端å稱" #: builtin/clone.c msgid "--depth is ignored in local clones; use file:// instead." -msgstr "本機複製會忽略 --depth。請改用 file:// 通訊å”定。" +msgstr "本機拓製會忽略 --depth。請改用 file:// 通訊å”定。" #: builtin/clone.c msgid "--shallow-since is ignored in local clones; use file:// instead." -msgstr "本機複製會忽略 --shallow-since。請改用 file:// å”定。" +msgstr "本機拓製會忽略 --shallow-since。請改用 file:// å”定。" #: builtin/clone.c msgid "--shallow-exclude is ignored in local clones; use file:// instead." -msgstr "本機複製會忽略 --shallow-exclude。請改用 file:// å”定。" +msgstr "本機拓製會忽略 --shallow-exclude。請改用 file:// å”定。" #: builtin/clone.c msgid "--filter is ignored in local clones; use file:// instead." -msgstr "本機複製會忽略 --filter。請改用 file:// å”定。" +msgstr "本機拓製會忽略 --filter。請改用 file:// å”定。" #: builtin/clone.c fetch-pack.c msgid "source repository is shallow, reject to clone." -msgstr "來æºç‰ˆæœ¬åº«æ˜¯æ·ºç‰ˆæœ¬åº« (shallow)。拒絕複製。" +msgstr "來æºç‰ˆæœ¬åº«æ˜¯æ·ºç‰ˆæœ¬åº« (shallow)。拒絕拓製。" #: builtin/clone.c msgid "source repository is shallow, ignoring --local" -msgstr "來æºç‰ˆæœ¬åº«æ˜¯æ·ºè¤‡è£½ï¼Œå¿½ç•¥ --local" +msgstr "來æºç‰ˆæœ¬åº«æ˜¯æ·ºæ‹“製，忽略 --local" #: builtin/clone.c msgid "--local is ignored" @@ -5402,7 +5412,7 @@ msgstr "--local 被忽略" #: builtin/clone.c msgid "cannot clone from filtered bundle" -msgstr "無法從éŽæ¿¾å¾Œçš„套件包複製" +msgstr "無法從éŽæ¿¾å¾Œçš„套件包拓製" #: builtin/clone.c msgid "failed to initialize the repo, skipping bundle URI" @@ -5433,7 +5443,7 @@ msgstr "上游 %2$s 上找ä¸åˆ°é 端修訂版 %1$s" #: builtin/clone.c msgid "You appear to have cloned an empty repository." -msgstr "您複製的版本庫似乎是空的。" +msgstr "您拓製的版本庫似乎是空的。" #: builtin/column.c msgid "git column [<options>]" @@ -6516,7 +6526,7 @@ msgstr "" #: builtin/config.c msgid "Other" -msgstr "其它" +msgstr "其他" #: builtin/config.c msgid "respect include directives on lookup" @@ -6837,6 +6847,16 @@ msgstr "找到 %i 個標籤；在 %s 放棄æœå°‹\n" #: builtin/describe.c #, c-format +msgid "cannot search for blob '%s' on an unborn branch" +msgstr "ä¸èƒ½åœ¨æœªèª•ç”Ÿçš„分支上æœå°‹è³‡æ–™ç‰©ä»¶ã€Œ%sã€" + +#: builtin/describe.c +#, c-format +msgid "blob '%s' not reachable from HEAD" +msgstr "從 HEAD 無法到é”資料物件「%sã€" + +#: builtin/describe.c +#, c-format msgid "describe %s\n" msgstr "æè¿° %s\n" @@ -6986,7 +7006,7 @@ msgstr "讀å–目的地路徑時é‡åˆ° EOF" #: builtin/diff-pairs.c #, c-format msgid "unable to parse rename/copy score: %s" -msgstr "無法解æžé‡æ–°å‘½å/æ‹·è²åˆ†æ•¸ï¼š%s" +msgstr "無法解æžé‡æ–°å‘½å/複製的相似度：%s" #: builtin/diff-pairs.c #, c-format @@ -7016,6 +7036,10 @@ msgstr "無效é¸é …：%s" msgid "%s...%s: no merge base" msgstr "%s...%s: ç„¡åˆä½µåŸºåº•" +#: builtin/diff.c setup.c +msgid "cannot come back to cwd" +msgstr "無法返回目å‰å·¥ä½œç›®éŒ„" + #: builtin/diff.c msgid "Not a git repository" msgstr "ä¸æ˜¯ä¸€å€‹ git 版本庫" @@ -7079,7 +7103,7 @@ msgstr "工作å€æª”案被留了下來。" #: builtin/difftool.c sequencer.c #, c-format msgid "could not copy '%s' to '%s'" -msgstr "無法將「%sã€æ‹·è²è‡³ã€Œ%sã€" +msgstr "無法將「%sã€è¤‡è£½è‡³ã€Œ%sã€" #: builtin/difftool.c #, c-format @@ -7154,8 +7178,161 @@ msgid "git fast-export [<rev-list-opts>]" msgstr "git fast-export [<rev-list-opts>]" #: builtin/fast-export.c -msgid "Error: Cannot export nested tags unless --mark-tags is specified." -msgstr "錯誤：除éžæŒ‡å®š --mark-tags，å¦å‰‡ç„¡æ³•åŒ¯å‡ºåµŒå¥—標籤。" +#, c-format +msgid "unknown %s mode: %s" +msgstr "%s 的模å¼æœªçŸ¥ï¼š%s" + +#: builtin/fast-export.c +#, c-format +msgid "unknown tag-of-filtered mode: %s" +msgstr "標籤之物件濾除者的模å¼æœªçŸ¥ï¼š%s" + +#: builtin/fast-export.c +#, c-format +msgid "unknown reencoding mode: %s" +msgstr "é‡æ–°ç·¨ç¢¼çš„模å¼æœªçŸ¥ï¼š%s" + +#: builtin/fast-export.c +#, c-format +msgid "could not read blob %s" +msgstr "無法讀å–資料物件 %s" + +#: builtin/fast-export.c +#, c-format +msgid "oid mismatch in blob %s" +msgstr "資料物件 %s ä¸çš„物件 ID ä¸ç¬¦" + +#: builtin/fast-export.c +#, c-format +msgid "could not write blob '%s'" +msgstr "無法寫入資料物件「%sã€" + +#: builtin/fast-export.c +#, c-format +msgid "unexpected comparison status '%c' for %s, %s" +msgstr "%2$sã€%3$s 有éžé 期的比較狀態「%1$cã€" + +#: builtin/fast-export.c +msgid "none" +msgstr "ç„¡" + +#: builtin/fast-export.c +#, c-format +msgid "could not find author in commit %s" +msgstr "無法從æ交 %s ä¸æ‰¾åˆ°ä½œè€…" + +#: builtin/fast-export.c +#, c-format +msgid "could not find committer in commit %s" +msgstr "無法從æ交 %s ä¸æ‰¾åˆ°æ交者" + +#: builtin/fast-export.c +#, c-format +msgid "" +"encountered commit-specific encoding %.*s in commit %s; use --reencode=[yes|" +"no] to handle it" +msgstr "" +"發ç¾æ交特定的編碼 %.*s 在 %s æ交當ä¸ï¼›ä½¿ç”¨ --reencode=[yes|no] 來處ç†" + +#: builtin/fast-export.c +#, c-format +msgid "encountered signed commit %s; use --signed-commits=<mode> to handle it" +msgstr "發ç¾å·²ç°½ç½²çš„æ交 %s；使用 --signed-commits=<mode> 來處ç†" + +#: builtin/fast-export.c +#, c-format +msgid "exporting %<PRIuMAX> signature(s) for commit %s" +msgstr "匯出æ交 %2$s çš„ %1$<PRIuMAX> å€‹ç°½ç« " + +#: builtin/fast-export.c +#, c-format +msgid "stripping signature(s) from commit %s" +msgstr "去除æ交 %s çš„ç°½ç« " + +#: builtin/fast-export.c +#, c-format +msgid "" +"omitting tag %s,\n" +"since tags of trees (or tags of tags of trees, etc.) are not supported." +msgstr "" +"çœç•¥æ¨™ç±¤ %s，\n" +"ä¸æ”¯æ´æ¨¹ç‹€ç‰©ä»¶çš„標籤（或樹狀物件的標籤的標籤ç‰ï¼‰ã€‚" + +#: builtin/fast-export.c +#, c-format +msgid "could not read tag %s" +msgstr "無法讀å–標籤 %s" + +#: builtin/fast-export.c +#, c-format +msgid "encountered signed tag %s; use --signed-tags=<mode> to handle it" +msgstr "發ç¾å·²ç°½ç½²çš„標籤 %s；使用 --signed-tags=<mode> 來處ç†" + +#: builtin/fast-export.c +#, c-format +msgid "exporting signed tag %s" +msgstr "匯出已簽署的標籤 %s" + +#: builtin/fast-export.c +#, c-format +msgid "stripping signature from tag %s" +msgstr "去除標籤 %s çš„ç°½ç« " + +#: builtin/fast-export.c +#, c-format +msgid "" +"tag %s tags unexported object; use --tag-of-filtered-object=<mode> to handle " +"it" +msgstr "標籤 %s 在ä¸æ”¯æ´çš„物件上；使用 --tag-of-filtered-object=<mode> 來處ç†" + +#: builtin/fast-export.c +msgid "cannot export nested tags unless --mark-tags is specified." +msgstr "除éžæŒ‡å®š --mark-tags，å¦å‰‡ä¸èƒ½åŒ¯å‡ºå·¢ç‹€æ¨™ç±¤ã€‚" + +#: builtin/fast-export.c +#, c-format +msgid "tag %s points nowhere?" +msgstr "標籤 %s ä¸æŒ‡å‘任何æ±è¥¿ï¼Ÿ" + +#: builtin/fast-export.c +#, c-format +msgid "%s: unexpected object of type %s, skipping." +msgstr "%s：éžé 期 %s 類型的物件，跳éŽã€‚" + +#: builtin/fast-export.c +#, c-format +msgid "tag points to object of unexpected type %s, skipping." +msgstr "標籤指å‘éžé 期類型 %s 的物件，跳éŽã€‚" + +#: builtin/fast-export.c +#, c-format +msgid "unable to open marks file %s for writing." +msgstr "無法為寫入開啟標記檔案 %s。" + +#: builtin/fast-export.c +#, c-format +msgid "unable to write marks file %s." +msgstr "無法寫入標記檔案 %s。" + +#: builtin/fast-export.c builtin/fast-import.c +#, c-format +msgid "corrupt mark line: %s" +msgstr "æ壞的標記列：%s" + +#: builtin/fast-export.c builtin/fast-import.c fetch-pack.c +#, c-format +msgid "object not found: %s" +msgstr "物件未找到：%s" + +#: builtin/fast-export.c +#, c-format +msgid "not a commit? can't happen: %s" +msgstr "ä¸æ˜¯æ交？ä¸èƒ½ç™¼ç”Ÿï¼š%s" + +#: builtin/fast-export.c +#, c-format +msgid "object %s already has a mark" +msgstr "物件 %s 已有標記" #: builtin/fast-export.c msgid "--anonymize-map token cannot be empty" @@ -7243,33 +7420,569 @@ msgstr "為包å«æ¨™è¨˜ ID 的標籤打上標記" #: builtin/fast-import.c #, c-format -msgid "Missing from marks for submodule '%s'" -msgstr "「%sã€å模組缺少 from 標記" +msgid "can't write crash report %s" +msgstr "無法寫入 %s ç•¶æ©Ÿå ±å‘Š" + +#: builtin/fast-import.c +#, c-format +msgid "fast-import: dumping crash report to %s\n" +msgstr "fast-import：傾å°å´©æ½°å ±å‘Šè‡³ %s\n" + +#: builtin/fast-import.c +#, c-format +msgid "mark :%<PRIuMAX> not declared" +msgstr "未宣告標記 :%<PRIuMAX>" + +#: builtin/fast-import.c +#, c-format +msgid "invalid attempt to create duplicate branch: %s" +msgstr "建立é‡è¤‡åˆ†æ”¯çš„嘗試無效：%s" + +#: builtin/fast-import.c +#, c-format +msgid "branch name doesn't conform to Git standards: %s" +msgstr "分支å稱ä¸ç¬¦ Git 標準：%s" + +#: builtin/fast-import.c +msgid "internal consistency error creating the index" +msgstr "建立索引時發生內部一致性錯誤" + +#: builtin/fast-import.c +msgid "cannot create keep file" +msgstr "無法建立ä¿ç•™æª”案" + +#: builtin/fast-import.c +msgid "failed to write keep file" +msgstr "無法寫入ä¿ç•™æª”案" + +#: builtin/fast-import.c +msgid "cannot store pack file" +msgstr "無法儲å˜åŒ…檔案" + +#: builtin/fast-import.c +msgid "cannot store index file" +msgstr "無法儲å˜ç´¢å¼•æª”案" + +#: builtin/fast-import.c +#, c-format +msgid "failed seeking to start of '%s'" +msgstr "探尋 %s çš„é–‹é 失敗" + +#: builtin/fast-import.c +#, c-format +msgid "core Git rejected index %s" +msgstr "æ ¸å¿ƒ Git 拒絕索引 %s" + +#: builtin/fast-import.c +msgid "cannot truncate pack to skip duplicate" +msgstr "無法截斷包來跳éŽé‡è¤‡é …ç›®" + +#: builtin/fast-import.c +#, c-format +msgid "EOF in data (%<PRIuMAX> bytes remaining)" +msgstr "資料ä¸æœ‰ EOF（剩餘 %<PRIuMAX> 個ä½å…ƒçµ„）" + +#: builtin/fast-import.c +#, c-format +msgid "unexpected deflate failure: %d" +msgstr "éžé 期的壓縮失敗：%d" + +#: builtin/fast-import.c +#, c-format +msgid "not a tree: %s" +msgstr "éžæ¨¹ç‹€ç‰©ä»¶ï¼š%s" + +#: builtin/fast-import.c +#, c-format +msgid "can't load tree %s" +msgstr "無法載入樹狀物件 %s" + +#: builtin/fast-import.c +#, c-format +msgid "corrupt mode in %s" +msgstr "%s ä¸æœ‰æ壞的模å¼" + +#: builtin/fast-import.c +msgid "root cannot be a non-directory" +msgstr "æ ¹ä¸èƒ½ä¸æ˜¯ç›®éŒ„" + +#: builtin/fast-import.c +msgid "empty path component found in input" +msgstr "輸入ä¸æœ‰ç©ºçš„路徑部分" + +#: builtin/fast-import.c +msgid "non-directories cannot have subtrees" +msgstr "éžç›®éŒ„者ä¸èƒ½æœ‰å樹" + +#: builtin/fast-import.c +#, c-format +msgid "dropping %s since it would point to itself (i.e. to %s)" +msgstr "æ¨æ£„ %sï¼Œå› å…¶æŒ‡å‘自身（å³æŒ‡å‘ %s）" + +#: builtin/fast-import.c +#, c-format +msgid "branch %s is missing commits." +msgstr "分支 %s 缺少æ交。" + +#: builtin/fast-import.c +#, c-format +msgid "not updating %s (new tip %s does not contain %s)" +msgstr "沒有更新 %s（æ示：%s ä¸åŒ…å« %s）" + +#: builtin/fast-import.c builtin/sparse-checkout.c commit-graph.c midx-write.c +#: sequencer.c +#, c-format +msgid "unable to create leading directories of %s" +msgstr "ä¸èƒ½ç‚º %s 建立先導目錄" + +#: builtin/fast-import.c +#, c-format +msgid "unable to write marks file %s" +msgstr "無法寫入標記檔案 %s" + +#: builtin/fast-import.c +#, c-format +msgid "unable to write marks file %s: %s" +msgstr "無法寫入標記檔案 %s：%s" + +#: builtin/fast-import.c object-file.c +#, c-format +msgid "unable to write file %s" +msgstr "無法寫檔案 %s" + +#: builtin/fast-import.c +#, c-format +msgid "expected 'data n' command, found: %s" +msgstr "é 期「data nã€å‘½ä»¤ï¼Œå»æ‰¾åˆ°ï¼š%s" + +#: builtin/fast-import.c +#, c-format +msgid "EOF in data (terminator '%s' not found)" +msgstr "資料ä¸æœ‰ EOF（未找到終æ¢å「%sã€ï¼‰" + +#: builtin/fast-import.c +msgid "data is too large to use in this context" +msgstr "è¦ç”¨æ–¼æ¤ä¸Šä¸‹æ–‡çš„資料太大" + +#: builtin/fast-import.c +#, c-format +msgid "EOF in data (%lu bytes remaining)" +msgstr "資料ä¸æœ‰ EOF（剩餘 %lu 個ä½å…ƒçµ„）" + +#: builtin/fast-import.c +#, c-format +msgid "missing < in ident string: %s" +msgstr "身分å—串ä¸ç¼ºå°‘ <：%s" + +#: builtin/fast-import.c +#, c-format +msgid "missing space before < in ident string: %s" +msgstr "身分å—串的 < å‰é¢ç¼ºå°‘ç©ºæ ¼ï¼š%s" + +#: builtin/fast-import.c +#, c-format +msgid "missing > in ident string: %s" +msgstr "身分å—串ä¸ç¼ºå°‘ >：%s" + +#: builtin/fast-import.c +#, c-format +msgid "missing space after > in ident string: %s" +msgstr "身分å—串的 > 後é¢ç¼ºå°‘ç©ºæ ¼ï¼š%s" + +#: builtin/fast-import.c +#, c-format +msgid "invalid raw date \"%s\" in ident: %s" +msgstr "身分ä¸æœ‰ç„¡æ•ˆçš„原始日期「%sã€ï¼š%s" + +#: builtin/fast-import.c +#, c-format +msgid "invalid rfc2822 date \"%s\" in ident: %s" +msgstr "身分ä¸æœ‰ç„¡æ•ˆçš„ RFC2822 日期「%sã€ï¼š%s" + +#: builtin/fast-import.c +#, c-format +msgid "date in ident must be 'now': %s" +msgstr "身分ä¸çš„æ—¥æœŸå¿…é ˆæ˜¯ã€Œnowã€ï¼š%s" + +#: builtin/fast-import.c +#, c-format +msgid "too large fanout (%u)" +msgstr "扇出值太大（%u）" + +#: builtin/fast-import.c +#, c-format +msgid "failed to remove path %s" +msgstr "無法移除路徑 %s" + +#: builtin/fast-import.c +#, c-format +msgid "no value after ':' in mark: %s" +msgstr "標記的「:ã€å¾Œæ²’有值：%s" + +#: builtin/fast-import.c +#, c-format +msgid "garbage after mark: %s" +msgstr "標記後有垃圾：%s" + +#: builtin/fast-import.c +#, c-format +msgid "missing space after mark: %s" +msgstr "æ¨™è¨˜å¾Œç¼ºå°‘ç©ºæ ¼ï¼š%s" + +#: builtin/fast-import.c +#, c-format +msgid "invalid %s: %s" +msgstr "無效 %s：%s" + +#: builtin/fast-import.c +#, c-format +msgid "NUL in %s: %s" +msgstr "%s ä¸æœ‰ NUL：%s" #: builtin/fast-import.c #, c-format -msgid "Missing to marks for submodule '%s'" -msgstr "「%sã€å模組缺少 to 標記" +msgid "garbage after %s: %s" +msgstr "%s 後有垃圾：%s" #: builtin/fast-import.c #, c-format -msgid "Expected 'mark' command, got %s" -msgstr "é 期 'mark' 指令，得到 %s" +msgid "missing space after %s: %s" +msgstr "%s å¾Œç¼ºå°‘ç©ºæ ¼ï¼š%s" #: builtin/fast-import.c #, c-format -msgid "Expected 'to' command, got %s" -msgstr "é 期 'to' 指令，得到 %s" +msgid "corrupt mode: %s" +msgstr "æ壞的模å¼ï¼š%s" #: builtin/fast-import.c -msgid "Expected format name:filename for submodule rewrite option" -msgstr "期望å模組 rewrite é¸é …çš„æ ¼å¼æ˜¯ name:filename" +#, c-format +msgid "invalid dataref: %s" +msgstr "無效的資料引用：%s" + +#: builtin/fast-import.c +#, c-format +msgid "missing space after SHA1: %s" +msgstr "SHA1 å€¼å¾Œç¼ºå°‘ç©ºæ ¼ï¼š%s" + +#: builtin/fast-import.c +#, c-format +msgid "Git links cannot be specified 'inline': %s" +msgstr "Git 連çµä¸èƒ½æŒ‡å®šã€Œinlineã€ï¼š%s" + +#: builtin/fast-import.c +#, c-format +msgid "not a commit (actually a %s): %s" +msgstr "ä¸æ˜¯æ交（而是 %s）：%s" + +#: builtin/fast-import.c +#, c-format +msgid "directories cannot be specified 'inline': %s" +msgstr "目錄ä¸èƒ½æŒ‡å®šã€Œinlineã€ï¼š%s" + +#: builtin/fast-import.c +#, c-format +msgid "%s not found: %s" +msgstr "找ä¸åˆ° %s：%s" + +#: builtin/fast-import.c +msgid "tree" +msgstr "樹狀物件" + +#: builtin/fast-import.c +#, c-format +msgid "not a %s (actually a %s): %s" +msgstr "ä¸æ˜¯ %s（而是 %s）：%s" + +#: builtin/fast-import.c +#, c-format +msgid "path %s not in branch" +msgstr "分支ä¸æ²’有路徑 %s" + +#: builtin/fast-import.c +msgid "can't add a note on empty branch." +msgstr "ä¸èƒ½åœ¨ç©ºåˆ†æ”¯ä¸Šé™„åŠ è¨»è¨˜ã€‚" + +#: builtin/fast-import.c +#, c-format +msgid "mark :%<PRIuMAX> not a commit" +msgstr "標記 :%<PRIuMAX> ä¸æ˜¯æ交" + +#: builtin/fast-import.c +#, c-format +msgid "not a valid commit: %s" +msgstr "ä¸æ˜¯æœ‰æ•ˆçš„æ交：%s" + +#: builtin/fast-import.c +#, c-format +msgid "invalid ref name or SHA1 expression: %s" +msgstr "無效的引用å稱或 SHA1 表示å¼ï¼š%s" + +#: builtin/fast-import.c +#, c-format +msgid "not a blob (actually a %s): %s" +msgstr "ä¸æ˜¯è³‡æ–™ç‰©ä»¶ï¼ˆè€Œæ˜¯ %s）：%s" + +#: builtin/fast-import.c +#, c-format +msgid "blob not found: %s" +msgstr "找ä¸åˆ°è³‡æ–™ç‰©ä»¶ï¼š%s" + +#: builtin/fast-import.c +#, c-format +msgid "the commit %s is corrupt" +msgstr "æ交 %s æ壞" + +#: builtin/fast-import.c +#, c-format +msgid "can't create a branch from itself: %s" +msgstr "ä¸èƒ½å¾žåˆ†æ”¯è‡ªèº«å»ºç«‹åˆ†æ”¯ï¼š%s" + +#: builtin/fast-import.c +#, c-format +msgid "" +"expected gpgsig format: 'gpgsig <hash-algo> <signature-format>', got 'gpgsig " +"%s'" +msgstr "" +"é 期 gpgsig æ ¼å¼ï¼šã€Œgpgsig <hash-algo> <signature-format>ã€ï¼Œå»æ”¶åˆ°ã€Œgpgsig " +"%sã€" + +#: builtin/fast-import.c +#, c-format +msgid "unknown git hash algorithm in gpgsig: '%s'" +msgstr "gpgsig ä¸æœ‰æœªçŸ¥çš„ Git 雜湊演算法：「%sã€" + +#: builtin/fast-import.c +#, c-format +msgid "invalid signature format in gpgsig: '%s'" +msgstr "gpgsig ä¸æœ‰ç„¡æ•ˆçš„ç°½ç« æ ¼å¼ï¼šã€Œ%sã€" + +#: builtin/fast-import.c +msgid "'unknown' signature format in gpgsig" +msgstr "gpgsig ä¸æœ‰ã€Œunknownã€ç°½ç« æ ¼å¼" + +#: builtin/fast-import.c +#, c-format +msgid "multiple %s signatures found, ignoring additional signature" +msgstr "找到多個 %s ç°½ç« ï¼Œå¿½ç•¥å¤šé¤˜çš„ç°½ç« " + +#: builtin/fast-import.c +msgid "parse_one_signature() returned unknown hash algo" +msgstr "parse_one_signature() 回傳了未知的雜湊演算法" + +#: builtin/fast-import.c +msgid "expected committer but didn't get one" +msgstr "é 期有æ交者，å»æ²’收到" + +#: builtin/fast-import.c +msgid "encountered signed commit; use --signed-commits=<mode> to handle it" +msgstr "發ç¾å·²ç°½ç½²çš„æ交；使用 --signed-commits=<mode> 來處ç†" + +#: builtin/fast-import.c +msgid "stripping a commit signature" +msgstr "去除æäº¤ç°½ç« " + +#: builtin/fast-import.c +msgid "importing a commit signature verbatim" +msgstr "按原樣匯入æäº¤ç°½ç« " + +#: builtin/fast-import.c +msgid "encountered signed tag; use --signed-tags=<mode> to handle it" +msgstr "發ç¾å·²ç°½ç½²çš„標籤；使用 --signed-tags=<mode> 來處ç†" + +#: builtin/fast-import.c +#, c-format +msgid "importing a tag signature verbatim for tag '%s'" +msgstr "按原樣匯入標籤「%sã€çš„ç°½ç« " + +#: builtin/fast-import.c +#, c-format +msgid "stripping a tag signature for tag '%s'" +msgstr "去除標籤「%sã€çš„ç°½ç« " + +#: builtin/fast-import.c +#, c-format +msgid "expected 'from' command, got '%s'" +msgstr "é 期「fromã€å‘½ä»¤ï¼Œå»æ”¶åˆ°ã€Œ%sã€" + +#: builtin/fast-import.c +msgid "can't tag an empty branch." +msgstr "空分支上ä¸èƒ½æœ‰æ¨™ç±¤ã€‚" + +#: builtin/fast-import.c builtin/merge.c +#, c-format +msgid "not a valid object: %s" +msgstr "ä¸æ˜¯ä¸€å€‹æœ‰æ•ˆç‰©ä»¶ï¼š%s" + +#: builtin/fast-import.c +msgid "write to frontend failed" +msgstr "寫入å‰ç«¯å¤±æ•—" + +#: builtin/fast-import.c +#, c-format +msgid "can't read object %s" +msgstr "無法讀å–物件 %s" + +#: builtin/fast-import.c +#, c-format +msgid "object %s is a %s but a blob was expected." +msgstr "物件 %s 是 %s，但é 期是資料物件。" + +#: builtin/fast-import.c +#, c-format +msgid "not a mark: %s" +msgstr "ä¸æ˜¯æ¨™è¨˜ï¼š%s" + +#: builtin/fast-import.c +#, c-format +msgid "unknown mark: %s" +msgstr "未知標記：%s" + +#: builtin/fast-import.c +#, c-format +msgid "garbage after SHA1: %s" +msgstr "SHA1 值後有垃圾：%s" + +#: builtin/fast-import.c +#, c-format +msgid "not a tree-ish: %s" +msgstr "ä¸æ˜¯æ¨¹ç‹€ç‰©ä»¶æŒ‡ç¤ºå…ƒï¼š%s" + +#: builtin/fast-import.c +#, c-format +msgid "can't load object %s" +msgstr "無法載入物件 %s" + +#: builtin/fast-import.c +#, c-format +msgid "invalid SHA1 in tag: %s" +msgstr "標籤ä¸æœ‰ç„¡æ•ˆçš„ SHA1 值：%s" + +#: builtin/fast-import.c +#, c-format +msgid "invalid SHA1 in commit: %s" +msgstr "æ交ä¸æœ‰ç„¡æ•ˆçš„ SHA1 值：%s" + +#: builtin/fast-import.c +#, c-format +msgid "missing from marks for submodule '%s'" +msgstr "å模組「%sã€ç¼ºå°‘ from 標記" + +#: builtin/fast-import.c +#, c-format +msgid "missing to marks for submodule '%s'" +msgstr "å模組「%sã€ç¼ºå°‘ to 標記" + +#: builtin/fast-import.c +#, c-format +msgid "missing space after tree-ish: %s" +msgstr "æ¨¹ç‹€ç‰©ä»¶æŒ‡ç¤ºå…ƒå¾Œç¼ºå°‘ç©ºæ ¼ï¼š%s" + +#: builtin/fast-import.c +#, c-format +msgid "not in a commit: %s" +msgstr "ä¸åœ¨æ交ä¸ï¼š%s" + +#: builtin/fast-import.c +#, c-format +msgid "expected 'mark' command, got %s" +msgstr "é 期「markã€å‘½ä»¤ï¼Œå»æ”¶åˆ° %s" + +#: builtin/fast-import.c +#, c-format +msgid "expected 'to' command, got %s" +msgstr "é 期「toã€å‘½ä»¤ï¼Œå»æ”¶åˆ° %s" + +#: builtin/fast-import.c +msgid "only one import-marks command allowed per stream" +msgstr "æ¯å€‹æµåƒ…é™ä¸€å€‹ import-marks 命令" + +#: builtin/fast-import.c +#, c-format +msgid "unknown --date-format argument %s" +msgstr "未知的 --date-format 引數 %s" + +#: builtin/fast-import.c +#, c-format +msgid "%s: argument must be a non-negative integer" +msgstr "%sï¼šå¼•æ•¸å¿…é ˆæ˜¯éžè² 整數" + +#: builtin/fast-import.c +#, c-format +msgid "--depth cannot exceed %u" +msgstr "--depth ä¸èƒ½è¶…éŽ %u" + +#: builtin/fast-import.c +#, c-format +msgid "--cat-blob-fd cannot exceed %d" +msgstr "--cat-blob-fd ä¸èƒ½è¶…éŽ %d" + +#: builtin/fast-import.c +msgid "expected format name:filename for submodule rewrite option" +msgstr "å模組 rewrite é¸é …é æœŸæ ¼å¼ name:filename" + +#: builtin/fast-import.c +#, c-format +msgid "max-pack-size is now in bytes, assuming --max-pack-size=%lum" +msgstr "max-pack-size ç¾åœ¨çš„å–®ä½æ˜¯ä½å…ƒçµ„，å‡å®š --max-pack-size=%lum" + +#: builtin/fast-import.c +msgid "minimum max-pack-size is 1 MiB" +msgstr "max-pack-size 的最å°å€¼æ˜¯ 1 MiB" + +#: builtin/fast-import.c +#, c-format +msgid "unknown --signed-commits mode '%s'" +msgstr "未知的 --signed-commits 模å¼ã€Œ%sã€" + +#: builtin/fast-import.c +#, c-format +msgid "unknown --signed-tags mode '%s'" +msgstr "未知的 --signed-tags 模å¼ã€Œ%sã€" #: builtin/fast-import.c #, c-format msgid "feature '%s' forbidden in input without --allow-unsafe-features" msgstr "沒有 --allow-unsafe-features 時，ç¦æ¢åœ¨è¼¸å…¥ä¸ä½¿ç”¨ '%s' 功能" +#: builtin/fast-import.c +#, c-format +msgid "got feature command '%s' after data command" +msgstr "在資料命令後收到功能命令「%sã€" + +#: builtin/fast-import.c +#, c-format +msgid "this version of fast-import does not support feature %s." +msgstr "æ¤ç‰ˆæœ¬çš„ fast-import ä¸æ”¯æ´åŠŸèƒ½ %s。" + +#: builtin/fast-import.c +#, c-format +msgid "got option command '%s' after data command" +msgstr "在資料命令後收到é¸é …命令「%sã€" + +#: builtin/fast-import.c +#, c-format +msgid "this version of fast-import does not support option: %s" +msgstr "æ¤ç‰ˆæœ¬çš„ fast-import ä¸æ”¯æ´é¸é …：%s" + +#: builtin/fast-import.c builtin/merge-recursive.c +#, c-format +msgid "unknown option %s" +msgstr "未知é¸é … %s" + +#: builtin/fast-import.c +#, c-format +msgid "unknown option --%s" +msgstr "未知é¸é … --%s" + +#: builtin/fast-import.c +#, c-format +msgid "unsupported command: %s" +msgstr "ä¸æ”¯æ´çš„命令：%s" + +#: builtin/fast-import.c +msgid "stream ends early" +msgstr "æµææ—©çµæŸ" + #: builtin/fetch-pack.c #, c-format msgid "Lockfile created but not reported: %s" @@ -7387,7 +8100,7 @@ msgstr "%s 未傳é€æ‰€æœ‰å¿…需的物件" #: builtin/fetch.c #, c-format msgid "rejected %s because shallow roots are not allowed to be updated" -msgstr "已拒絕 %s，ä¸å…許更新淺複製" +msgstr "已拒絕 %s，ä¸å…許更新淺拓製" #: builtin/fetch.c msgid "[deleted]" @@ -7438,6 +8151,32 @@ msgstr "" "會åœç”¨é€™å€‹è¦å‘Šï¼Œç›´åˆ°é 端將 HEAD 改為指å‘其他æ±è¥¿ã€‚" #: builtin/fetch.c +msgid "" +"You're on a case-insensitive filesystem, and the remote you are\n" +"trying to fetch from has references that only differ in casing. It\n" +"is impossible to store such references with the 'files' backend. You\n" +"can either accept this as-is, in which case you won't be able to\n" +"store all remote references on disk. Or you can alternatively\n" +"migrate your repository to use the 'reftable' backend with the\n" +"following command:\n" +"\n" +" git refs migrate --ref-format=reftable\n" +"\n" +"Please keep in mind that not all implementations of Git support this\n" +"new format yet. So if you use tools other than Git to access this\n" +"repository it may not be an option to migrate to reftables.\n" +msgstr "" +"檔案系統ä¸å€åˆ†å¤§å°å¯«ï¼Œä½†å˜—試抓å–çš„é 端上有引用åªå·®åœ¨å¤§å°å¯«ï¼Œä¸å¯èƒ½\n" +"以「fileã€å¾Œç«¯å„²å˜é€™äº›å¼•ç”¨ã€‚ä½ å¯ä»¥æŒ‰åŽŸæ¨£æŽ¥å—ï¼Œé€™è¡¨ç¤ºä½ ä¸èƒ½åœ¨ç¡¬ç¢Ÿä¸Šå„²å˜\n" +"所有é ç«¯å¼•ç”¨ï¼›æŠ‘æˆ–ä½ å¯ä»¥ä»¤ç‰ˆæœ¬åº«æ”¹ç‚ºä½¿ç”¨ã€Œreftableã€å¾Œç«¯ï¼Œé€éŽåŸ·è¡Œä»¥ä¸‹\n" +"命令：\n" +"\n" +" git refs migrate --ref-format=reftable\n" +"\n" +"請注æ„並éžæ‰€æœ‰ Git 實作都支æ´é€™å€‹æ–°æ ¼å¼ã€‚å› æ¤è‹¥ä½ 還使用 Git 之外的工具\n" +"來å˜å–æ¤ç‰ˆæœ¬åº«ï¼Œé·ç§»è‡³ reftable å¯èƒ½ä¸æ˜¯å€‹å¥½é¸æ“‡ã€‚\n" + +#: builtin/fetch.c #, c-format msgid "" "some local refs could not be updated; try running\n" @@ -7585,11 +8324,11 @@ msgstr "å…許更新 HEAD 引用" #: builtin/fetch.c builtin/pull.c msgid "deepen history of shallow clone" -msgstr "å–得淺複製的更多éŽåŽ»æ·å²è¨˜éŒ„" +msgstr "å–得淺拓製的更多éŽåŽ»æ·å²è¨˜éŒ„" #: builtin/fetch.c builtin/pull.c msgid "deepen history of shallow repository based on time" -msgstr "基於時間來深化淺複製的æ·å²" +msgstr "æ ¹æ“šæ™‚é–“æ·±åŒ–æ·ºå±¤ç‰ˆæœ¬åº«çš„æ·å²è¨˜éŒ„" #: builtin/fetch.c builtin/pull.c msgid "convert to a complete repository" @@ -7712,7 +8451,7 @@ msgstr "git fmt-merge-msg [-m <說明>] [--log[=<n>] | --no-log] [--file <檔案 #: builtin/fmt-merge-msg.c msgid "populate log with at most <n> entries from shortlog" -msgstr "å‘æ交說明ä¸æœ€å¤šè¤‡è£½æŒ‡å®šæ¢ç›®ï¼ˆåˆä½µè€Œä¾†çš„æ交）的簡çŸèªªæ˜Ž" +msgstr "å‘æ交說明ä¸æœ€å¤šæ‹“製指定æ¢ç›®ï¼ˆåˆä½µè€Œä¾†çš„æ交）的簡çŸèªªæ˜Ž" #: builtin/fmt-merge-msg.c msgid "alias for --log (deprecated)" @@ -7735,26 +8474,6 @@ msgid "file to read from" msgstr "從檔案ä¸è®€å–" #: builtin/for-each-ref.c -msgid "git for-each-ref [<options>] [<pattern>]" -msgstr "git for-each-ref [<é¸é …>] [<模å¼>]" - -#: builtin/for-each-ref.c -msgid "git for-each-ref [--points-at <object>]" -msgstr "git for-each-ref [--points-at <物件>]" - -#: builtin/for-each-ref.c -msgid "git for-each-ref [--merged [<commit>]] [--no-merged [<commit>]]" -msgstr "git for-each-ref [--merged [<æ交>]] [--no-merged [<æ交>]]" - -#: builtin/for-each-ref.c -msgid "git for-each-ref [--contains [<commit>]] [--no-contains [<commit>]]" -msgstr "git for-each-ref [--contains [<æ交>]] [--no-contains [<æ交>]]" - -#: builtin/for-each-ref.c -msgid "git for-each-ref [--start-after <marker>]" -msgstr "git for-each-ref [--start-after <marker>]" - -#: builtin/for-each-ref.c msgid "quote placeholders suitably for shells" msgstr "引用å ä½ç¬¦é©ç”¨æ–¼ shells" @@ -7826,6 +8545,10 @@ msgstr "為 --stdin æ供的引數未知" msgid "cannot use --start-after with patterns" msgstr "--start-after 無法æé… pattern 使用" +#: builtin/for-each-ref.c +msgid "git for-each-ref " +msgstr "git for-each-ref " + #: builtin/for-each-repo.c msgid "git for-each-repo --config=<config> [--] <arguments>" msgstr "git for-each-repo --config=<config> [--] <arguments>" @@ -8115,7 +8838,7 @@ msgstr "å•Ÿç”¨æ›´åš´æ ¼çš„æª¢æŸ¥" msgid "write dangling objects in .git/lost-found" msgstr "將懸空物件寫入 .git/lost-found ä¸" -#: builtin/fsck.c builtin/prune.c +#: builtin/fsck.c builtin/prune.c builtin/repo.c msgid "show progress" msgstr "顯示進度" @@ -8321,7 +9044,7 @@ msgstr "強制執行 gc å³ä½¿å¦å¤–一個 gc æ£åœ¨åŸ·è¡Œ" #: builtin/gc.c msgid "repack all other packs except the largest pack" -msgstr "除了最大的包之外，å°æ‰€æœ‰å…¶å®ƒåŒ…é‡æ–°æ‰“包" +msgstr "除了最大的包之外，å°æ‰€æœ‰å…¶ä»–包é‡æ–°æ‰“包" #: builtin/gc.c builtin/repack.c msgid "pack prefix to store a pack containing pruned objects" @@ -8416,6 +9139,10 @@ msgid "" msgstr "ç•¥éŽå¢žé‡é‡æ–°æ‰“åŒ…å·¥ä½œï¼Œå› ç‚º core.multiPackIndex 已被åœç”¨" #: builtin/gc.c +msgid "failed to perform geometric repack" +msgstr "無法進行幾何é‡æ–°å°è£" + +#: builtin/gc.c #, c-format msgid "task '%s' failed" msgstr "ä½œæ¥ '%s' 失敗" @@ -8427,6 +9154,11 @@ msgstr "å·²å˜åœ¨ '%s' 鎖定檔案，略éŽç¶è·" #: builtin/gc.c #, c-format +msgid "unknown maintenance strategy: '%s'" +msgstr "未知的ç¶è·ç–略：「%sã€" + +#: builtin/gc.c +#, c-format msgid "'%s' is not a valid task" msgstr "'%s' éžæœ‰æ•ˆä½œæ¥" @@ -9510,6 +10242,35 @@ msgstr "--trailer å’Œ --only-input åŒæ™‚使用沒有æ„義" msgid "no input file given for in-place editing" msgstr "沒有給出è¦åŽŸä½ç·¨è¼¯çš„檔案" +#: builtin/last-modified.c +msgid "last-modified can only operate on one tree at a time" +msgstr "last-modified 一次åªèƒ½æ“作一個樹狀物件" + +#: builtin/last-modified.c +#, c-format +msgid "unknown last-modified argument: %s" +msgstr "未知的 last-modified 引數：%s" + +#: builtin/last-modified.c +msgid "unable to setup last-modified" +msgstr "無法è¨å®š last-modified" + +#: builtin/last-modified.c +msgid "" +"git last-modified [--recursive] [--show-trees] [<revision-range>] [[--] " +"<path>...]" +msgstr "" +"git last-modified [--recursive] [--show-trees] [<revision-range>] [[--] " +"<path>...]" + +#: builtin/last-modified.c builtin/ls-tree.c +msgid "recurse into subtrees" +msgstr "éžè¿´åˆ°å樹" + +#: builtin/last-modified.c +msgid "show tree entries when recursing into subtrees" +msgstr "éžè¿´åæ¨¹æ™‚é¡¯ç¤ºæ¨¹ç‹€ç‰©ä»¶é …ç›®" + #: builtin/log.c msgid "git log [<options>] [<revision-range>] [[--] <path>...]" msgstr "git log [<é¸é …>] [<版本範åœ>] [[--] <路徑>...]" @@ -9558,6 +10319,22 @@ msgid "-L<range>:<file> cannot be used with pathspec" msgstr "-L<範åœ>:<檔案> å’Œ pathspec ä¸èƒ½åŒæ™‚使用" #: builtin/log.c +msgid "" +"\n" +"hint: You can replace 'git whatchanged <opts>' with:\n" +"hint:\tgit log <opts> --raw --no-merges\n" +"hint: Or make an alias:\n" +"hint:\tgit config set --global alias.whatchanged 'log --raw --no-merges'\n" +"\n" +msgstr "" +"\n" +"æç¤ºï¼šä½ å¯ä»¥å°‡ã€Œgit whatchanged <opts>ã€æ›¿æ›ç‚ºï¼š\n" +"æ示：\tgit log <opts> --raw --no-merges\n" +"æ示：或è¨å®šä¸€å€‹åˆ¥å：\n" +"æ示：\tgit config set --global alias.whatchanged 'log --raw --no-merges'\n" +"\n" + +#: builtin/log.c #, c-format msgid "git show %s: bad file" msgstr "git show %s: æ壞的檔案" @@ -9975,7 +10752,7 @@ msgstr "顯示已修改的檔案" #: builtin/ls-files.c msgid "show other files in the output" -msgstr "顯示其它檔案" +msgstr "顯示其他檔案" #: builtin/ls-files.c msgid "show ignored files in the output" @@ -10119,10 +10896,6 @@ msgid "only show trees" msgstr "åªé¡¯ç¤ºæ¨¹" #: builtin/ls-tree.c -msgid "recurse into subtrees" -msgstr "éžè¿´åˆ°å樹" - -#: builtin/ls-tree.c msgid "show trees when recursing" msgstr "當éžè¿´æ™‚顯示樹" @@ -10169,7 +10942,7 @@ msgstr "ä¿ç•™ä¸»æ—¨ä¸ä¸æ˜¯ PATCH 的方括號" #: builtin/mailinfo.c msgid "copy Message-ID to the end of commit message" -msgstr "æ‹·è² Message-ID 至æ交說明末尾" +msgstr "複製 Message-ID 至æ交說明末尾" #: builtin/mailinfo.c msgid "re-code metadata to i18n.commitEncoding" @@ -10314,11 +11087,6 @@ msgstr "無法寫入物件檔案" #: builtin/merge-recursive.c #, c-format -msgid "unknown option %s" -msgstr "未知é¸é … %s" - -#: builtin/merge-recursive.c -#, c-format msgid "could not parse object '%s'" msgstr "無法解æžç‰©ä»¶ã€Œ%sã€" @@ -10536,11 +11304,6 @@ msgid "stash failed" msgstr "貯å˜å¤±æ•—" #: builtin/merge.c -#, c-format -msgid "not a valid object: %s" -msgstr "ä¸æ˜¯ä¸€å€‹æœ‰æ•ˆç‰©ä»¶ï¼š%s" - -#: builtin/merge.c msgid "read-tree failed" msgstr "讀å–樹失敗" @@ -10989,7 +11752,7 @@ msgstr "無法åŒæ™‚移動「%sã€å’Œå…¶ä¸Šå±¤ç›®éŒ„「%sã€" msgid "Renaming %s to %s\n" msgstr "é‡æ–°å‘½å %s 至 %s\n" -#: builtin/mv.c builtin/remote.c +#: builtin/mv.c #, c-format msgid "renaming '%s' failed" msgstr "é‡æ–°å‘½å '%s' 失敗" @@ -11192,7 +11955,7 @@ msgstr "ä¸èƒ½å¾žéžè³‡æ–™ç‰©ä»¶ '%s' ä¸è®€å–註解資料。" #: builtin/notes.c #, c-format msgid "failed to copy notes from '%s' to '%s'" -msgstr "將註解從「%sã€æ‹·è²è‡³ã€Œ%sã€å¤±æ•—" +msgstr "將註解從「%sã€è¤‡è£½è‡³ã€Œ%sã€å¤±æ•—" #. TRANSLATORS: the first %s will be replaced by a git #. notes command: 'add', 'merge', 'remove', etc. @@ -11281,12 +12044,12 @@ msgstr "太少åƒæ•¸" msgid "" "Cannot copy notes. Found existing notes for object %s. Use '-f' to overwrite " "existing notes" -msgstr "無法拷è²è¨»è§£ã€‚物件 %s 已有註解。使用「-fã€è¦†å¯«ç¾æœ‰çš„註解" +msgstr "無法複製註解。物件 %s 已有註解。使用「-fã€è¦†å¯«ç¾æœ‰çš„註解" #: builtin/notes.c #, c-format msgid "missing notes on source object %s. Cannot copy." -msgstr "來æºç‰©ä»¶ %s 缺少註解。無法拷è²ã€‚" +msgstr "來æºç‰©ä»¶ %s 缺少註解。無法複製。" #: builtin/notes.c #, c-format @@ -11541,7 +12304,7 @@ msgstr "%s å£“ç¸®ä¸ delta 基準ä½ç§»è¶Šç•Œ" msgid "delta base offset out of bound for %s" msgstr "%s çš„ delta 基準ä½ç§»è¶Šç•Œ" -#: builtin/pack-objects.c +#: builtin/pack-objects.c builtin/repo.c msgid "Counting objects" msgstr "æ£åœ¨è¨ˆç®—物件數é‡" @@ -11838,7 +12601,7 @@ msgstr "å¯è¡Œæ™‚使用 path-walk API 走訪物件" #: builtin/pack-objects.c msgid "create packs suitable for shallow fetches" -msgstr "建立é©åˆæ·ºè¤‡è£½ç‰ˆæœ¬åº«å–得的包" +msgstr "建立é©åˆæ·ºæ‹“製版本庫å–得的包" #: builtin/pack-objects.c msgid "ignore packs that have companion .keep file" @@ -11854,7 +12617,7 @@ msgstr "打包壓縮級別" #: builtin/pack-objects.c msgid "do not hide commits by grafts" -msgstr "顯示被移æ¤éš±è—çš„æ交" +msgstr "ä¸è¦å› å«æŽ¥éš±è—æ交" #: builtin/pack-objects.c msgid "use a bitmap index if available to speed up counting objects" @@ -11950,32 +12713,8 @@ msgstr "" "%<PRIu32> (總共 %<PRIuMAX>)" #: builtin/pack-refs.c -msgid "" -"git pack-refs [--all] [--no-prune] [--auto] [--include <pattern>] [--exclude " -"<pattern>]" -msgstr "" -"git pack-refs [--all] [--no-prune] [--auto] [--include <pattern>] [--exclude " -"<pattern>]" - -#: builtin/pack-refs.c -msgid "pack everything" -msgstr "打包一切" - -#: builtin/pack-refs.c -msgid "prune loose refs (default)" -msgstr "剪除鬆散引用（é è¨å€¼ï¼‰" - -#: builtin/pack-refs.c -msgid "auto-pack refs as needed" -msgstr "按需自動å°è£å¼•ç”¨" - -#: builtin/pack-refs.c -msgid "references to include" -msgstr "è¦åŒ…å«çš„引用" - -#: builtin/pack-refs.c -msgid "references to exclude" -msgstr "è¦æŽ’除的引用" +msgid "git pack-refs " +msgstr "git pack-refs " #: builtin/patch-id.c msgid "git patch-id [--stable | --unstable | --verbatim]" @@ -12554,6 +13293,11 @@ msgid "git range-diff [<options>] <base> <old-tip> <new-tip>" msgstr "git range-diff [<é¸é …>] <base> <old-tip> <new-tip>" #: builtin/range-diff.c +#, c-format +msgid "invalid max-memory value: %s" +msgstr "無效的 max-memory 值：%s" + +#: builtin/range-diff.c msgid "use simple diff colors" msgstr "使用簡單差異é¡è‰²" @@ -12566,6 +13310,14 @@ msgid "passed to 'git log'" msgstr "傳éžçµ¦ 'git log'" #: builtin/range-diff.c +msgid "size" +msgstr "大å°" + +#: builtin/range-diff.c +msgid "maximum memory for cost matrix (default 4G)" +msgstr "æˆæœ¬çŸ©é™£çš„最大記憶體（é è¨å€¼ 4G）" + +#: builtin/range-diff.c msgid "only emit output related to the first range" msgstr "åªç™¼å‡ºè·Ÿç¬¬ä¸€å€‹ç¯„åœç›¸é—œçš„輸出" @@ -13223,16 +13975,12 @@ msgid "git reflog list" msgstr "git reflog list" #: builtin/reflog.c -msgid "" -"git reflog expire [--expire=<time>] [--expire-unreachable=<time>]\n" -" [--rewrite] [--updateref] [--stale-fix]\n" -" [--dry-run | -n] [--verbose] [--all [--single-worktree] | " -"<refs>...]" -msgstr "" -"git reflog expire [--expire=<time>] [--expire-unreachable=<time>]\n" -" [--rewrite] [--updateref] [--stale-fix]\n" -" [--dry-run | -n] [--verbose] [--all [--single-worktree] | " -"<refs>...]" +msgid "git reflog exists <ref>" +msgstr "git reflog exists <引用>" + +#: builtin/reflog.c +msgid "git reflog write <ref> <old-oid> <new-oid> <message>" +msgstr "git reflog write <ref> <old-oid> <new-oid> <message>" #: builtin/reflog.c msgid "" @@ -13243,14 +13991,22 @@ msgstr "" " [--dry-run | -n] [--verbose] <ref>@{<specifier>}..." #: builtin/reflog.c -msgid "git reflog exists <ref>" -msgstr "git reflog exists <引用>" - -#: builtin/reflog.c msgid "git reflog drop [--all [--single-worktree] | <refs>...]" msgstr "git reflog drop [--all [--single-worktree] | <refs>...]" #: builtin/reflog.c +msgid "" +"git reflog expire [--expire=<time>] [--expire-unreachable=<time>]\n" +" [--rewrite] [--updateref] [--stale-fix]\n" +" [--dry-run | -n] [--verbose] [--all [--single-worktree] | " +"<refs>...]" +msgstr "" +"git reflog expire [--expire=<time>] [--expire-unreachable=<time>]\n" +" [--rewrite] [--updateref] [--stale-fix]\n" +" [--dry-run | -n] [--verbose] [--all [--single-worktree] | " +"<refs>...]" + +#: builtin/reflog.c #, c-format msgid "invalid timestamp '%s' given to '--%s'" msgstr "傳入「--%sã€çš„時間戳「%sã€ç„¡æ•ˆ" @@ -13334,6 +14090,46 @@ msgstr "åªæ¨æ£„ç›®å‰å·¥ä½œç›®éŒ„的引用日誌" msgid "references specified along with --all" msgstr "åŒæ™‚指定åƒç…§å’Œ --all 引數" +#: builtin/reflog.c +#, c-format +msgid "invalid reference name: %s" +msgstr "無效的引用å稱：%s" + +#: builtin/reflog.c +#, c-format +msgid "invalid old object ID: '%s'" +msgstr "無效的舊物件 ID：「%sã€" + +#: builtin/reflog.c +#, c-format +msgid "old object '%s' does not exist" +msgstr "舊物件「%sã€ä¸å˜åœ¨" + +#: builtin/reflog.c +#, c-format +msgid "invalid new object ID: '%s'" +msgstr "無效的新物件 ID：「%sã€" + +#: builtin/reflog.c +#, c-format +msgid "new object '%s' does not exist" +msgstr "新物件「%sã€ä¸å˜åœ¨" + +#: builtin/reflog.c +#, c-format +msgid "cannot start transaction: %s" +msgstr "無法開始事務：%s" + +#: builtin/reflog.c +#, c-format +msgid "cannot queue reflog update: %s" +msgstr "無法排入引用日誌更新：%s" + +#: builtin/reflog.c +#, c-format +msgid "cannot commit reflog update: %s" +msgstr "無法æ交引用日誌更新：%s" + #: builtin/refs.c msgid "git refs migrate --ref-format=<format> [--no-reflog] [--dry-run]" msgstr "git refs migrate --ref-format=<format> [--no-reflog] [--dry-run]" @@ -13343,6 +14139,14 @@ msgid "git refs verify [--strict] [--verbose]" msgstr "git refs verify [--strict] [--verbose]" #: builtin/refs.c +msgid "git refs exists <ref>" +msgstr "git refs exists <ref>" + +#: builtin/refs.c +msgid "git refs optimize " +msgstr "git refs optimize " + +#: builtin/refs.c msgid "specify the reference format to convert to" msgstr "指定è¦è½‰æ›æˆçš„å¼•ç”¨æ ¼å¼" @@ -13371,6 +14175,22 @@ msgstr "å•Ÿç”¨åš´æ ¼æª¢æŸ¥" msgid "'git refs verify' takes no arguments" msgstr "「git refs verifyã€ä¸æŽ¥å—引數" +#: builtin/refs.c +msgid "git refs list " +msgstr "git refs list " + +#: builtin/refs.c +msgid "'git refs exists' requires a reference" +msgstr "「git refs existsã€éœ€è¦æŒ‡å®šå¼•ç”¨" + +#: builtin/refs.c builtin/show-ref.c +msgid "reference does not exist" +msgstr "引用ä¸å˜åœ¨" + +#: builtin/refs.c builtin/show-ref.c +msgid "failed to look up reference" +msgstr "無法查詢引用" + #: builtin/remote.c msgid "" "git remote add [-t <branch>] [-m <master>] [-f] [--tags | --no-tags] [--" @@ -13568,6 +14388,22 @@ msgstr "" "ç¾å‘½åæˆä¸å˜åœ¨çš„é 端分支 '%s'" #: builtin/remote.c +msgid "" +"The remote you are trying to rename has conflicting references in the\n" +"new target refspec. This is most likely caused by you trying to nest\n" +"a remote into itself, e.g. by renaming 'parent' into 'parent/child'\n" +"or by unnesting a remote, e.g. the other way round.\n" +"\n" +"If that is the case, you can address this by first renaming the\n" +"remote to a different name.\n" +msgstr "" +"ä½ å˜—è©¦é‡æ–°å‘½åçš„é 端在新的目標引用è¦æ ¼ä¸æœ‰è¡çªçš„引用。這很å¯èƒ½æ˜¯å› ç‚ºä½ \n" +"嘗試令é 端與自身形æˆå·¢ç‹€ï¼Œä¾‹å¦‚將「parentã€é‡æ–°å‘½å為「parent/childã€ï¼Œ\n" +"或是åå‘æ“作令其ä¸å†æ˜¯å·¢ç‹€ã€‚\n" +"\n" +"若是這種情æ³ï¼Œä½ å¯ä»¥å…ˆå°‡é 端改為ä¸åŒçš„å稱來解決這個å•é¡Œã€‚\n" + +#: builtin/remote.c #, c-format msgid "No such remote: '%s'" msgstr "沒有æ¤é 端版本庫：'%s'" @@ -13578,6 +14414,15 @@ msgid "Could not rename config section '%s' to '%s'" msgstr "無法將組態的「%sã€å€æ®µé‡æ–°å‘½å為「%sã€" #: builtin/remote.c +msgid "Renaming remote references" +msgstr "æ£åœ¨é‡æ–°å‘½åé 端引用" + +#: builtin/remote.c +#, c-format +msgid "queueing remote ref renames failed: %s" +msgstr "無法排入é 端引用的é‡æ–°å‘½å作æ¥ï¼š%s" + +#: builtin/remote.c #, c-format msgid "" "Not updating non-default fetch refspec\n" @@ -13589,18 +14434,9 @@ msgstr "" "\t如果必è¦è«‹æ‰‹å‹•æ›´æ–°è¨å®šã€‚" #: builtin/remote.c -msgid "Renaming remote references" -msgstr "æ£åœ¨é‡æ–°å‘½åé 端引用" - -#: builtin/remote.c #, c-format -msgid "deleting '%s' failed" -msgstr "刪除 '%s' 失敗" - -#: builtin/remote.c -#, c-format -msgid "creating '%s' failed" -msgstr "建立 '%s' 失敗" +msgid "renaming remote refs failed: %s" +msgstr "無法é‡æ–°å‘½åé 端引用：%s" #: builtin/remote.c msgid "" @@ -13941,56 +14777,6 @@ msgstr "" "或åœç”¨ pack.writeBitmaps è¨å®šã€‚" #: builtin/repack.c -msgid "could not start pack-objects to repack promisor objects" -msgstr "無法開始 pack-objects 來é‡æ–°æ‰“包 promisor 物件" - -#: builtin/repack.c -msgid "failed to feed promisor objects to pack-objects" -msgstr "無法將承諾者物件喂給 pack-objects" - -#: builtin/repack.c -msgid "repack: Expecting full hex object ID lines only from pack-objects." -msgstr "repack：期望來自 pack-objects 的完整åå…進ä½ç‰©ä»¶ ID。" - -#: builtin/repack.c -msgid "could not finish pack-objects to repack promisor objects" -msgstr "無法çµæŸ pack-objects 來é‡æ–°æ‰“包 promisor 物件" - -#: builtin/repack.c -#, c-format -msgid "cannot open index for %s" -msgstr "無法開啟 %s 的索引" - -#: builtin/repack.c -#, c-format -msgid "pack %s too large to consider in geometric progression" -msgstr "%s 包太大，以致ä¸èƒ½åœ¨ç‰æ¯”數列ä¸è€ƒæ…®" - -#: builtin/repack.c -#, c-format -msgid "pack %s too large to roll up" -msgstr "%s 包太大，以致ä¸èƒ½ç¸®åˆ" - -#: builtin/repack.c -#, c-format -msgid "could not open tempfile %s for writing" -msgstr "無法開啟暫å˜æª” %s 進行寫入" - -#: builtin/repack.c -msgid "could not close refs snapshot tempfile" -msgstr "無法關閉 refs 的快照暫å˜æª”" - -#: builtin/repack.c -#, c-format -msgid "could not remove stale bitmap: %s" -msgstr "無法移除éŽæ™‚ä½åœ–：%s" - -#: builtin/repack.c -#, c-format -msgid "pack prefix %s does not begin with objdir %s" -msgstr "å°åŒ…å‰ç¶´ %s ä¸ä»¥ objdir %s é–‹é " - -#: builtin/repack.c msgid "pack everything in a single pack" msgstr "所有內容打包到一個包檔案ä¸" @@ -14116,21 +14902,6 @@ msgstr "「%sã€é¸é …åªèƒ½èˆ‡ã€Œ%sã€ä¸€èµ·ä½¿ç”¨" msgid "Nothing new to pack." msgstr "沒有新的è¦æ‰“包。" -#: builtin/repack.c -#, c-format -msgid "renaming pack to '%s' failed" -msgstr "無法將包é‡æ–°å‘½å為「%sã€" - -#: builtin/repack.c -#, c-format -msgid "pack-objects did not write a '%s' file for pack %s-%s" -msgstr "pack-objects 沒有為 %2$s-%3$s 套件包寫入「%1$sã€æª”案" - -#: builtin/repack.c sequencer.c -#, c-format -msgid "could not unlink: %s" -msgstr "無法刪除：%s" - #: builtin/replace.c msgid "git replace [-f] <object> <replacement>" msgstr "git replace [-f] <物件> <å–代物>" @@ -14264,7 +15035,7 @@ msgstr "æ交 '%s' ä¸å«æœ‰æ ¼å¼éŒ¯èª¤çš„åˆä½µæ¨™ç±¤" msgid "" "original commit '%s' contains mergetag '%s' that is discarded; use --edit " "instead of --graft" -msgstr "原始æ交 '%s' 包å«å·²ç¶“æ¨æ£„çš„åˆä½µæ¨™ç±¤ '%s'，使用 --edit 代替 --graft" +msgstr "原始æ交「%sã€åŒ…å«å·²ç¶“æ¨æ£„çš„åˆä½µæ¨™ç±¤ã€Œ%sã€ï¼Œä½¿ç”¨ --edit 代替 --graft" #: builtin/replace.c #, c-format @@ -14283,7 +15054,7 @@ msgstr "ç„¡æ³•å¯«å…¥ä¸‹åˆ—é …ç›®çš„æ›¿ä»£æ交：「%sã€" #: builtin/replace.c #, c-format msgid "graft for '%s' unnecessary" -msgstr "å° '%s' 移æ¤æ²’有必è¦" +msgstr "沒有必è¦å«æŽ¥ã€Œ%sã€" #: builtin/replace.c #, c-format @@ -14296,7 +15067,7 @@ msgid "" "could not convert the following graft(s):\n" "%s" msgstr "" -"無法轉æ›ä¸‹åˆ—移æ¤ï¼š\n" +"無法轉æ›ä¸‹åˆ—å«æŽ¥ï¼š\n" "%s" #: builtin/replace.c @@ -14317,7 +15088,7 @@ msgstr "修改一個æ交的父æ交" #: builtin/replace.c msgid "convert existing graft file" -msgstr "轉æ›ç¾å˜çš„移æ¤æª”案" +msgstr "轉æ›ç¾æœ‰çš„å«æŽ¥æª”案" #: builtin/replace.c msgid "replace the ref if it exists" @@ -14361,7 +15132,7 @@ msgstr "-g 需è¦è‡³å°‘一個åƒæ•¸" #: builtin/replace.c msgid "--convert-graft-file takes no argument" -msgstr "--convert-graft-file ä¸å¸¶åƒæ•¸" +msgstr "--convert-graft-file ä¸éœ€è¦å¼•æ•¸" #: builtin/replace.c msgid "only one pattern can be given with -l" @@ -14443,6 +15214,80 @@ msgstr "å°šä¸æ”¯æ´é‡æ”¾åˆ°æ ¹æ交ï¼" msgid "replaying merge commits is not supported yet!" msgstr "å°šä¸æ”¯æ´é‡æ”¾åˆä½µæ交ï¼" +#: builtin/repo.c +#, c-format +msgid "key '%s' not found" +msgstr "找ä¸åˆ°ã€Œ%sã€éµ" + +#: builtin/repo.c +#, c-format +msgid "invalid format '%s'" +msgstr "「%sã€æ ¼å¼ç„¡æ•ˆ" + +#: builtin/repo.c +msgid "output format" +msgstr "è¼¸å‡ºæ ¼å¼" + +#: builtin/repo.c +msgid "synonym for --format=nul" +msgstr "å’Œ --format=nul åŒç¾©" + +#: builtin/repo.c +msgid "unsupported output format" +msgstr "ä¸æ”¯æ´çš„è¼¸å‡ºæ ¼å¼" + +#: builtin/repo.c +msgid "References" +msgstr "引用" + +#: builtin/repo.c +msgid "Count" +msgstr "總數" + +#: builtin/repo.c +msgid "Branches" +msgstr "分支" + +#: builtin/repo.c +msgid "Tags" +msgstr "標籤" + +#: builtin/repo.c +msgid "Remotes" +msgstr "é 端" + +#: builtin/repo.c +msgid "Others" +msgstr "其他" + +#: builtin/repo.c +msgid "Reachable objects" +msgstr "å¯åˆ°é”物件" + +#: builtin/repo.c +msgid "Commits" +msgstr "æ交" + +#: builtin/repo.c +msgid "Trees" +msgstr "樹狀物件" + +#: builtin/repo.c +msgid "Blobs" +msgstr "資料物件" + +#: builtin/repo.c +msgid "Repository structure" +msgstr "版本庫çµæ§‹" + +#: builtin/repo.c +msgid "Value" +msgstr "值" + +#: builtin/repo.c +msgid "Counting references" +msgstr "æ£åœ¨è¨ˆç®—引用數é‡" + #: builtin/rerere.c msgid "" "git rerere [clear | forget <pathspec>... | diff | status | remaining | gc]" @@ -15173,14 +16018,6 @@ msgid "git show-ref --exists <ref>" msgstr "git show-ref --exists <ref>" #: builtin/show-ref.c -msgid "reference does not exist" -msgstr "引用ä¸å˜åœ¨" - -#: builtin/show-ref.c -msgid "failed to look up reference" -msgstr "無法查詢引用" - -#: builtin/show-ref.c msgid "only show tags (can be combined with --branches)" msgstr "åªé¡¯ç¤ºæ¨™ç±¤ï¼ˆå¯ä»¥å’Œ --branches 共用）" @@ -15219,10 +16056,10 @@ msgstr "顯示從標準輸入ä¸è®€å…¥çš„ä¸åœ¨æœ¬æ©Ÿç‰ˆæœ¬åº«ä¸çš„引用" #: builtin/sparse-checkout.c msgid "" "git sparse-checkout (init | list | set | add | reapply | disable | check-" -"rules) [<options>]" +"rules | clean) [<options>]" msgstr "" "git sparse-checkout (init | list | set | add | reapply | disable | check-" -"rules) [<options>]" +"rules | clean) [<options>]" #: builtin/sparse-checkout.c msgid "this worktree is not sparse" @@ -15269,11 +16106,6 @@ msgstr "以 cone 模å¼åˆå§‹åŒ–稀ç–簽出" msgid "toggle the use of a sparse index" msgstr "切æ›æ˜¯å¦ä½¿ç”¨ç¨€ç–索引" -#: builtin/sparse-checkout.c commit-graph.c midx-write.c sequencer.c -#, c-format -msgid "unable to create leading directories of %s" -msgstr "ä¸èƒ½ç‚º %s 建立先導目錄" - #: builtin/sparse-checkout.c #, c-format msgid "failed to open '%s'" @@ -15365,6 +16197,37 @@ msgid "must be in a sparse-checkout to reapply sparsity patterns" msgstr "å¿…é ˆåœ¨ç¨€ç–æ交æ‰èƒ½é‡æ–°å¥—用稀ç–æ¨£å¼ (sparsity pattern)" #: builtin/sparse-checkout.c +msgid "report each affected file, not just directories" +msgstr "ä¸åªå›žå ±ç›®éŒ„ï¼Œé‚„å›žå ±æ¯å€‹å—影響的檔案" + +#: builtin/sparse-checkout.c +msgid "must be in a sparse-checkout to clean directories" +msgstr "å¿…é ˆè™•æ–¼ç¨€ç–æ交，æ‰èƒ½æ¸…ç†ç›®éŒ„" + +#: builtin/sparse-checkout.c +msgid "must be in a cone-mode sparse-checkout to clean directories" +msgstr "å¿…é ˆè™•æ–¼ cone 模å¼çš„稀ç–æ交，æ‰èƒ½æ¸…ç†ç›®éŒ„" + +#: builtin/sparse-checkout.c +msgid "for safety, refusing to clean without one of --force or --dry-run" +msgstr "為é¿å…æ„外發生，åªå…許在傳入 --force 或 --dry-run 時清ç†" + +#: builtin/sparse-checkout.c +msgid "failed to read index" +msgstr "無法讀å–索引" + +#: builtin/sparse-checkout.c +msgid "" +"failed to convert index to a sparse index; resolve merge conflicts and try " +"again" +msgstr "無法將索引轉æ›æˆç¨€ç–索引，請解決åˆä½µè¡çªå¾Œé‡è©¦" + +#: builtin/sparse-checkout.c +#, c-format +msgid "failed to remove '%s'" +msgstr "無法移除「%sã€" + +#: builtin/sparse-checkout.c msgid "error while refreshing working directory" msgstr "é‡æ–°æ•´ç†å·¥ä½œç›®éŒ„時發生錯誤" @@ -15999,9 +16862,9 @@ msgid "" "'--reference-if-able' instead of '--reference'." msgstr "" "從上級專案的備用版本庫計算得出的備用版本庫無效。\n" -"這種情æ³ä¸‹ï¼Œè«‹è¨å®š submodule.alternateErrorStrategy 為 'info'\n" -"以å…許 Git ä¸ç”¨å‚™ç”¨ç‰ˆæœ¬åº«è¤‡è£½ï¼Œäº¦å¯ä½¿ç”¨ç‰æ•ˆçš„ '--reference-if-able'\n" -"è€Œéž '--reference' 複製。" +"這種情æ³ä¸‹ï¼Œè«‹è¨å®š submodule.alternateErrorStrategy 為「infoã€\n" +"以å…許 Git ä¸ç”¨å‚™ç”¨ç‰ˆæœ¬åº«æ‹“製，亦å¯ä½¿ç”¨ç‰æ•ˆçš„「--reference-if-ableã€\n" +"而éžã€Œ--referenceã€æ‹“製。" #: builtin/submodule--helper.c #, c-format @@ -16036,7 +16899,7 @@ msgstr "目錄ä¸æ˜¯ç©ºçš„：「%sã€" #: builtin/submodule--helper.c #, c-format msgid "clone of '%s' into submodule path '%s' failed" -msgstr "無法複製 '%s' 到å模組路徑 '%s'" +msgstr "無法拓製「%sã€åˆ°å模組路徑「%sã€" #: builtin/submodule--helper.c #, c-format @@ -16049,7 +16912,7 @@ msgstr "相å°è·¯å¾‘的替代錨記（anchor）" #: builtin/submodule--helper.c msgid "where the new submodule will be cloned to" -msgstr "æ–°çš„å模組將è¦è¤‡è£½çš„路徑" +msgstr "æ–°çš„å模組將è¦æ‹“製的路徑" #: builtin/submodule--helper.c msgid "name of the new submodule" @@ -16057,19 +16920,19 @@ msgstr "æ–°å模組的å稱" #: builtin/submodule--helper.c msgid "url where to clone the submodule from" -msgstr "複製å模組的 url ä½å€" +msgstr "拓製å模組的 url ä½å€" #: builtin/submodule--helper.c msgid "depth for shallow clones" -msgstr "淺複製的深度" +msgstr "淺拓製的深度" #: builtin/submodule--helper.c msgid "force cloning progress" -msgstr "強制顯示複製進度" +msgstr "強制顯示拓製進度" #: builtin/submodule--helper.c msgid "disallow cloning into non-empty directory" -msgstr "ä¸å…許複製至éžç©ºç™½ç›®éŒ„" +msgstr "ä¸å…許拓製至éžç©ºç™½ç›®éŒ„" #: builtin/submodule--helper.c msgid "" @@ -16108,17 +16971,17 @@ msgstr "ç•¥éŽå模組 '%s'" #: builtin/submodule--helper.c #, c-format msgid "cannot clone submodule '%s' without a URL" -msgstr "無法在沒有網å€çš„情æ³ä¸‹è¤‡è£½ã€Œ%sã€å模組" +msgstr "無法在沒有網å€çš„情æ³ä¸‹æ‹“製「%sã€å模組" #: builtin/submodule--helper.c #, c-format msgid "Failed to clone '%s'. Retry scheduled" -msgstr "複製 '%s' 失敗。已排程é‡è©¦ä½œæ¥" +msgstr "拓製「%sã€å¤±æ•—。已排程é‡è©¦ä½œæ¥" #: builtin/submodule--helper.c #, c-format msgid "Failed to clone '%s' a second time, aborting" -msgstr "第二次嘗試複製 '%s' 失敗，ä¸æ¢ä½œæ¥" +msgstr "第二次嘗試拓製「%sã€å¤±æ•—，ä¸æ¢ä½œæ¥" #: builtin/submodule--helper.c #, c-format @@ -16243,7 +17106,7 @@ msgstr "使用「rebaseã€æ›´æ–°ç–ç•¥" #: builtin/submodule--helper.c msgid "create a shallow clone truncated to the specified number of revisions" -msgstr "建立一個縮減至指定版本數的淺複製" +msgstr "建立一個縮減至指定版本數的淺拓製" #: builtin/submodule--helper.c msgid "parallel jobs" @@ -16251,15 +17114,15 @@ msgstr "並行任務" #: builtin/submodule--helper.c msgid "whether the initial clone should follow the shallow recommendation" -msgstr "åˆå§‹è¤‡è£½æ˜¯å¦æ‡‰è©²éµå¾ªå»ºè°çš„淺複製é¸é …" +msgstr "åˆå§‹æ‹“製是å¦æ‡‰è©²éµå¾ªå»ºè°çš„淺拓製é¸é …" #: builtin/submodule--helper.c msgid "don't print cloning progress" -msgstr "ä¸è¦è¼¸å‡ºè¤‡è£½é€²åº¦" +msgstr "ä¸è¦è¼¸å‡ºæ‹“製進度" #: builtin/submodule--helper.c msgid "disallow cloning into non-empty directory, implies --init" -msgstr "ä¸å…許複製進éžç©ºç™½ç›®éŒ„ï¼Œéš±å« --init" +msgstr "ä¸å…許拓製進éžç©ºç™½ç›®éŒ„ï¼Œéš±å« --init" #: builtin/submodule--helper.c msgid "" @@ -16359,10 +17222,10 @@ msgid "" "or you are unsure what this means choose another name with the '--name' " "option." msgstr "" -"如果您想è¦ç›´æŽ¥ä½¿ç”¨é€™å€‹æœ¬æ©Ÿ git 目錄，而éžé‡æ–°è¤‡è£½è‡ª\n" +"如果您想è¦ç›´æŽ¥ä½¿ç”¨é€™å€‹æœ¬æ©Ÿ git 目錄，而éžé‡æ–°æ‹“製自\n" " %s\n" -"請使用 '--force' é¸é …。如果本機 git 目錄ä¸æ˜¯æ£ç¢ºçš„版本庫\n" -"å‡å¦‚您ä¸å¤ªæ‡‚æ„æ€ï¼Œè«‹ä½¿ç”¨ '--name' é¸é …輸入其他å稱。" +"請使用「--forceã€é¸é …。如果本機 git 目錄ä¸æ˜¯æ£ç¢ºçš„版本庫，\n" +"或者是您ä¸å¤ªæ‡‚æ„æ€ï¼Œè«‹ä½¿ç”¨ã€Œ--nameã€é¸é …輸入其他å稱。" #: builtin/submodule--helper.c #, c-format @@ -17169,12 +18032,12 @@ msgstr "" #: builtin/worktree.c #, c-format msgid "failed to copy '%s' to '%s'; sparse-checkout may not work correctly" -msgstr "將「%sã€æ‹·è²è‡³ã€Œ%sã€å¤±æ•—；稀ç–簽出å¯èƒ½ç„¡æ³•æ£å¸¸é‹ä½œ" +msgstr "將「%sã€è¤‡è£½è‡³ã€Œ%sã€å¤±æ•—；稀ç–簽出å¯èƒ½ç„¡æ³•æ£å¸¸é‹ä½œ" #: builtin/worktree.c #, c-format msgid "failed to copy worktree config from '%s' to '%s'" -msgstr "將工作å€çµ„態從「%sã€æ‹·è²è‡³ã€Œ%sã€å¤±æ•—" +msgstr "將工作å€çµ„態從「%sã€è¤‡è£½è‡³ã€Œ%sã€å¤±æ•—" #: builtin/worktree.c #, c-format @@ -17236,7 +18099,7 @@ msgstr "" #: builtin/worktree.c msgid "checkout <branch> even if already checked out in other worktree" -msgstr "簽出 <分支>，å³ä½¿å·²ç¶“被簽出到其它工作å€" +msgstr "簽出 <分支>，å³ä½¿å·²ç¶“被簽出到其他工作å€" #: builtin/worktree.c msgid "create a new branch" @@ -17440,10 +18303,6 @@ msgstr "å°‡ <å‰ç¶´> å目錄內容寫到一個樹狀物件" msgid "only useful for debugging" msgstr "åªå°é™¤éŒ¯æœ‰ç”¨" -#: bulk-checkin.c -msgid "core.fsyncMethod = batch is unsupported on this platform" -msgstr "core.fsyncMethod = batch ä¸æ”¯æ´æœ¬å¹³å°" - #: bundle-uri.c #, c-format msgid "could not parse bundle list key %s with value '%s'" @@ -17570,7 +18429,7 @@ msgstr "本套件包使用æ¤éŽæ¿¾å™¨ï¼š%s" #: bundle.c msgid "unable to dup bundle descriptor" -msgstr "無法複製套件包æè¿°å…ƒ" +msgstr "無法拓製套件包æè¿°å…ƒ" #: bundle.c msgid "Could not spawn pack-objects" @@ -17611,7 +18470,7 @@ msgstr "index-pack 終æ¢" #: cache-tree.c #, c-format msgid "directory '%s' is present in index, but not sparse" -msgstr "「%sã€ç›®éŒ„已經在索引裡é¢ï¼Œä½†ä¸åœ¨ç¨€ç–簽出當ä¸ã€‚" +msgstr "「%sã€ç›®éŒ„已經在索引裡é¢ï¼Œä½†ä¸åœ¨ç¨€ç–簽出當ä¸" #: cache-tree.c unpack-trees.c msgid "corrupted cache-tree has entries not present in index" @@ -17691,7 +18550,7 @@ msgstr "基於命åéŽçš„樹建立檔案å°å˜" #: command-list.h msgid "Download missing objects in a partial clone" -msgstr "在部分複製ä¸ä¸‹è¼‰ç¼ºå°‘的物件" +msgstr "在部分拓製ä¸ä¸‹è¼‰ç¼ºå°‘的物件" #: command-list.h msgid "Use binary search to find the commit that introduced a bug" @@ -17739,7 +18598,7 @@ msgstr "切æ›åˆ†æ”¯æˆ–復原工作å€æª”案" #: command-list.h msgid "Copy files from the index to the working tree" -msgstr "從索引å€æ‹·è²æª”案至工作å€" +msgstr "從索引å€è¤‡è£½æª”案至工作å€" #: command-list.h msgid "Find commits yet to be applied to upstream" @@ -17759,7 +18618,7 @@ msgstr "從工作å€ä¸åˆªé™¤æœªè¿½è¹¤æª”案" #: command-list.h msgid "Clone a repository into a new directory" -msgstr "複製版本庫至新目錄" +msgstr "拓製版本庫至新目錄" #: command-list.h msgid "Display data in columns" @@ -17946,6 +18805,10 @@ msgid "Add or parse structured information in commit messages" msgstr "新增或解æžæ交說明ä¸çš„çµæ§‹åŒ–訊æ¯" #: command-list.h +msgid "EXPERIMENTAL: Show when files were last modified" +msgstr "實驗性功能：顯示檔案最後修改的時間" + +#: command-list.h msgid "Show commit logs" msgstr "顯示æ交日誌" @@ -18107,6 +18970,10 @@ msgid "EXPERIMENTAL: Replay commits on a new base, works with bare repos too" msgstr "實驗性功能：在新的基底é‡æ”¾æ交，亦支æ´è£¸ç‰ˆæœ¬åº«" #: command-list.h +msgid "Retrieve information about the repository" +msgstr "å–得儲å˜åº«çš„資訊" + +#: command-list.h msgid "Generates a summary of pending changes" msgstr "生æˆå¾…定更改的摘è¦" @@ -18216,8 +19083,8 @@ msgid "Read, modify and delete symbolic refs" msgstr "讀å–ã€ä¿®æ”¹å’Œåˆªé™¤ç¬¦è™Ÿå¼•ç”¨" #: command-list.h -msgid "Create, list, delete or verify a tag object signed with GPG" -msgstr "建立ã€åˆ—出ã€åˆªé™¤æˆ–é©—è‰ä¸€å€‹ GPG ç°½å的標籤物件" +msgid "Create, list, delete or verify tags" +msgstr "建立ã€åˆ—出ã€åˆªé™¤æˆ–é©—è‰æ¨™ç±¤" #: command-list.h msgid "Creates a temporary file with a blob's contents" @@ -18746,13 +19613,13 @@ msgid "" "Turn this message off by running\n" "\"git config set advice.graftFileDeprecated false\"" msgstr "" -"å° <GIT_DIR>/info/grafts 的支æ´å·²æ£„用，並將在\n" -"未來的 Git 版本ä¸è¢«ç§»é™¤ã€‚\n" +"<GIT_DIR>/info/grafts 已棄用，\n" +"並將在未來的 Git 版本ä¸ç§»é™¤ã€‚\n" "\n" -"請使用「git replace --convert-graft-fileã€å°‡\n" -"grafts 轉æ›ç‚ºå–代引用。\n" +"請使用「git replace --convert-graft-fileã€ä¾†\n" +"å°‡å«æŽ¥è½‰æ›ç‚ºå–代引用。\n" "\n" -"è¨å®šã€Œgit config set advice.graftFileDeprecated falseã€\n" +"執行「git config set advice.graftFileDeprecated falseã€\n" "å¯ä»¥é—œé–‰æ¤è¨Šæ¯" #: commit.c @@ -18914,7 +19781,7 @@ msgstr "[GLE %ld] 無法å–得「%lsã€çš„通訊å”定資訊" #: compat/mingw.c #, c-format msgid "failed to copy SID (%ld)" -msgstr "æ‹·è² SID 失敗（%ld）" +msgstr "複製 SID 失敗（%ld）" #: compat/mingw.c #, c-format @@ -19256,6 +20123,48 @@ msgid "unable to parse command-line config" msgstr "無法解æžå‘½ä»¤åˆ—ä¸çš„è¨å®š" #: config.c +#, c-format +msgid "" +"\n" +"To use the default comment string (#) please run\n" +"\n" +"%s" +msgstr "" +"\n" +"如果è¦ä½¿ç”¨é è¨çš„備註å—串 (#)，請執行\n" +"\n" +"%s" + +#: config.c +msgid "<comment string>" +msgstr "<comment string>" + +#: config.c +#, c-format +msgid "" +"\n" +"To set a custom comment string please run\n" +"\n" +"%s\n" +"where '%s' is the string you wish to use.\n" +msgstr "" +"\n" +"如果è¦è¨å®šè‡ªè¨‚的備註å—串，請執行\n" +"\n" +"%s\n" +"å…¶ä¸ã€Œ%sã€æ˜¯æ‚¨æƒ³ä½¿ç”¨çš„å—串。\n" + +#: config.c +#, c-format +msgid "Support for '%s=auto' has been removed in Git 3.0" +msgstr "「%s=autoã€çš„支æ´ï¼Œå·²ç¶“在 Git 3.0 ä¸ç§»é™¤" + +#: config.c +#, c-format +msgid "Support for '%s=auto' is deprecated and will be removed in Git 3.0" +msgstr "「%s=autoã€å·²ç¶“棄用，將在 Git 3.0 ä¸ç§»é™¤" + +#: config.c msgid "unknown error occurred while reading the configuration files" msgstr "在讀å–è¨å®šæª”案時é‡åˆ°æœªçŸ¥éŒ¯èª¤" @@ -19395,11 +20304,11 @@ msgstr "å”定錯誤：æ„外的 capabilities^{}" #: connect.c #, c-format msgid "protocol error: expected shallow sha-1, got '%s'" -msgstr "å”定錯誤：é 期淺複製 sha-1，å»å¾—到 '%s'" +msgstr "å”定錯誤：é 期淺拓製 sha-1，å»å¾—到 '%s'" #: connect.c msgid "repository on the other end cannot be shallow" -msgstr "å¦ä¸€ç«¯çš„版本庫ä¸èƒ½æ˜¯æ·ºè¤‡è£½ç‰ˆæœ¬åº«" +msgstr "å¦ä¸€ç«¯çš„版本庫ä¸èƒ½æ˜¯æ·ºæ‹“製版本庫" #: connect.c msgid "invalid packet" @@ -19813,7 +20722,7 @@ msgstr "ç•¥éŽã€Œ%sã€ï¼Œå…¶éžæª”案或目錄" #: diagnose.c msgid "could not duplicate stdout" -msgstr "無法複製 stdout" +msgstr "無法å†è£½ stdout" #: diagnose.c #, c-format @@ -19825,6 +20734,14 @@ msgid "failed to write archive" msgstr "無法寫入å°å˜" #: diff-lib.c +msgid "max-depth is not supported for worktree diffs" +msgstr "ä¸æ”¯æ´åœ¨å·¥ä½œå€å·®ç•°æ¯”較ä¸ä½¿ç”¨ max-depth é¸é …" + +#: diff-lib.c +msgid "max-depth is not supported for index diffs" +msgstr "ä¸æ”¯æ´åœ¨ç´¢å¼•å·®ç•°æ¯”較ä¸ä½¿ç”¨ max-depth é¸é …" + +#: diff-lib.c msgid "--merge-base does not work with ranges" msgstr "--merge-base 跟範åœç„¡æ³•æé…é‹ä½œ" @@ -19897,7 +20814,7 @@ msgstr "" msgid "" "color-moved-ws: allow-indentation-change cannot be combined with other " "whitespace modes" -msgstr "color-moved-ws：allow-indentation-change ä¸èƒ½èˆ‡å…¶å®ƒç©ºç™½å—元模å¼å…±ç”¨" +msgstr "color-moved-ws：allow-indentation-change ä¸èƒ½èˆ‡å…¶ä»–空白å—元模å¼å…±ç”¨" #: diff.c #, c-format @@ -20231,11 +21148,11 @@ msgstr "çœç•¥åˆªé™¤è®Šæ›´çš„差異輸出" #: diff.c msgid "detect copies" -msgstr "檢測拷è²" +msgstr "檢測複製" #: diff.c msgid "use unmodified files as source to find copies" -msgstr "使用未修改的檔案作為尋找拷è²çš„來æº" +msgstr "使用未修改的檔案作為尋找複製的來æº" #: diff.c msgid "disable rename detection" @@ -20253,7 +21170,7 @@ msgstr "繼續列出檔案é‡æ–°å‘½å以外的æ·å²è¨˜éŒ„" msgid "" "prevent rename/copy detection if the number of rename/copy targets exceeds " "given limit" -msgstr "如果é‡æ–°å‘½å/æ‹·è²çš„目標數é‡è¶…出æ供的é™åº¦ï¼Œå‰‡é˜²æ¢æª¢æ¸¬é‡æ–°å‘½å/æ‹·è²" +msgstr "如果é‡æ–°å‘½å/複製的目標數é‡è¶…出æ供的é™åº¦ï¼Œå‰‡é˜²æ¢æª¢æ¸¬é‡æ–°å‘½å/複製" #: diff.c msgid "Diff algorithm options" @@ -20337,7 +21254,7 @@ msgstr "在 --color-moved 下如何忽略空白å—å…ƒ" #: diff.c msgid "Other diff options" -msgstr "其它差異é¸é …" +msgstr "其他差異é¸é …" #: diff.c msgid "when run from subdir, exclude changes outside and show relative paths" @@ -20450,6 +21367,14 @@ msgid "select files by diff type" msgstr "é€éŽå·®ç•°é¡žåž‹é¸æ“‡æª”案" #: diff.c +msgid "<depth>" +msgstr "<depth>" + +#: diff.c +msgid "maximum tree depth to recurse" +msgstr "樹狀物件的éžè¿´æœ€å¤§æ·±åº¦" + +#: diff.c msgid "<file>" msgstr "<檔案>" @@ -20660,7 +21585,7 @@ msgstr "git fetch-pack：應為 shallow 列表" #: fetch-pack.c msgid "git fetch-pack: expected a flush packet after shallow list" -msgstr "git fetch-pack：在淺複製列表之後期望一個 flush 包" +msgstr "git fetch-pack：在淺拓製列表之後期望一個 flush 包" #: fetch-pack.c msgid "git fetch-pack: expected ACK/NAK, got a flush packet" @@ -20691,11 +21616,6 @@ msgstr "無效的 unshallow 訊æ¯ï¼š%s" #: fetch-pack.c #, c-format -msgid "object not found: %s" -msgstr "物件未找到：%s" - -#: fetch-pack.c -#, c-format msgid "error in object: %s" msgstr "物件ä¸ç™¼ç”ŸéŒ¯èª¤ï¼š%s" @@ -20863,7 +21783,7 @@ msgstr "é 期在沒有「%sã€å¾Œä¸å‚³é€å…¶ä»–å€æ®µ" #: fetch-pack.c #, c-format msgid "error processing shallow info: %d" -msgstr "處ç†æ·ºè¤‡è£½è¨Šæ¯ç™¼ç”ŸéŒ¯èª¤ï¼š%d" +msgstr "處ç†æ·ºæ‹“製訊æ¯ç™¼ç”ŸéŒ¯èª¤ï¼š%d" #: fetch-pack.c #, c-format @@ -21040,6 +21960,11 @@ msgid "recursive alias: %s" msgstr "éžè¿´çš„別å：%s" #: git.c +#, c-format +msgid "alias loop detected: expansion of '%s' does not terminate:%s" +msgstr "åµæ¸¬åˆ°åˆ¥å循環：展開後的「%sã€ç„¡çª®ç„¡ç›¡ï¼š%s" + +#: git.c msgid "write failure on standard output" msgstr "在標準輸出寫入失敗" @@ -21053,11 +21978,6 @@ msgstr "標準輸出關閉失敗" #: git.c #, c-format -msgid "alias loop detected: expansion of '%s' does not terminate:%s" -msgstr "åµæ¸¬åˆ°åˆ¥å循環：展開後的「%sã€ç„¡çª®ç„¡ç›¡ï¼š%s" - -#: git.c -#, c-format msgid "cannot handle %s as a builtin" msgstr "ä¸èƒ½ä½œç‚ºå…§å»ºæŒ‡ä»¤è™•ç† %s" @@ -21119,12 +22039,22 @@ msgid "failed to get the ssh fingerprint for key '%s'" msgstr "無法å–得「%sã€é‡‘é‘°çš„ SSH 指紋" #: gpg-interface.c +#, c-format +msgid "failed to get the ssh fingerprint for key %s" +msgstr "無法å–å¾— %s 金鑰的 SSH 指紋" + +#: gpg-interface.c msgid "" "either user.signingkey or gpg.ssh.defaultKeyCommand needs to be configured" msgstr "需è¦è¨å®š user.signingkey 或 gpg.ssh.defaultKeyCommand 任一" #: gpg-interface.c #, c-format +msgid "malformed build-time gpg.ssh.defaultKeyCommand: %s" +msgstr "ç·¨è¯æœŸçš„ gpg.ssh.defaultKeyCommand æ ¼å¼æœ‰èª¤ï¼š%s" + +#: gpg-interface.c +#, c-format msgid "gpg.ssh.defaultKeyCommand succeeded but returned no keys: %s %s" msgstr "gpg.ssh.defaultKeyCommand 執行æˆåŠŸï¼Œä½†æ²’回傳按éµï¼š%s %s" @@ -21224,7 +22154,7 @@ msgstr "輔助指令/è©¢å•è€…" #: help.c msgid "Interacting with Others" -msgstr "與其它系統互動" +msgstr "與其他系統互動" #: help.c msgid "Low-level Commands / Manipulators" @@ -21426,6 +22356,12 @@ msgstr "" " 請求：%s\n" " é‡å®šå‘：%s" +#: http.h +#, c-format +msgid "" +"number too large to represent as curl_off_t on this platform: %<PRIuMAX>" +msgstr "數å—éŽå¤§ï¼Œç„¡æ³•è¡¨ç¤ºç‚ºé€™å€‹å¹³å°ä¸Šçš„ curl_off_t：%<PRIuMAX>" + #: ident.c msgid "Author identity unknown\n" msgstr "作者身分未知\n" @@ -21550,7 +22486,7 @@ msgstr "ä¸èƒ½æ··ç”¨å¤šç¨®éŽæ¿¾è¦æ ¼" #: list-objects-filter-options.c msgid "unable to upgrade repository format to support partial clone" -msgstr "無法å‡ç´šç‰ˆæœ¬åº«æ ¼å¼ï¼Œä»¥æ”¯æ´éƒ¨åˆ†è¤‡è£½" +msgstr "無法å‡ç´šç‰ˆæœ¬åº«æ ¼å¼ï¼Œä»¥æ”¯æ´éƒ¨åˆ†æ‹“製" #: list-objects-filter-options.h msgid "args" @@ -21907,7 +22843,7 @@ msgstr "" " git add %s\n" "\n" " 來記錄上述的åˆä½µæˆ–æ›´æ–°\n" -" - 解決上級專案ä¸çš„其它è¡çª\n" +" - 解決上級專案ä¸çš„其他è¡çª\n" " - 在上級專案ä¸ï¼Œæ交產生之索引資訊\n" #. TRANSLATORS: The %s arguments are: 1) tree hash of a merge @@ -21957,11 +22893,6 @@ msgstr "無法載入包" #: midx-write.c #, c-format -msgid "could not open index for %s" -msgstr "無法開啟 %s 的索引" - -#: midx-write.c -#, c-format msgid "unable to link '%s' to '%s'" msgstr "無法將「%sã€link 至「%sã€" @@ -21990,6 +22921,11 @@ msgstr "未知å好包：「%sã€" #: midx-write.c #, c-format +msgid "failed to open preferred pack %s" +msgstr "無法開啟å好的包 %s" + +#: midx-write.c +#, c-format msgid "cannot select preferred pack %s with no objects" msgstr "無法é¸å–å好，沒有物件的 %s 包" @@ -22020,6 +22956,10 @@ msgid "could not write multi-pack bitmap" msgstr "無法寫入多包ä½åœ–" #: midx-write.c +msgid "too many multi-pack-indexes" +msgstr "太多多包索引" + +#: midx-write.c msgid "unable to open multi-pack-index chain file" msgstr "無法開啟多å°è£ç´¢å¼•éˆæª”案" @@ -22349,11 +23289,6 @@ msgstr "「%sã€å’Œã€Œ%sã€æª”案內容ä¸åŒ" #: object-file.c #, c-format -msgid "unable to write file %s" -msgstr "無法寫檔案 %s" - -#: object-file.c -#, c-format msgid "unable to write repeatedly vanishing file %s" msgstr "無法寫入é‡è¤‡æ¶ˆå¤±çš„檔案 %s" @@ -22363,6 +23298,10 @@ msgid "unable to set permission to '%s'" msgstr "無法為 '%s' è¨å®šæ¬Šé™" #: object-file.c +msgid "core.fsyncMethod = batch is unsupported on this platform" +msgstr "core.fsyncMethod = batch ä¸æ”¯æ´æœ¬å¹³å°" + +#: object-file.c msgid "error when closing loose object file" msgstr "關閉鬆散物件檔案時發生錯誤" @@ -22716,22 +23655,22 @@ msgstr "路徑 '%s' ä¸å˜åœ¨" #: odb.c #, c-format msgid "reference repository '%s' as a linked checkout is not supported yet." -msgstr "å°šä¸æ”¯æ´å°‡å¼•ç”¨ç‰ˆæœ¬åº« '%s' 作為一個連çµç°½å‡ºã€‚" +msgstr "å°šä¸æ”¯æ´å°‡å¼•ç”¨ç‰ˆæœ¬åº«ã€Œ%sã€ä½œç‚ºä¸€å€‹é€£çµç°½å‡ºã€‚" #: odb.c #, c-format msgid "reference repository '%s' is not a local repository." -msgstr "引用版本庫 '%s' ä¸æ˜¯ä¸€å€‹æœ¬æ©Ÿç‰ˆæœ¬åº«ã€‚" +msgstr "引用版本庫「%sã€ä¸æ˜¯ä¸€å€‹æœ¬æ©Ÿç‰ˆæœ¬åº«ã€‚" #: odb.c #, c-format msgid "reference repository '%s' is shallow" -msgstr "引用版本庫 '%s' 是一個淺複製" +msgstr "引用版本庫「%sã€æ˜¯æ·ºæ‹“製的" #: odb.c #, c-format msgid "reference repository '%s' is grafted" -msgstr "引用版本庫 '%s' 已被移æ¤" +msgstr "引用版本庫「%sã€ç¶“éŽå«æŽ¥" #: odb.c #, c-format @@ -22964,6 +23903,26 @@ msgstr "mtimes 檔案 %s 有ä¸æ”¯æ´çš„ hash ID %<PRIu32>" msgid "mtimes file %s is corrupt" msgstr "mtimes 檔案 %s æ壞" +#: pack-refs.c +msgid "pack everything" +msgstr "打包一切" + +#: pack-refs.c +msgid "prune loose refs (default)" +msgstr "剪除鬆散引用（é è¨å€¼ï¼‰" + +#: pack-refs.c +msgid "auto-pack refs as needed" +msgstr "按需自動å°è£å¼•ç”¨" + +#: pack-refs.c +msgid "references to include" +msgstr "è¦åŒ…å«çš„引用" + +#: pack-refs.c +msgid "references to exclude" +msgstr "è¦æŽ’除的引用" + #: pack-revindex.c #, c-format msgid "reverse-index file %s is too small" @@ -23329,7 +24288,7 @@ msgstr "全域的 'glob' å’Œ 'noglob' 路徑è¦æ ¼è¨å®šä¸ç›¸å®¹" msgid "" "global 'literal' pathspec setting is incompatible with all other global " "pathspec settings" -msgstr "全域的 'literal' 路徑è¦æ ¼è¨å®šå’Œå…¶å®ƒçš„全域路徑è¦æ ¼è¨å®šä¸ç›¸å®¹" +msgstr "全域的 'literal' 路徑è¦æ ¼è¨å®šå’Œå…¶ä»–的全域路徑è¦æ ¼è¨å®šä¸ç›¸å®¹" #: pathspec.c msgid "invalid parameter for pathspec magic 'prefix'" @@ -23482,6 +24441,11 @@ msgstr "無法從承諾者é ç«¯æŠ“å– %s" #: promisor-remote.c #, c-format +msgid "unsupported field '%s' in '%s' config" +msgstr "ä¸æ”¯æ´ã€Œ%2$sã€çµ„æ…‹ä¸çš„「%1$sã€æ¬„ä½" + +#: promisor-remote.c +#, c-format msgid "no or empty URL advertised for remote '%s'" msgstr "é 端「%sã€æœªå…¬ä½ˆ URL 或 URL 空白" @@ -23492,13 +24456,18 @@ msgstr "已知有é 端å為「%sã€ï¼Œä½†å…¶ URL 為「%sã€è€Œéžã€Œ%sã€" #: promisor-remote.c #, c-format -msgid "unknown '%s' value for '%s' config option" -msgstr "「%2$sã€çµ„æ…‹é¸é …的值「%1$sã€æœªçŸ¥" +msgid "invalid element '%s' from remote info" +msgstr "é ç«¯è³‡è¨Šçš„å…ƒç´ ã€Œ%sã€ç„¡æ•ˆ" #: promisor-remote.c #, c-format -msgid "unknown element '%s' from remote info" -msgstr "é ç«¯è³‡è¨Šçš„å…ƒç´ ã€Œ%sã€æœªçŸ¥" +msgid "server advertised a promisor remote without a name or URL: %s" +msgstr "伺æœå™¨å…¬å‘Šäº†ä¸€å€‹æ²’有å稱或 URL 的承諾者é 端：%s" + +#: promisor-remote.c +#, c-format +msgid "unknown '%s' value for '%s' config option" +msgstr "「%2$sã€çµ„æ…‹é¸é …的值「%1$sã€æœªçŸ¥" #: promisor-remote.c #, c-format @@ -23610,6 +24579,16 @@ msgstr "ç”Ÿæˆ diff 失敗" #: range-diff.c #, c-format +msgid "" +"range-diff: unable to compute the range-diff, since it exceeds the maximum " +"memory for the cost matrix: %s (%<PRIuMAX> bytes) needed, limited to %s " +"(%<PRIuMAX> bytes)" +msgstr "" +"range-diff：無法計算範åœå·®ç•°ï¼Œå› 為它超éŽäº†æˆæœ¬çŸ©é™£çš„最大記憶體é™åˆ¶ï¼š%sï¼ˆéœ€è¦ " +"%<PRIuMAX> ä½å…ƒçµ„），é™åˆ¶ç‚º %s（%<PRIuMAX> ä½å…ƒçµ„）" + +#: range-diff.c +#, c-format msgid "could not parse log for '%s'" msgstr "無法解æžã€Œ%sã€çš„日誌" @@ -24233,6 +25212,10 @@ msgid "no reflog for '%s'" msgstr "沒有 '%s' 的引用日誌" #: refs.c +msgid "Checking references consistency" +msgstr "æ£åœ¨æª¢æŸ¥å¼•ç”¨ä¸€è‡´æ€§" + +#: refs.c #, c-format msgid "%s does not point to a valid object!" msgstr "%s 沒有指å‘一個有效的物件ï¼" @@ -24253,8 +25236,9 @@ msgstr "在刪除 %3$s 後，%1$s%2$s 已經是懸空狀態\n" #, c-format msgid "" "Using '%s' as the name for the initial branch. This default branch name\n" -"is subject to change. To configure the initial branch name to use in all\n" -"of your new repositories, which will suppress this warning, call:\n" +"will change to \"main\" in Git 3.0. To configure the initial branch name\n" +"to use in all of your new repositories, which will suppress this warning,\n" +"call:\n" "\n" "\tgit config --global init.defaultBranch <name>\n" "\n" @@ -24263,9 +25247,9 @@ msgid "" "\n" "\tgit branch -m <name>\n" msgstr "" -"將「%sã€è¨å®šç‚ºåˆå§‹åˆ†æ”¯çš„å稱。這個é è¨åˆ†æ”¯å稱å¯ä»¥è®Šæ›´ã€‚\n" -"如果è¦è¨å®šæ‰€æœ‰æ–°ç‰ˆæœ¬åº«è¦ä½¿ç”¨çš„åˆå§‹åˆ†æ”¯å稱，\n" -"請呼å«ï¼ˆæœƒéš±è—這個è¦å‘Šï¼‰ï¼š\n" +"將「%sã€è¨å®šç‚ºåˆå§‹åˆ†æ”¯çš„å稱。這個é è¨åˆ†æ”¯å稱會在 Git 3.0\n" +"ä¸æ”¹æˆã€Œmainã€ã€‚如果è¦è¨å®šæ‰€æœ‰æ–°ç‰ˆæœ¬åº«è¦ä½¿ç”¨çš„åˆå§‹åˆ†æ”¯\n" +"å稱，請呼å«ï¼ˆæœƒéš±è—這個è¦å‘Šï¼‰ï¼š\n" "\n" "\tgit config --global init.defaultBranch <name>\n" "\n" @@ -24276,6 +25260,21 @@ msgstr "" #: refs.c #, c-format +msgid "" +"Using '%s' as the name for the initial branch since Git 3.0.\n" +"If you expected Git to create 'master', the just-created\n" +"branch can be renamed via this command:\n" +"\n" +"\tgit branch -m master\n" +msgstr "" +"由於 Git 3.0 的緣故，使用「%sã€ä½œç‚ºåˆå§‹åˆ†æ”¯çš„å稱。\n" +"如果您é 期 Git 建立「masterã€åˆ†æ”¯ï¼Œå¯ä»¥é€éŽä»¥ä¸‹å‘½ä»¤\n" +"é‡æ–°å‘½å新建立的分支：\n" +"\n" +"\tgit branch -m master\n" + +#: refs.c +#, c-format msgid "could not retrieve `%s`" msgstr "無法擷å–「%sã€" @@ -24381,12 +25380,38 @@ msgstr "無法移除暫時性é·ç§»ç›®éŒ„「%sã€" msgid "migrated refs can be found at '%s'" msgstr "å¯ä»¥åœ¨ã€Œ%sã€æ‰¾åˆ°å·²é·ç§»çš„引用" +#: refs/files-backend.c +msgid "" +"'core.preferSymlinkRefs=true' is nominated for removal.\n" +"hint: The use of symbolic links for symbolic refs is deprecated\n" +"hint: and will be removed in Git 3.0. The configuration that\n" +"hint: tells Git to use them is thus going away. You can unset\n" +"hint: it with:\n" +"hint:\n" +"hint:\tgit config unset core.preferSymlinkRefs\n" +"hint:\n" +"hint: Git will then use the textual symref format instead." +msgstr "" +"「core.preferSymlinkRefs=trueã€å·²è¢«æå移除。\n" +"æ示：使用符號連çµè¡¨ç¤ºç¬¦è™Ÿå¼•ç”¨çš„åšæ³•å·²è¢«æ£„用\n" +"æ示：並將在 Git 3.0 ä¸ç§»é™¤ã€‚令 Git 使用符號連çµçš„組態\n" +"æ示：也將隨之消失。您å¯ä»¥é€éŽä»¥ä¸‹å‘½ä»¤å–消該組態：\n" +"æ示：\n" +"æ示：\tgit config unset core.preferSymlinkRefs\n" +"æ示：\n" +"æ示：Git 將改為使用文å—ç¬¦è™Ÿå¼•ç”¨æ ¼å¼ã€‚" + #: refs/files-backend.c refs/reftable-backend.c #, c-format msgid "" "cannot lock ref '%s': expected symref with target '%s': but is a regular ref" msgstr "無法鎖定引用「%sã€ï¼šé 期是指å‘「%sã€çš„符號引用，但這個是一般引用" +#: refs/files-backend.c refs/reftable-backend.c +#, c-format +msgid "trying to write reflog for '%s' with incomplete values" +msgstr "嘗試將ä¸å®Œæ•´çš„數值寫入「%sã€çš„引用日誌" + #: refs/files-backend.c #, c-format msgid "cannot read ref file '%s'" @@ -24397,10 +25422,6 @@ msgstr "無法寫入åƒç…§æª”案「%sã€" msgid "cannot open directory %s" msgstr "無法開啟 %s 目錄" -#: refs/files-backend.c -msgid "Checking references consistency" -msgstr "æ£åœ¨æª¢æŸ¥å¼•ç”¨ä¸€è‡´æ€§" - #: refs/packed-backend.c #, c-format msgid "unable to open '%s'" @@ -24446,6 +25467,11 @@ msgstr "ä¸å…許å°ã€Œ%sã€é€²è¡Œå¤šæ¬¡æ›´æ–°ï¼ˆåŒ…å«é€éŽã€Œ%sã€ç¬¦è™Ÿå¼•ç” #: refs/reftable-backend.c #, c-format +msgid "cannot lock ref '%s': dangling symref already exists" +msgstr "無法鎖定引用「%sã€ï¼šå·²ç¶“å˜åœ¨æ‡¸ç©ºç¬¦è™Ÿå¼•ç”¨" + +#: refs/reftable-backend.c +#, c-format msgid "cannot lock ref '%s': reference already exists" msgstr "無法鎖定引用「%sã€ï¼šå¼•ç”¨å·²ç¶“å˜åœ¨" @@ -24482,7 +25508,7 @@ msgstr "找ä¸åˆ°å¼•ç”¨å稱 %s" #: refs/reftable-backend.c #, c-format msgid "refname %s is a symbolic ref, copying it is not supported" -msgstr "引用å稱 %s 是象徵å¼å¼•ç”¨ï¼Œä¸æ”¯æ´æ‹·è²" +msgstr "引用å稱 %s 是符號引用，ä¸æ”¯æ´è¤‡è£½" #: refspec.c #, c-format @@ -24570,10 +25596,6 @@ msgid "RPC failed; %s" msgstr "RPC 失敗。%s" #: remote-curl.c -msgid "cannot handle pushes this big" -msgstr "ä¸èƒ½è™•ç†é€™éº¼å¤§çš„推é€" - -#: remote-curl.c #, c-format msgid "cannot deflate request; zlib deflate error %d" msgstr "ä¸èƒ½å£“縮請求，zlib 壓縮錯誤 %d" @@ -24792,6 +25814,12 @@ msgstr "" #: remote.c #, c-format +msgid "" +"The <src> part of the refspec ('%s') is an object ID that doesn't exist.\n" +msgstr "引用è¦æ ¼ï¼ˆã€Œ%sã€ï¼‰çš„ <src> 部分是個ä¸å˜åœ¨çš„物件 ID。\n" + +#: remote.c +#, c-format msgid "%s cannot be resolved to branch" msgstr "%s 無法被解æžç‚ºåˆ†æ”¯" @@ -24936,6 +25964,71 @@ msgstr "無法解æžæœŸæœ›çš„物件å '%s'" msgid "cannot strip one component off url '%s'" msgstr "無法從 url '%s' å‰é›¢ä¸€å€‹å…ƒä»¶" +#: repack-geometry.c +#, c-format +msgid "cannot open index for %s" +msgstr "無法開啟 %s 的索引" + +#: repack-geometry.c +#, c-format +msgid "pack %s too large to consider in geometric progression" +msgstr "%s 包太大，以致ä¸èƒ½åœ¨ç‰æ¯”數列ä¸è€ƒæ…®" + +#: repack-geometry.c +#, c-format +msgid "pack %s too large to roll up" +msgstr "%s 包太大，以致ä¸èƒ½ç¸®åˆ" + +#: repack-midx.c +#, c-format +msgid "could not open tempfile %s for writing" +msgstr "無法開啟暫å˜æª” %s 進行寫入" + +#: repack-midx.c +msgid "could not close refs snapshot tempfile" +msgstr "無法關閉 refs 的快照暫å˜æª”" + +#: repack-midx.c +#, c-format +msgid "could not remove stale bitmap: %s" +msgstr "無法移除éŽæ™‚ä½åœ–：%s" + +#: repack-promisor.c +msgid "could not start pack-objects to repack promisor objects" +msgstr "無法開始 pack-objects 來é‡æ–°æ‰“包 promisor 物件" + +#: repack-promisor.c +msgid "failed to feed promisor objects to pack-objects" +msgstr "無法將承諾者物件æ供給 pack-objects" + +#: repack-promisor.c repack.c +msgid "repack: Expecting full hex object ID lines only from pack-objects." +msgstr "repack：期望來自 pack-objects 的完整åå…進ä½ç‰©ä»¶ ID。" + +#: repack-promisor.c +msgid "could not finish pack-objects to repack promisor objects" +msgstr "無法çµæŸ pack-objects 來é‡æ–°æ‰“包 promisor 物件" + +#: repack.c +#, c-format +msgid "pack prefix %s does not begin with objdir %s" +msgstr "å°åŒ…å‰ç¶´ %s ä¸ä»¥ objdir %s é–‹é " + +#: repack.c +#, c-format +msgid "renaming pack to '%s' failed" +msgstr "無法將包é‡æ–°å‘½å為「%sã€" + +#: repack.c +#, c-format +msgid "pack-objects did not write a '%s' file for pack %s-%s" +msgstr "pack-objects 沒有為 %2$s-%3$s 套件包寫入「%1$sã€æª”案" + +#: repack.c sequencer.c +#, c-format +msgid "could not unlink: %s" +msgstr "無法刪除：%s" + #: replace-object.c #, c-format msgid "bad replace ref name: %s" @@ -25182,11 +26275,11 @@ msgstr "無法刪除編列å單目錄" #: scalar.c msgid "branch to checkout after clone" -msgstr "複製後è¦ç°½å‡ºçš„分支" +msgstr "拓製後è¦ç°½å‡ºçš„分支" #: scalar.c msgid "when cloning, create full working directory" -msgstr "複製時建立完整的工作目錄" +msgstr "拓製時建立完整的工作目錄" #: scalar.c msgid "only download metadata for the branch that will be checked out" @@ -25198,7 +26291,7 @@ msgstr "在「srcã€ç›®éŒ„建立版本庫" #: scalar.c msgid "specify if tags should be fetched during clone" -msgstr "指定是å¦è¦åœ¨è¤‡è£½éšŽæ®µæŠ“å–標籤" +msgstr "指定是å¦è¦åœ¨æ‹“製階段抓å–標籤" #: scalar.c msgid "specify if background maintenance should be enabled" @@ -25244,11 +26337,11 @@ msgstr "無法è¨å®šã€Œ%sã€" #: scalar.c msgid "partial clone failed; attempting full clone" -msgstr "部分複製失敗。嘗試完整複製" +msgstr "部分拓製失敗。嘗試完整拓製" #: scalar.c msgid "could not configure for full clone" -msgstr "無法è¨å®šå®Œæ•´è¤‡è£½" +msgstr "無法è¨å®šå®Œæ•´æ‹“製" #: scalar.c msgid "scalar diagnose [<enlistment>]" @@ -26518,10 +27611,6 @@ msgid "cannot chdir to '%s'" msgstr "ä¸èƒ½åˆ‡æ›ç›®éŒ„到 '%s'" #: setup.c -msgid "cannot come back to cwd" -msgstr "無法返回目å‰å·¥ä½œç›®éŒ„" - -#: setup.c #, c-format msgid "failed to stat '%*s%s%s'" msgstr "å–å¾— '%*s%s%s' 狀態（stat）失敗" @@ -26612,7 +27701,7 @@ msgstr "ä¸èƒ½è‡ª '%s' 到 '%s' 建立符號連çµ" #: setup.c #, c-format msgid "cannot copy '%s' to '%s'" -msgstr "無法將「%sã€æ‹·è²è‡³ã€Œ%sã€" +msgstr "無法將「%sã€è¤‡è£½è‡³ã€Œ%sã€" #: setup.c #, c-format @@ -26627,7 +27716,7 @@ msgstr "沒有在 %s ä¸æ‰¾åˆ°ç¯„本" #: setup.c #, c-format msgid "not copying templates from '%s': %s" -msgstr "未從「%sã€æ‹·è²ç¯„本：%s" +msgstr "未從「%sã€è¤‡è£½ç¯„本：%s" #: setup.c #, c-format @@ -26932,12 +28021,12 @@ msgstr "「%sã€å模組 git 目錄在「%.*sã€git 路徑ä¸" #: submodule.c #, c-format msgid "expected '%.*s' in submodule path '%s' not to be a symbolic link" -msgstr "é 期「%.*sã€ï¼ˆä½æ–¼å模組路徑「%sã€ï¼‰ä¸æ˜¯è±¡å¾µå¼é€£çµ" +msgstr "é 期「%.*sã€ï¼ˆä½æ–¼å模組路徑「%sã€ï¼‰ä¸æ˜¯ç¬¦è™Ÿé€£çµ" #: submodule.c #, c-format msgid "expected submodule path '%s' not to be a symbolic link" -msgstr "é 期å模組路徑「%sã€ä¸æ˜¯è±¡å¾µå¼é€£çµ" +msgstr "é 期å模組路徑「%sã€ä¸æ˜¯ç¬¦è™Ÿé€£çµ" #: submodule.c #, c-format @@ -27179,7 +28268,7 @@ msgstr "無法為 '%s' 找到é 端å”助工具" #: transport-helper.c msgid "can't dup helper output fd" -msgstr "無法複製å”助工具輸出檔案å¥æŸ„" +msgstr "無法å†è£½å”助工具輸出檔案å¥æŸ„" #: transport-helper.c #, c-format @@ -27340,7 +28429,7 @@ msgstr "%s 執行緒ç‰å¾…失敗：%s" #: transport-helper.c #, c-format msgid "can't start thread for copying data: %s" -msgstr "無法啟動執行緒來拷è²è³‡æ–™: %s" +msgstr "無法啟動執行緒來複製資料: %s" #: transport-helper.c #, c-format @@ -27354,7 +28443,7 @@ msgstr "%s 進程失敗" #: transport-helper.c msgid "can't start thread for copying data" -msgstr "無法啟動執行緒來拷è²è³‡æ–™" +msgstr "無法啟動執行緒來複製資料" #: transport.c #, c-format @@ -27785,17 +28874,32 @@ msgstr "è¦å‘Š: " #: usage.c #, c-format +msgid "'%s' is nominated for removal.\n" +msgstr "「%sã€å·²è¢«æå移除。\n" + +#: usage.c +#, c-format msgid "" -"'%s' is nominated for removal.\n" -"If you still use this command, please add an extra\n" -"option, '--i-still-use-this', on the command line\n" -"and let us know you still use it by sending an e-mail\n" -"to <git@vger.kernel.org>. Thanks.\n" +"If you still use this command, here's what you can do:\n" +"\n" +"- read https://git-scm.com/docs/BreakingChanges.html\n" +"- check if anyone has discussed this on the mailing\n" +" list and if they came up with something that can\n" +" help you: https://lore.kernel.org/git/?q=%s\n" +"- send an email to <git@vger.kernel.org> to let us\n" +" know that you still use this command and were unable\n" +" to determine a suitable replacement\n" +"\n" msgstr "" -"「%sã€å‘½ä»¤å·²è¢«æå移除。\n" -"如果您ä»åœ¨ä½¿ç”¨è©²å‘½ä»¤ï¼Œè«‹å¤šåŠ 上「--i-still-use-thisã€\n" -"é¸é …，然後寄å°é›»å郵件到 <git@vger.kernel.org>，\n" -"讓我們知é“您還在使用，è¬è¬ã€‚\n" +"如果您ä»ç„¶ä½¿ç”¨æ¤å‘½ä»¤ï¼Œä»¥ä¸‹æ˜¯æ‚¨å¯ä»¥æŽ¡å–的措施：\n" +"\n" +"- 閱讀 https://git-scm.com/docs/BreakingChanges.html\n" +"- 確èªæ˜¯å¦æœ‰äººåœ¨éƒµä»¶åˆ—表上討論éŽé€™å€‹å•é¡Œï¼Œ\n" +" 以åŠä»–們是å¦æœ‰æƒ³å‡ºèƒ½å¹«åŠ©æ‚¨çš„解決方案：\n" +" https://lore.kernel.org/git/?q=%s\n" +"- 寄é€é›»å郵件至 <git@vger.kernel.org> 告知我們\n" +" 您ä»åœ¨ä½¿ç”¨æ¤å‘½ä»¤ï¼Œä¸”無法找到åˆé©çš„替代方案\n" +"\n" #: usage.c msgid "refusing to run without --i-still-use-this" @@ -28481,7 +29585,7 @@ msgstr "æ交為空，但是å˜åœ¨å°šæœªè¿½è¹¤çš„檔案\n" #: wt-status.c #, c-format msgid "nothing to commit (create/copy files and use \"git add\" to track)\n" -msgstr "沒有æ±è¥¿æ交（建立/æ‹·è²æª”案並使用「git addã€è¿½è¹¤ä¹‹ï¼‰\n" +msgstr "沒有æ±è¥¿æ交（建立/複製檔案並使用「git addã€è¿½è¹¤ä¹‹ï¼‰\n" #: wt-status.c #, c-format @@ -28650,7 +29754,7 @@ msgstr "'%s.final' 包å«ç·¨è¼¯çš„信件。\n" #: git-send-email.perl msgid "--dump-aliases incompatible with other options\n" -msgstr "--dump-aliases 和其它é¸é …ä¸ç›¸å®¹\n" +msgstr "--dump-aliases 和其他é¸é …ä¸ç›¸å®¹\n" #: git-send-email.perl msgid "--dump-aliases and --translate-aliases are mutually exclusive\n" @@ -28865,6 +29969,10 @@ msgid "Send this email reply required" msgstr "傳é€è¦æ±‚的信件回覆" #: git-send-email.perl +msgid "The destination IMAP folder is not properly defined." +msgstr "目的地 IMAP 收件匣未æ£ç¢ºå®šç¾©ã€‚" + +#: git-send-email.perl msgid "The required SMTP server is not properly defined." msgstr "è¦æ±‚çš„ SMTP 伺æœå™¨æœªè¢«æ£ç¢ºå®šç¾©ã€‚" @@ -29016,6 +30124,59 @@ msgstr "ç•¥éŽå…·æœ‰å‚™ä»½å¾Œç¶´ã€Œ%2$sã€çš„ %1$s。\n" msgid "Do you really want to send %s? [y|N]: " msgstr "您真的è¦å‚³é€ %s？[y|N]： " +#~ msgid "No previous hunk" +#~ msgstr "沒有上一個å€å¡Š" + +#~ msgid "No next hunk" +#~ msgstr "沒有下一個å€å¡Š" + +#~ msgid "git for-each-ref [<options>] [<pattern>]" +#~ msgstr "git for-each-ref [<é¸é …>] [<模å¼>]" + +#~ msgid "git for-each-ref [--merged [<commit>]] [--no-merged [<commit>]]" +#~ msgstr "git for-each-ref [--merged [<æ交>]] [--no-merged [<æ交>]]" + +#~ msgid "git for-each-ref [--contains [<commit>]] [--no-contains [<commit>]]" +#~ msgstr "git for-each-ref [--contains [<æ交>]] [--no-contains [<æ交>]]" + +#~ msgid "git for-each-ref [--start-after <marker>]" +#~ msgstr "git for-each-ref [--start-after <marker>]" + +#~ msgid "" +#~ "git pack-refs [--all] [--no-prune] [--auto] [--include <pattern>] [--" +#~ "exclude <pattern>]" +#~ msgstr "" +#~ "git pack-refs [--all] [--no-prune] [--auto] [--include <pattern>] [--" +#~ "exclude <pattern>]" + +#, c-format +#~ msgid "deleting '%s' failed" +#~ msgstr "刪除 '%s' 失敗" + +#, c-format +#~ msgid "creating '%s' failed" +#~ msgstr "建立 '%s' 失敗" + +#, c-format +#~ msgid "could not open index for %s" +#~ msgstr "無法開啟 %s 的索引" + +#~ msgid "cannot handle pushes this big" +#~ msgstr "ä¸èƒ½è™•ç†é€™éº¼å¤§çš„推é€" + +#, c-format +#~ msgid "" +#~ "'%s' is nominated for removal.\n" +#~ "If you still use this command, please add an extra\n" +#~ "option, '--i-still-use-this', on the command line\n" +#~ "and let us know you still use it by sending an e-mail\n" +#~ "to <git@vger.kernel.org>. Thanks.\n" +#~ msgstr "" +#~ "「%sã€å‘½ä»¤å·²è¢«æå移除。\n" +#~ "如果您ä»åœ¨ä½¿ç”¨è©²å‘½ä»¤ï¼Œè«‹å¤šåŠ 上「--i-still-use-thisã€\n" +#~ "é¸é …，然後寄å°é›»å郵件到 <git@vger.kernel.org>，\n" +#~ "讓我們知é“您還在使用，è¬è¬ã€‚\n" + #~ msgid "start-after" #~ msgstr "start-after" @@ -29071,10 +30232,6 @@ msgstr "您真的è¦å‚³é€ %s？[y|N]： " #~ msgid "%s: object is of unknown type '%s': %s" #~ msgstr "%s：物件屬於「%sã€æœªçŸ¥é¡žåž‹ï¼š%s" -#, c-format -#~ msgid "%s points nowhere!" -#~ msgstr "%s 指å‘ä¸å˜åœ¨ï¼" - #~ msgid "(bad commit)\n" #~ msgstr "（壞æ交）\n" @@ -29264,10 +30421,6 @@ msgstr "您真的è¦å‚³é€ %s？[y|N]： " #~ "新命å目錄 %4$s->%5$s" #, c-format -#~ msgid "cannot read object %s" -#~ msgstr "ä¸èƒ½è®€å–物件 %s" - -#, c-format #~ msgid "object %s is not a blob" #~ msgstr "物件 %s ä¸æ˜¯ä¸€å€‹è³‡æ–™ç‰©ä»¶" diff --git a/pseudo-merge.c b/pseudo-merge.c index 893b763fe4..a2d5bd85f9 100644 --- a/pseudo-merge.c +++ b/pseudo-merge.c @@ -221,28 +221,25 @@ void load_pseudo_merges_from_config(struct repository *r, } } -static int find_pseudo_merge_group_for_ref(const char *refname, - const char *referent UNUSED, - const struct object_id *oid, - int flags UNUSED, - void *_data) +static int find_pseudo_merge_group_for_ref(const struct reference *ref, void *_data) { struct bitmap_writer *writer = _data; + const struct object_id *maybe_peeled = ref->oid; struct object_id peeled; struct commit *c; uint32_t i; int has_bitmap; - if (!peel_iterated_oid(the_repository, oid, &peeled)) - oid = &peeled; + if (!reference_get_peeled_oid(the_repository, ref, &peeled)) + maybe_peeled = &peeled; - c = lookup_commit(the_repository, oid); + c = lookup_commit(the_repository, maybe_peeled); if (!c) return 0; - if (!packlist_find(writer->to_pack, oid)) + if (!packlist_find(writer->to_pack, maybe_peeled)) return 0; - has_bitmap = bitmap_writer_has_bitmapped_object_id(writer, oid); + has_bitmap = bitmap_writer_has_bitmapped_object_id(writer, maybe_peeled); for (i = 0; i < writer->pseudo_merge_groups.nr; i++) { struct pseudo_merge_group *group; @@ -252,7 +249,7 @@ static int find_pseudo_merge_group_for_ref(const char *refname, size_t j; group = writer->pseudo_merge_groups.items[i].util; - if (regexec(group->pattern, refname, ARRAY_SIZE(captures), + if (regexec(group->pattern, ref->name, ARRAY_SIZE(captures), captures, 0)) continue; @@ -269,7 +266,7 @@ static int find_pseudo_merge_group_for_ref(const char *refname, if (group_name.len) strbuf_addch(&group_name, '-'); - strbuf_add(&group_name, refname + match->rm_so, + strbuf_add(&group_name, ref->name + match->rm_so, match->rm_eo - match->rm_so); } diff --git a/reachable.c b/reachable.c index 22266db523..b753c39553 100644 --- a/reachable.c +++ b/reachable.c @@ -83,18 +83,17 @@ static void add_rebase_files(struct rev_info *revs) free_worktrees(worktrees); } -static int add_one_ref(const char *path, const char *referent UNUSED, const struct object_id *oid, - int flag, void *cb_data) +static int add_one_ref(const struct reference *ref, void *cb_data) { struct rev_info *revs = (struct rev_info *)cb_data; struct object *object; - if ((flag & REF_ISSYMREF) && (flag & REF_ISBROKEN)) { - warning("symbolic ref is dangling: %s", path); + if ((ref->flags & REF_ISSYMREF) && (ref->flags & REF_ISBROKEN)) { + warning("symbolic ref is dangling: %s", ref->name); return 0; } - object = parse_object_or_die(the_repository, oid, path); + object = parse_object_or_die(the_repository, ref->oid, ref->name); add_pending_object(revs, object, ""); return 0; diff --git a/read-cache.c b/read-cache.c index 032480d0c7..990d4ead0d 100644 --- a/read-cache.c +++ b/read-cache.c @@ -706,7 +706,6 @@ int add_to_index(struct index_state *istate, const char *path, struct stat *st, int add_option = (ADD_CACHE_OK_TO_ADD|ADD_CACHE_OK_TO_REPLACE| (intent_only ? ADD_CACHE_NEW_ONLY : 0)); unsigned hash_flags = pretend ? 0 : INDEX_WRITE_OBJECT; - struct object_id oid; if (flags & ADD_CACHE_RENORMALIZE) hash_flags |= INDEX_RENORMALIZE; @@ -716,8 +715,6 @@ int add_to_index(struct index_state *istate, const char *path, struct stat *st, namelen = strlen(path); if (S_ISDIR(st_mode)) { - if (repo_resolve_gitlink_ref(the_repository, path, "HEAD", &oid) < 0) - return error(_("'%s' does not have a commit checked out"), path); while (namelen && path[namelen-1] == '/') namelen--; } diff --git a/ref-filter.c b/ref-filter.c index 520d2539c9..d7454269e8 100644 --- a/ref-filter.c +++ b/ref-filter.c @@ -91,6 +91,7 @@ static struct expand_data { struct object_id delta_base_oid; void *content; + struct object *maybe_object; struct object_info info; } oi, oi_deref; @@ -1475,11 +1476,29 @@ static void grab_common_values(struct atom_value *val, int deref, struct expand_ } } +static struct object *get_or_parse_object(struct expand_data *data, const char *refname, + struct strbuf *err, int *eaten) +{ + if (!data->maybe_object) { + data->maybe_object = parse_object_buffer(the_repository, &data->oid, data->type, + data->size, data->content, eaten); + if (!data->maybe_object) { + strbuf_addf(err, _("parse_object_buffer failed on %s for %s"), + oid_to_hex(&data->oid), refname); + return NULL; + } + } + + return data->maybe_object; +} + /* See grab_values */ -static void grab_tag_values(struct atom_value *val, int deref, struct object *obj) +static int grab_tag_values(struct atom_value *val, int deref, + struct expand_data *data, const char *refname, + struct strbuf *err, int *eaten) { + struct tag *tag = NULL; int i; - struct tag *tag = (struct tag *) obj; for (i = 0; i < used_atom_cnt; i++) { const char *name = used_atom[i].name; @@ -1487,6 +1506,14 @@ static void grab_tag_values(struct atom_value *val, int deref, struct object *ob struct atom_value *v = &val[i]; if (!!deref != (*name == '*')) continue; + + if (!tag) { + tag = (struct tag *) get_or_parse_object(data, refname, + err, eaten); + if (!tag) + return -1; + } + if (deref) name++; if (atom_type == ATOM_TAG) @@ -1496,22 +1523,35 @@ static void grab_tag_values(struct atom_value *val, int deref, struct object *ob else if (atom_type == ATOM_OBJECT && tag->tagged) v->s = xstrdup(oid_to_hex(&tag->tagged->oid)); } + + return 0; } /* See grab_values */ -static void grab_commit_values(struct atom_value *val, int deref, struct object *obj) +static int grab_commit_values(struct atom_value *val, int deref, + struct expand_data *data, const char *refname, + struct strbuf *err, int *eaten) { int i; - struct commit *commit = (struct commit *) obj; + struct commit *commit = NULL; for (i = 0; i < used_atom_cnt; i++) { const char *name = used_atom[i].name; enum atom_type atom_type = used_atom[i].atom_type; struct atom_value *v = &val[i]; + if (!!deref != (*name == '*')) continue; if (deref) name++; + + if (!commit) { + commit = (struct commit *) get_or_parse_object(data, refname, + err, eaten); + if (!commit) + return -1; + } + if (atom_type == ATOM_TREE && grab_oid(name, "tree", get_commit_tree_oid(commit), v, &used_atom[i])) continue; @@ -1531,6 +1571,8 @@ static void grab_commit_values(struct atom_value *val, int deref, struct object v->s = strbuf_detach(&s, NULL); } } + + return 0; } static const char *find_wholine(const char *who, int wholen, const char *buf) @@ -1759,10 +1801,12 @@ static void grab_person(const char *who, struct atom_value *val, int deref, void } } -static void grab_signature(struct atom_value *val, int deref, struct object *obj) +static int grab_signature(struct atom_value *val, int deref, + struct expand_data *data, const char *refname, + struct strbuf *err, int *eaten) { int i; - struct commit *commit = (struct commit *) obj; + struct commit *commit = NULL; struct signature_check sigc = { 0 }; int signature_checked = 0; @@ -1790,6 +1834,13 @@ static void grab_signature(struct atom_value *val, int deref, struct object *obj continue; if (!signature_checked) { + if (!commit) { + commit = (struct commit *) get_or_parse_object(data, refname, + err, eaten); + if (!commit) + return -1; + } + check_commit_signature(commit, &sigc); signature_checked = 1; } @@ -1843,6 +1894,8 @@ static void grab_signature(struct atom_value *val, int deref, struct object *obj if (signature_checked) signature_check_clear(&sigc); + + return 0; } static void find_subpos(const char *buf, @@ -1920,9 +1973,8 @@ static void append_lines(struct strbuf *out, const char *buf, unsigned long size } static void grab_describe_values(struct atom_value *val, int deref, - struct object *obj) + struct expand_data *data) { - struct commit *commit = (struct commit *)obj; int i; for (i = 0; i < used_atom_cnt; i++) { @@ -1944,7 +1996,7 @@ static void grab_describe_values(struct atom_value *val, int deref, cmd.git_cmd = 1; strvec_push(&cmd.args, "describe"); strvec_pushv(&cmd.args, atom->u.describe_args.v); - strvec_push(&cmd.args, oid_to_hex(&commit->object.oid)); + strvec_push(&cmd.args, oid_to_hex(&data->oid)); if (pipe_command(&cmd, NULL, 0, &out, 0, &err, 0) < 0) { error(_("failed to run 'describe'")); v->s = xstrdup(""); @@ -2066,24 +2118,36 @@ static void fill_missing_values(struct atom_value *val) * pointed at by the ref itself; otherwise it is the object the * ref (which is a tag) refers to. */ -static void grab_values(struct atom_value *val, int deref, struct object *obj, struct expand_data *data) +static int grab_values(struct atom_value *val, int deref, struct expand_data *data, + const char *refname, struct strbuf *err, int *eaten) { void *buf = data->content; + int ret; - switch (obj->type) { + switch (data->type) { case OBJ_TAG: - grab_tag_values(val, deref, obj); + ret = grab_tag_values(val, deref, data, refname, err, eaten); + if (ret < 0) + goto out; + grab_sub_body_contents(val, deref, data); grab_person("tagger", val, deref, buf); - grab_describe_values(val, deref, obj); + grab_describe_values(val, deref, data); break; case OBJ_COMMIT: - grab_commit_values(val, deref, obj); + ret = grab_commit_values(val, deref, data, refname, err, eaten); + if (ret < 0) + goto out; + grab_sub_body_contents(val, deref, data); grab_person("author", val, deref, buf); grab_person("committer", val, deref, buf); - grab_signature(val, deref, obj); - grab_describe_values(val, deref, obj); + + ret = grab_signature(val, deref, data, refname, err, eaten); + if (ret < 0) + goto out; + + grab_describe_values(val, deref, data); break; case OBJ_TREE: /* grab_tree_values(val, deref, obj, buf, sz); */ @@ -2094,8 +2158,12 @@ static void grab_values(struct atom_value *val, int deref, struct object *obj, s grab_sub_body_contents(val, deref, data); break; default: - die("Eh? Object of type %d?", obj->type); + die("Eh? Object of type %d?", data->type); } + + ret = 0; +out: + return ret; } static inline char *copy_advance(char *dst, const char *src) @@ -2292,38 +2360,43 @@ static const char *get_refname(struct used_atom *atom, struct ref_array_item *re return show_ref(&atom->u.refname, ref->refname); } -static int get_object(struct ref_array_item *ref, int deref, struct object **obj, +static int get_object(struct ref_array_item *ref, int deref, struct expand_data *oi, struct strbuf *err) { - /* parse_object_buffer() will set eaten to 0 if free() will be needed */ - int eaten = 1; + /* parse_object_buffer() will set eaten to 1 if free() will be needed */ + int eaten = 0; + int ret; + + oi->maybe_object = NULL; + if (oi->info.contentp) { /* We need to know that to use parse_object_buffer properly */ oi->info.sizep = &oi->size; oi->info.typep = &oi->type; } + if (odb_read_object_info_extended(the_repository->objects, &oi->oid, &oi->info, - OBJECT_INFO_LOOKUP_REPLACE)) - return strbuf_addf_ret(err, -1, _("missing object %s for %s"), - oid_to_hex(&oi->oid), ref->refname); + OBJECT_INFO_LOOKUP_REPLACE)) { + ret = strbuf_addf_ret(err, -1, _("missing object %s for %s"), + oid_to_hex(&oi->oid), ref->refname); + goto out; + } if (oi->info.disk_sizep && oi->disk_size < 0) BUG("Object size is less than zero."); if (oi->info.contentp) { - *obj = parse_object_buffer(the_repository, &oi->oid, oi->type, oi->size, oi->content, &eaten); - if (!*obj) { - if (!eaten) - free(oi->content); - return strbuf_addf_ret(err, -1, _("parse_object_buffer failed on %s for %s"), - oid_to_hex(&oi->oid), ref->refname); - } - grab_values(ref->value, deref, *obj, oi); + ret = grab_values(ref->value, deref, oi, ref->refname, err, &eaten); + if (ret < 0) + goto out; } grab_common_values(ref->value, deref, oi); + ret = 0; + +out: if (!eaten) free(oi->content); - return 0; + return ret; } static void populate_worktree_map(struct hashmap *map, struct worktree **worktrees) @@ -2376,7 +2449,6 @@ static char *get_worktree_path(const struct ref_array_item *ref) */ static int populate_value(struct ref_array_item *ref, struct strbuf *err) { - struct object *obj; int i; struct object_info empty = OBJECT_INFO_INIT; int ahead_behind_atoms = 0; @@ -2564,24 +2636,32 @@ static int populate_value(struct ref_array_item *ref, struct strbuf *err) oi.oid = ref->objectname; - if (get_object(ref, 0, &obj, &oi, err)) + if (get_object(ref, 0, &oi, err)) return -1; /* * If there is no atom that wants to know about tagged * object, we are done. */ - if (!need_tagged || (obj->type != OBJ_TAG)) + if (!need_tagged || (oi.type != OBJ_TAG)) return 0; /* * If it is a tag object, see if we use the peeled value. If we do, * grab the peeled OID. */ - if (need_tagged && peel_iterated_oid(the_repository, &obj->oid, &oi_deref.oid)) - die("bad tag"); + if (need_tagged) { + if (!is_null_oid(&ref->peeled_oid)) { + oidcpy(&oi_deref.oid, &ref->peeled_oid); + } else if (!peel_object(the_repository, &oi.oid, &oi_deref.oid, + PEEL_OBJECT_VERIFY_TAGGED_OBJECT_TYPE)) { + /* We managed to peel the object ourselves. */ + } else { + die("bad tag"); + } + } - return get_object(ref, 1, &obj, &oi_deref, err); + return get_object(ref, 1, &oi_deref, err); } /* @@ -2664,7 +2744,7 @@ static int match_name_as_path(const char **pattern, const char *refname, /* Return 1 if the refname matches one of the patterns, otherwise 0. */ static int filter_pattern_match(struct ref_filter *filter, const char *refname) { - if (!*filter->name_patterns) + if (!filter->name_patterns || !*filter->name_patterns) return 1; /* No pattern always matches */ if (filter->match_as_path) return match_name_as_path(filter->name_patterns, refname, @@ -2751,7 +2831,7 @@ static int for_each_fullref_in_pattern(struct ref_filter *filter, return for_each_fullref_with_seek(filter, cb, cb_data, 0); } - if (!filter->name_patterns[0]) { + if (!filter->name_patterns || !filter->name_patterns[0]) { /* no patterns; we have to look at everything */ return for_each_fullref_with_seek(filter, cb, cb_data, 0); } @@ -2807,12 +2887,15 @@ static int match_points_at(struct oid_array *points_at, * Callers can then fill in other struct members at their leisure. */ static struct ref_array_item *new_ref_array_item(const char *refname, - const struct object_id *oid) + const struct object_id *oid, + const struct object_id *peeled_oid) { struct ref_array_item *ref; FLEX_ALLOC_STR(ref, refname, refname); oidcpy(&ref->objectname, oid); + if (peeled_oid) + oidcpy(&ref->peeled_oid, peeled_oid); ref->rest = NULL; return ref; @@ -2826,14 +2909,15 @@ static void ref_array_append(struct ref_array *array, struct ref_array_item *ref struct ref_array_item *ref_array_push(struct ref_array *array, const char *refname, - const struct object_id *oid) + const struct object_id *oid, + const struct object_id *peeled_oid) { - struct ref_array_item *ref = new_ref_array_item(refname, oid); + struct ref_array_item *ref = new_ref_array_item(refname, oid, peeled_oid); ref_array_append(array, ref); return ref; } -static int ref_kind_from_refname(const char *refname) +int ref_kind_from_refname(const char *refname) { unsigned int i; @@ -2871,25 +2955,25 @@ static int filter_ref_kind(struct ref_filter *filter, const char *refname) return ref_kind_from_refname(refname); } -static struct ref_array_item *apply_ref_filter(const char *refname, const char *referent, const struct object_id *oid, - int flag, struct ref_filter *filter) +static struct ref_array_item *apply_ref_filter(const struct reference *ref, + struct ref_filter *filter) { - struct ref_array_item *ref; + struct ref_array_item *item; struct commit *commit = NULL; unsigned int kind; - if (flag & REF_BAD_NAME) { - warning(_("ignoring ref with broken name %s"), refname); + if (ref->flags & REF_BAD_NAME) { + warning(_("ignoring ref with broken name %s"), ref->name); return NULL; } - if (flag & REF_ISBROKEN) { - warning(_("ignoring broken ref %s"), refname); + if (ref->flags & REF_ISBROKEN) { + warning(_("ignoring broken ref %s"), ref->name); return NULL; } /* Obtain the current ref kind from filter_ref_kind() and ignore unwanted refs. */ - kind = filter_ref_kind(filter, refname); + kind = filter_ref_kind(filter, ref->name); /* * Generally HEAD refs are printed with special description denoting a rebase, @@ -2902,13 +2986,13 @@ static struct ref_array_item *apply_ref_filter(const char *refname, const char * else if (!(kind & filter->kind)) return NULL; - if (!filter_pattern_match(filter, refname)) + if (!filter_pattern_match(filter, ref->name)) return NULL; - if (filter_exclude_match(filter, refname)) + if (filter_exclude_match(filter, ref->name)) return NULL; - if (filter->points_at.nr && !match_points_at(&filter->points_at, oid, refname)) + if (filter->points_at.nr && !match_points_at(&filter->points_at, ref->oid, ref->name)) return NULL; /* @@ -2918,7 +3002,7 @@ static struct ref_array_item *apply_ref_filter(const char *refname, const char * */ if (filter->reachable_from || filter->unreachable_from || filter->with_commit || filter->no_commit || filter->verbose) { - commit = lookup_commit_reference_gently(the_repository, oid, 1); + commit = lookup_commit_reference_gently(the_repository, ref->oid, 1); if (!commit) return NULL; /* We perform the filtering for the '--contains' option... */ @@ -2936,13 +3020,13 @@ static struct ref_array_item *apply_ref_filter(const char *refname, const char * * to do its job and the resulting list may yet to be pruned * by maxcount logic. */ - ref = new_ref_array_item(refname, oid); - ref->commit = commit; - ref->flag = flag; - ref->kind = kind; - ref->symref = xstrdup_or_null(referent); + item = new_ref_array_item(ref->name, ref->oid, ref->peeled_oid); + item->commit = commit; + item->flag = ref->flags; + item->kind = kind; + item->symref = xstrdup_or_null(ref->target); - return ref; + return item; } struct ref_filter_cbdata { @@ -2954,14 +3038,14 @@ struct ref_filter_cbdata { * A call-back given to for_each_ref(). Filter refs and keep them for * later object processing. */ -static int filter_one(const char *refname, const char *referent, const struct object_id *oid, int flag, void *cb_data) +static int filter_one(const struct reference *ref, void *cb_data) { struct ref_filter_cbdata *ref_cbdata = cb_data; - struct ref_array_item *ref; + struct ref_array_item *item; - ref = apply_ref_filter(refname, referent, oid, flag, ref_cbdata->filter); - if (ref) - ref_array_append(ref_cbdata->array, ref); + item = apply_ref_filter(ref, ref_cbdata->filter); + if (item) + ref_array_append(ref_cbdata->array, item); return 0; } @@ -2990,17 +3074,17 @@ struct ref_filter_and_format_cbdata { } internal; }; -static int filter_and_format_one(const char *refname, const char *referent, const struct object_id *oid, int flag, void *cb_data) +static int filter_and_format_one(const struct reference *ref, void *cb_data) { struct ref_filter_and_format_cbdata *ref_cbdata = cb_data; - struct ref_array_item *ref; + struct ref_array_item *item; struct strbuf output = STRBUF_INIT, err = STRBUF_INIT; - ref = apply_ref_filter(refname, referent, oid, flag, ref_cbdata->filter); - if (!ref) + item = apply_ref_filter(ref, ref_cbdata->filter); + if (!item) return 0; - if (format_ref_array_item(ref, ref_cbdata->format, &output, &err)) + if (format_ref_array_item(item, ref_cbdata->format, &output, &err)) die("%s", err.buf); if (output.len || !ref_cbdata->format->array_opts.omit_empty) { @@ -3010,7 +3094,7 @@ static int filter_and_format_one(const char *refname, const char *referent, cons strbuf_release(&output); strbuf_release(&err); - free_array_item(ref); + free_array_item(item); /* * Increment the running count of refs that match the filter. If @@ -3583,13 +3667,14 @@ void print_formatted_ref_array(struct ref_array *array, struct ref_format *forma } void pretty_print_ref(const char *name, const struct object_id *oid, + const struct object_id *peeled_oid, struct ref_format *format) { struct ref_array_item *ref_item; struct strbuf output = STRBUF_INIT; struct strbuf err = STRBUF_INIT; - ref_item = new_ref_array_item(name, oid); + ref_item = new_ref_array_item(name, oid, peeled_oid); ref_item->kind = ref_kind_from_refname(name); if (format_ref_array_item(ref_item, format, &output, &err)) die("%s", err.buf); diff --git a/ref-filter.h b/ref-filter.h index 81f2c229a9..120221b47f 100644 --- a/ref-filter.h +++ b/ref-filter.h @@ -41,6 +41,7 @@ enum ref_sorting_order { struct ref_array_item { struct object_id objectname; + struct object_id peeled_oid; const char *rest; int flag; unsigned int kind; @@ -135,6 +136,8 @@ struct ref_format { OPT_STRVEC(0, "exclude", &(var)->exclude, \ N_("pattern"), N_("exclude refs which match pattern")) +/* Get the reference kind from the provided reference name. */ +int ref_kind_from_refname(const char *refname); /* * API for filtering a set of refs. Based on the type of refs the user * has requested, we iterate through those refs and apply filters @@ -185,6 +188,7 @@ void print_formatted_ref_array(struct ref_array *array, struct ref_format *forma * name must be a fully qualified refname. */ void pretty_print_ref(const char *name, const struct object_id *oid, + const struct object_id *peeled_oid, struct ref_format *format); /* @@ -193,7 +197,8 @@ void pretty_print_ref(const char *name, const struct object_id *oid, */ struct ref_array_item *ref_array_push(struct ref_array *array, const char *refname, - const struct object_id *oid); + const struct object_id *oid, + const struct object_id *peeled_oid); /* * If the provided format includes ahead-behind atoms, then compute the @@ -423,16 +423,13 @@ int should_expire_reflog_ent_verbose(struct object_id *ooid, return expire; } -static int push_tip_to_list(const char *refname UNUSED, - const char *referent UNUSED, - const struct object_id *oid, - int flags, void *cb_data) +static int push_tip_to_list(const struct reference *ref, void *cb_data) { struct commit_list **list = cb_data; struct commit *tip_commit; - if (flags & REF_ISSYMREF) + if (ref->flags & REF_ISSYMREF) return 0; - tip_commit = lookup_commit_reference_gently(the_repository, oid, 1); + tip_commit = lookup_commit_reference_gently(the_repository, ref->oid, 1); if (!tip_commit) return 0; commit_list_insert(tip_commit, list); @@ -426,17 +426,19 @@ int refs_ref_exists(struct ref_store *refs, const char *refname) NULL, NULL); } -static int for_each_filter_refs(const char *refname, const char *referent, - const struct object_id *oid, - int flags, void *data) +static int for_each_filter_refs(const struct reference *ref, void *data) { struct for_each_ref_filter *filter = data; - if (wildmatch(filter->pattern, refname, 0)) + if (wildmatch(filter->pattern, ref->name, 0)) return 0; - if (filter->prefix) - skip_prefix(refname, filter->prefix, &refname); - return filter->fn(refname, referent, oid, flags, filter->cb_data); + if (filter->prefix) { + struct reference skipped = *ref; + skip_prefix(skipped.name, filter->prefix, &skipped.name); + return filter->fn(&skipped, filter->cb_data); + } else { + return filter->fn(ref, filter->cb_data); + } } struct warn_if_dangling_data { @@ -447,17 +449,15 @@ struct warn_if_dangling_data { int dry_run; }; -static int warn_if_dangling_symref(const char *refname, const char *referent UNUSED, - const struct object_id *oid UNUSED, - int flags, void *cb_data) +static int warn_if_dangling_symref(const struct reference *ref, void *cb_data) { struct warn_if_dangling_data *d = cb_data; const char *resolves_to, *msg; - if (!(flags & REF_ISSYMREF)) + if (!(ref->flags & REF_ISSYMREF)) return 0; - resolves_to = refs_resolve_ref_unsafe(d->refs, refname, 0, NULL, NULL); + resolves_to = refs_resolve_ref_unsafe(d->refs, ref->name, 0, NULL, NULL); if (!resolves_to || !string_list_has_string(d->refnames, resolves_to)) { return 0; @@ -466,7 +466,7 @@ static int warn_if_dangling_symref(const char *refname, const char *referent UNU msg = d->dry_run ? _("%s%s will become dangling after %s is deleted\n") : _("%s%s has become dangling after %s was deleted\n"); - fprintf(d->fp, msg, d->indent, refname, resolves_to); + fprintf(d->fp, msg, d->indent, ref->name, resolves_to); return 0; } @@ -507,8 +507,15 @@ int refs_head_ref_namespaced(struct ref_store *refs, each_ref_fn fn, void *cb_da int flag; strbuf_addf(&buf, "%sHEAD", get_git_namespace()); - if (!refs_read_ref_full(refs, buf.buf, RESOLVE_REF_READING, &oid, &flag)) - ret = fn(buf.buf, NULL, &oid, flag, cb_data); + if (!refs_read_ref_full(refs, buf.buf, RESOLVE_REF_READING, &oid, &flag)) { + struct reference ref = { + .name = buf.buf, + .oid = &oid, + .flags = flag, + }; + + ret = fn(&ref, cb_data); + } strbuf_release(&buf); return ret; @@ -1741,8 +1748,15 @@ int refs_head_ref(struct ref_store *refs, each_ref_fn fn, void *cb_data) int flag; if (refs_resolve_ref_unsafe(refs, "HEAD", RESOLVE_REF_READING, - &oid, &flag)) - return fn("HEAD", NULL, &oid, flag, cb_data); + &oid, &flag)) { + struct reference ref = { + .name = "HEAD", + .oid = &oid, + .flags = flag, + }; + + return fn(&ref, cb_data); + } return 0; } @@ -2299,25 +2313,28 @@ void base_ref_store_init(struct ref_store *refs, struct repository *repo, refs->gitdir = xstrdup(path); } -/* backend functions */ -int refs_pack_refs(struct ref_store *refs, struct pack_refs_opts *opts) +int refs_optimize(struct ref_store *refs, struct refs_optimize_opts *opts) { - return refs->be->pack_refs(refs, opts); + return refs->be->optimize(refs, opts); } -int refs_optimize(struct ref_store *refs, struct pack_refs_opts *opts) +int refs_optimize_required(struct ref_store *refs, + struct refs_optimize_opts *opts, + bool *required) { - return refs->be->optimize(refs, opts); + return refs->be->optimize_required(refs, opts, required); } -int peel_iterated_oid(struct repository *r, const struct object_id *base, struct object_id *peeled) +int reference_get_peeled_oid(struct repository *repo, + const struct reference *ref, + struct object_id *peeled_oid) { - if (current_ref_iter && - (current_ref_iter->oid == base || - oideq(current_ref_iter->oid, base))) - return ref_iterator_peel(current_ref_iter, peeled); + if (ref->peeled_oid) { + oidcpy(peeled_oid, ref->peeled_oid); + return 0; + } - return peel_object(r, base, peeled) ? -1 : 0; + return peel_object(repo, ref->oid, peeled_oid, 0) ? -1 : 0; } int refs_update_symref(struct ref_store *refs, const char *ref, @@ -2689,7 +2706,7 @@ enum ref_transaction_error refs_verify_refnames_available(struct ref_store *refs while ((ok = ref_iterator_advance(iter)) == ITER_OK) { if (skip && - string_list_has_string(skip, iter->refname)) + string_list_has_string(skip, iter->ref.name)) continue; if (transaction && ref_transaction_maybe_set_rejected( @@ -2698,7 +2715,7 @@ enum ref_transaction_error refs_verify_refnames_available(struct ref_store *refs continue; strbuf_addf(err, _("'%s' exists; cannot create '%s'"), - iter->refname, refname); + iter->ref.name, refname); goto cleanup; } @@ -2753,14 +2770,10 @@ struct do_for_each_reflog_help { void *cb_data; }; -static int do_for_each_reflog_helper(const char *refname, - const char *referent UNUSED, - const struct object_id *oid UNUSED, - int flags UNUSED, - void *cb_data) +static int do_for_each_reflog_helper(const struct reference *ref, void *cb_data) { struct do_for_each_reflog_help *hp = cb_data; - return hp->fn(refname, hp->cb_data); + return hp->fn(ref->name, hp->cb_data); } int refs_for_each_reflog(struct ref_store *refs, each_reflog_fn fn, void *cb_data) @@ -2976,25 +2989,24 @@ struct migration_data { uint64_t index; }; -static int migrate_one_ref(const char *refname, const char *referent UNUSED, const struct object_id *oid, - int flags, void *cb_data) +static int migrate_one_ref(const struct reference *ref, void *cb_data) { struct migration_data *data = cb_data; struct strbuf symref_target = STRBUF_INIT; int ret; - if (flags & REF_ISSYMREF) { - ret = refs_read_symbolic_ref(data->old_refs, refname, &symref_target); + if (ref->flags & REF_ISSYMREF) { + ret = refs_read_symbolic_ref(data->old_refs, ref->name, &symref_target); if (ret < 0) goto done; - ret = ref_transaction_update(data->transaction, refname, NULL, null_oid(the_hash_algo), + ret = ref_transaction_update(data->transaction, ref->name, NULL, null_oid(the_hash_algo), symref_target.buf, NULL, REF_SKIP_CREATE_REFLOG | REF_NO_DEREF, NULL, data->errbuf); if (ret < 0) goto done; } else { - ret = ref_transaction_create(data->transaction, refname, oid, NULL, + ret = ref_transaction_create(data->transaction, ref->name, ref->oid, NULL, REF_SKIP_CREATE_REFLOG | REF_SKIP_OID_VERIFICATION, NULL, data->errbuf); if (ret < 0) @@ -333,36 +333,74 @@ struct ref_transaction; * stored in ref_iterator::flags. Other bits are for internal use * only: */ +enum reference_status { + /* Reference is a symbolic reference. */ + REF_ISSYMREF = (1 << 0), -/* Reference is a symbolic reference. */ -#define REF_ISSYMREF 0x01 + /* Reference is a packed reference. */ + REF_ISPACKED = (1 << 1), -/* Reference is a packed reference. */ -#define REF_ISPACKED 0x02 + /* + * Reference cannot be resolved to an object name: dangling symbolic + * reference (directly or indirectly), corrupt reference file, + * reference exists but name is bad, or symbolic reference refers to + * ill-formatted reference name. + */ + REF_ISBROKEN = (1 << 2), -/* - * Reference cannot be resolved to an object name: dangling symbolic - * reference (directly or indirectly), corrupt reference file, - * reference exists but name is bad, or symbolic reference refers to - * ill-formatted reference name. - */ -#define REF_ISBROKEN 0x04 + /* + * Reference name is not well formed. + * + * See git-check-ref-format(1) for the definition of well formed ref names. + */ + REF_BAD_NAME = (1 << 3), +}; + +/* A reference passed to `for_each_ref()`-style callbacks. */ +struct reference { + /* The fully-qualified name of the reference. */ + const char *name; + + /* The target of a symbolic ref. `NULL` for direct references. */ + const char *target; + + /* + * The object ID of a reference. Either the direct object ID or the + * resolved object ID in the case of a symbolic ref. May be the zero + * object ID in case the symbolic ref cannot be resolved. + */ + const struct object_id *oid; + + /* + * An optional peeled object ID. This field _may_ be set for tags in + * case the peeled value is present in the backend. Please refer to + * `reference_get_peeled_oid()`. + */ + const struct object_id *peeled_oid; + + /* A bitfield of `enum reference_status` flags. */ + unsigned flags; +}; /* - * Reference name is not well formed. + * Peel the tag to a non-tag commit. If present, this uses the peeled object ID + * exposed by the reference backend. Otherwise, the object is peeled via the + * object database, which is less efficient. * - * See git-check-ref-format(1) for the definition of well formed ref names. + * Return `0` if the reference could be peeled, a negative error code + * otherwise. */ -#define REF_BAD_NAME 0x08 +int reference_get_peeled_oid(struct repository *repo, + const struct reference *ref, + struct object_id *peeled_oid); /* * The signature for the callback function for the for_each_*() - * functions below. The memory pointed to by the refname and oid - * arguments is only guaranteed to be valid for the duration of a + * functions below. The memory pointed to by the `struct reference` + * argument is only guaranteed to be valid for the duration of a * single callback invocation. */ -typedef int each_ref_fn(const char *refname, const char *referent, - const struct object_id *oid, int flags, void *cb_data); +typedef int each_ref_fn(const struct reference *ref, void *cb_data); /* * The following functions invoke the specified callback function for @@ -461,32 +499,33 @@ void refs_warn_dangling_symrefs(struct ref_store *refs, FILE *fp, const struct string_list *refnames); /* - * Flags for controlling behaviour of pack_refs() - * PACK_REFS_PRUNE: Prune loose refs after packing - * PACK_REFS_AUTO: Pack refs on a best effort basis. The heuristics and end - * result are decided by the ref backend. Backends may ignore - * this flag and fall back to a normal repack. + * Flags for controlling behaviour of refs_optimize() + * REFS_OPTIMIZE_PRUNE: Prune loose refs after packing + * REFS_OPTIMIZE_AUTO: Pack refs on a best effort basis. The heuristics and end + * result are decided by the ref backend. Backends may ignore + * this flag and fall back to a normal repack. */ -#define PACK_REFS_PRUNE (1 << 0) -#define PACK_REFS_AUTO (1 << 1) +#define REFS_OPTIMIZE_PRUNE (1 << 0) +#define REFS_OPTIMIZE_AUTO (1 << 1) -struct pack_refs_opts { +struct refs_optimize_opts { unsigned int flags; struct ref_exclusions *exclusions; struct string_list *includes; }; /* - * Write a packed-refs file for the current repository. - * flags: Combination of the above PACK_REFS_* flags. + * Optimize the ref store. The exact behavior is up to the backend. + * For the files backend, this is equivalent to packing refs. */ -int refs_pack_refs(struct ref_store *refs, struct pack_refs_opts *opts); +int refs_optimize(struct ref_store *refs, struct refs_optimize_opts *opts); /* - * Optimize the ref store. The exact behavior is up to the backend. - * For the files backend, this is equivalent to packing refs. + * Check if refs backend can be optimized by calling 'refs_optimize'. */ -int refs_optimize(struct ref_store *refs, struct pack_refs_opts *opts); +int refs_optimize_required(struct ref_store *ref_store, + struct refs_optimize_opts *opts, + bool *required); /* * Setup reflog before using. Fill in err and return -1 on failure. @@ -1251,10 +1290,6 @@ int repo_migrate_ref_storage_format(struct repository *repo, * to the next entry, ref_iterator_advance() aborts the iteration, * frees the ref_iterator, and returns ITER_ERROR. * - * The reference currently being looked at can be peeled by calling - * ref_iterator_peel(). This function is often faster than peel_ref(), - * so it should be preferred when iterating over references. - * * Putting it all together, a typical iteration looks like this: * * int ok; @@ -1269,9 +1304,6 @@ int repo_migrate_ref_storage_format(struct repository *repo, * // Access information about the current reference: * if (!(iter->flags & REF_ISSYMREF)) * printf("%s is %s\n", iter->refname, oid_to_hex(iter->oid)); - * - * // If you need to peel the reference: - * ref_iterator_peel(iter, &oid); * } * * if (ok != ITER_DONE) @@ -1362,13 +1394,6 @@ enum ref_iterator_seek_flag { int ref_iterator_seek(struct ref_iterator *ref_iterator, const char *refname, unsigned int flags); -/* - * If possible, peel the reference currently being viewed by the - * iterator. Return 0 on success. - */ -int ref_iterator_peel(struct ref_iterator *ref_iterator, - struct object_id *peeled); - /* Free the reference iterator and any associated resources. */ void ref_iterator_free(struct ref_iterator *ref_iterator); diff --git a/refs/debug.c b/refs/debug.c index 697adbd0dc..3e31228c9a 100644 --- a/refs/debug.c +++ b/refs/debug.c @@ -47,6 +47,14 @@ static int debug_create_on_disk(struct ref_store *refs, int flags, struct strbuf return res; } +static int debug_remove_on_disk(struct ref_store *refs, struct strbuf *err) +{ + struct debug_ref_store *drefs = (struct debug_ref_store *)refs; + int res = drefs->refs->be->remove_on_disk(drefs->refs, err); + trace_printf_key(&trace_refs, "remove_on_disk: %d\n", res); + return res; +} + static int debug_transaction_prepare(struct ref_store *refs, struct ref_transaction *transaction, struct strbuf *err) @@ -116,11 +124,22 @@ static int debug_transaction_abort(struct ref_store *refs, return res; } -static int debug_pack_refs(struct ref_store *ref_store, struct pack_refs_opts *opts) +static int debug_optimize(struct ref_store *ref_store, struct refs_optimize_opts *opts) { struct debug_ref_store *drefs = (struct debug_ref_store *)ref_store; - int res = drefs->refs->be->pack_refs(drefs->refs, opts); - trace_printf_key(&trace_refs, "pack_refs: %d\n", res); + int res = drefs->refs->be->optimize(drefs->refs, opts); + trace_printf_key(&trace_refs, "optimize: %d\n", res); + return res; +} + +static int debug_optimize_required(struct ref_store *ref_store, + struct refs_optimize_opts *opts, + bool *required) +{ + struct debug_ref_store *drefs = (struct debug_ref_store *)ref_store; + int res = drefs->refs->be->optimize_required(drefs->refs, opts, required); + trace_printf_key(&trace_refs, "optimize_required: %s, res: %d\n", + required ? "yes" : "no", res); return res; } @@ -160,11 +179,9 @@ static int debug_ref_iterator_advance(struct ref_iterator *ref_iterator) trace_printf_key(&trace_refs, "iterator_advance: (%d)\n", res); else trace_printf_key(&trace_refs, "iterator_advance: %s (0)\n", - diter->iter->refname); + diter->iter->ref.name); - diter->base.refname = diter->iter->refname; - diter->base.oid = diter->iter->oid; - diter->base.flags = diter->iter->flags; + diter->base.ref = diter->iter->ref; return res; } @@ -179,16 +196,6 @@ static int debug_ref_iterator_seek(struct ref_iterator *ref_iterator, return res; } -static int debug_ref_iterator_peel(struct ref_iterator *ref_iterator, - struct object_id *peeled) -{ - struct debug_ref_iterator *diter = - (struct debug_ref_iterator *)ref_iterator; - int res = diter->iter->vtable->peel(diter->iter, peeled); - trace_printf_key(&trace_refs, "iterator_peel: %s: %d\n", diter->iter->refname, res); - return res; -} - static void debug_ref_iterator_release(struct ref_iterator *ref_iterator) { struct debug_ref_iterator *diter = @@ -200,7 +207,6 @@ static void debug_ref_iterator_release(struct ref_iterator *ref_iterator) static struct ref_iterator_vtable debug_ref_iterator_vtable = { .advance = debug_ref_iterator_advance, .seek = debug_ref_iterator_seek, - .peel = debug_ref_iterator_peel, .release = debug_ref_iterator_release, }; @@ -432,6 +438,7 @@ struct ref_storage_be refs_be_debug = { .init = NULL, .release = debug_release, .create_on_disk = debug_create_on_disk, + .remove_on_disk = debug_remove_on_disk, /* * None of these should be NULL. If the "files" backend (in @@ -443,7 +450,9 @@ struct ref_storage_be refs_be_debug = { .transaction_finish = debug_transaction_finish, .transaction_abort = debug_transaction_abort, - .pack_refs = debug_pack_refs, + .optimize = debug_optimize, + .optimize_required = debug_optimize_required, + .rename_ref = debug_rename_ref, .copy_ref = debug_copy_ref, diff --git a/refs/files-backend.c b/refs/files-backend.c index 054cf42f4e..6f6f76a8d8 100644 --- a/refs/files-backend.c +++ b/refs/files-backend.c @@ -961,26 +961,23 @@ static int files_ref_iterator_advance(struct ref_iterator *ref_iterator) while ((ok = ref_iterator_advance(iter->iter0)) == ITER_OK) { if (iter->flags & DO_FOR_EACH_PER_WORKTREE_ONLY && - parse_worktree_ref(iter->iter0->refname, NULL, NULL, + parse_worktree_ref(iter->iter0->ref.name, NULL, NULL, NULL) != REF_WORKTREE_CURRENT) continue; if ((iter->flags & DO_FOR_EACH_OMIT_DANGLING_SYMREFS) && - (iter->iter0->flags & REF_ISSYMREF) && - (iter->iter0->flags & REF_ISBROKEN)) + (iter->iter0->ref.flags & REF_ISSYMREF) && + (iter->iter0->ref.flags & REF_ISBROKEN)) continue; if (!(iter->flags & DO_FOR_EACH_INCLUDE_BROKEN) && - !ref_resolves_to_object(iter->iter0->refname, + !ref_resolves_to_object(iter->iter0->ref.name, iter->repo, - iter->iter0->oid, - iter->iter0->flags)) + iter->iter0->ref.oid, + iter->iter0->ref.flags)) continue; - iter->base.refname = iter->iter0->refname; - iter->base.oid = iter->iter0->oid; - iter->base.flags = iter->iter0->flags; - iter->base.referent = iter->iter0->referent; + iter->base.ref = iter->iter0->ref; return ITER_OK; } @@ -996,15 +993,6 @@ static int files_ref_iterator_seek(struct ref_iterator *ref_iterator, return ref_iterator_seek(iter->iter0, refname, flags); } -static int files_ref_iterator_peel(struct ref_iterator *ref_iterator, - struct object_id *peeled) -{ - struct files_ref_iterator *iter = - (struct files_ref_iterator *)ref_iterator; - - return ref_iterator_peel(iter->iter0, peeled); -} - static void files_ref_iterator_release(struct ref_iterator *ref_iterator) { struct files_ref_iterator *iter = @@ -1015,7 +1003,6 @@ static void files_ref_iterator_release(struct ref_iterator *ref_iterator) static struct ref_iterator_vtable files_ref_iterator_vtable = { .advance = files_ref_iterator_advance, .seek = files_ref_iterator_seek, - .peel = files_ref_iterator_peel, .release = files_ref_iterator_release, }; @@ -1367,37 +1354,36 @@ static void prune_refs(struct files_ref_store *refs, struct ref_to_prune **refs_ * Return true if the specified reference should be packed. */ static int should_pack_ref(struct files_ref_store *refs, - const char *refname, - const struct object_id *oid, unsigned int ref_flags, - struct pack_refs_opts *opts) + const struct reference *ref, + struct refs_optimize_opts *opts) { struct string_list_item *item; /* Do not pack per-worktree refs: */ - if (parse_worktree_ref(refname, NULL, NULL, NULL) != + if (parse_worktree_ref(ref->name, NULL, NULL, NULL) != REF_WORKTREE_SHARED) return 0; /* Do not pack symbolic refs: */ - if (ref_flags & REF_ISSYMREF) + if (ref->flags & REF_ISSYMREF) return 0; /* Do not pack broken refs: */ - if (!ref_resolves_to_object(refname, refs->base.repo, oid, ref_flags)) + if (!ref_resolves_to_object(ref->name, refs->base.repo, ref->oid, ref->flags)) return 0; - if (ref_excluded(opts->exclusions, refname)) + if (ref_excluded(opts->exclusions, ref->name)) return 0; for_each_string_list_item(item, opts->includes) - if (!wildmatch(item->string, refname, 0)) + if (!wildmatch(item->string, ref->name, 0)) return 1; return 0; } static int should_pack_refs(struct files_ref_store *refs, - struct pack_refs_opts *opts) + struct refs_optimize_opts *opts) { struct ref_iterator *iter; size_t packed_size; @@ -1405,7 +1391,7 @@ static int should_pack_refs(struct files_ref_store *refs, size_t limit; int ret; - if (!(opts->flags & PACK_REFS_AUTO)) + if (!(opts->flags & REFS_OPTIMIZE_AUTO)) return 1; ret = packed_refs_size(refs->packed_ref_store, &packed_size); @@ -1443,8 +1429,7 @@ static int should_pack_refs(struct files_ref_store *refs, iter = cache_ref_iterator_begin(get_loose_ref_cache(refs, 0), NULL, refs->base.repo, 0); while ((ret = ref_iterator_advance(iter)) == ITER_OK) { - if (should_pack_ref(refs, iter->refname, iter->oid, - iter->flags, opts)) + if (should_pack_ref(refs, &iter->ref, opts)) refcount++; if (refcount >= limit) { ref_iterator_free(iter); @@ -1459,8 +1444,8 @@ static int should_pack_refs(struct files_ref_store *refs, return 0; } -static int files_pack_refs(struct ref_store *ref_store, - struct pack_refs_opts *opts) +static int files_optimize(struct ref_store *ref_store, + struct refs_optimize_opts *opts) { struct files_ref_store *refs = files_downcast(ref_store, REF_STORE_WRITE | REF_STORE_ODB, @@ -1489,24 +1474,24 @@ static int files_pack_refs(struct ref_store *ref_store, * in the packed ref cache. If the reference should be * pruned, also add it to refs_to_prune. */ - if (!should_pack_ref(refs, iter->refname, iter->oid, iter->flags, opts)) + if (!should_pack_ref(refs, &iter->ref, opts)) continue; /* * Add a reference creation for this reference to the * packed-refs transaction: */ - if (ref_transaction_update(transaction, iter->refname, - iter->oid, NULL, NULL, NULL, + if (ref_transaction_update(transaction, iter->ref.name, + iter->ref.oid, NULL, NULL, NULL, REF_NO_DEREF, NULL, &err)) die("failure preparing to create packed reference %s: %s", - iter->refname, err.buf); + iter->ref.name, err.buf); /* Schedule the loose reference for pruning if requested. */ - if ((opts->flags & PACK_REFS_PRUNE)) { + if ((opts->flags & REFS_OPTIMIZE_PRUNE)) { struct ref_to_prune *n; - FLEX_ALLOC_STR(n, name, iter->refname); - oidcpy(&n->oid, iter->oid); + FLEX_ALLOC_STR(n, name, iter->ref.name); + oidcpy(&n->oid, iter->ref.oid); n->next = refs_to_prune; refs_to_prune = n; } @@ -1527,13 +1512,14 @@ static int files_pack_refs(struct ref_store *ref_store, return 0; } -static int files_optimize(struct ref_store *ref_store, struct pack_refs_opts *opts) +static int files_optimize_required(struct ref_store *ref_store, + struct refs_optimize_opts *opts, + bool *required) { - /* - * For the "files" backend, "optimizing" is the same as "packing". - * So, we just call the existing worker function for packing. - */ - return files_pack_refs(ref_store, opts); + struct files_ref_store *refs = files_downcast(ref_store, REF_STORE_READ, + "optimize_required"); + *required = should_pack_refs(refs, opts); + return 0; } /* @@ -2394,7 +2380,7 @@ static int files_reflog_iterator_advance(struct ref_iterator *ref_iterator) REFNAME_ALLOW_ONELEVEL)) continue; - iter->base.refname = diter->relative_path; + iter->base.ref.name = diter->relative_path; return ITER_OK; } @@ -2408,12 +2394,6 @@ static int files_reflog_iterator_seek(struct ref_iterator *ref_iterator UNUSED, BUG("ref_iterator_seek() called for reflog_iterator"); } -static int files_reflog_iterator_peel(struct ref_iterator *ref_iterator UNUSED, - struct object_id *peeled UNUSED) -{ - BUG("ref_iterator_peel() called for reflog_iterator"); -} - static void files_reflog_iterator_release(struct ref_iterator *ref_iterator) { struct files_reflog_iterator *iter = @@ -2424,7 +2404,6 @@ static void files_reflog_iterator_release(struct ref_iterator *ref_iterator) static struct ref_iterator_vtable files_reflog_iterator_vtable = { .advance = files_reflog_iterator_advance, .seek = files_reflog_iterator_seek, - .peel = files_reflog_iterator_peel, .release = files_reflog_iterator_release, }; @@ -3124,7 +3103,7 @@ static int parse_and_write_reflog(struct files_ref_store *refs, if (!(update->flags & REF_HAVE_OLD) || !(update->flags & REF_HAVE_NEW) || !(update->flags & REF_LOG_ONLY)) { - strbuf_addf(err, _("trying to write reflog for '%s'" + strbuf_addf(err, _("trying to write reflog for '%s' " "with incomplete values"), update->refname); return REF_TRANSACTION_ERROR_GENERIC; } @@ -3165,14 +3144,11 @@ static int parse_and_write_reflog(struct files_ref_store *refs, return 0; } -static int ref_present(const char *refname, const char *referent UNUSED, - const struct object_id *oid UNUSED, - int flags UNUSED, - void *cb_data) +static int ref_present(const struct reference *ref, void *cb_data) { struct string_list *affected_refnames = cb_data; - return string_list_has_string(affected_refnames, refname); + return string_list_has_string(affected_refnames, ref->name); } static int files_transaction_finish_initial(struct files_ref_store *refs, @@ -4015,8 +3991,8 @@ struct ref_storage_be refs_be_files = { .transaction_finish = files_transaction_finish, .transaction_abort = files_transaction_abort, - .pack_refs = files_pack_refs, .optimize = files_optimize, + .optimize_required = files_optimize_required, .rename_ref = files_rename_ref, .copy_ref = files_copy_ref, diff --git a/refs/iterator.c b/refs/iterator.c index 17ef841d8a..d79aa5ec82 100644 --- a/refs/iterator.c +++ b/refs/iterator.c @@ -21,12 +21,6 @@ int ref_iterator_seek(struct ref_iterator *ref_iterator, const char *refname, return ref_iterator->vtable->seek(ref_iterator, refname, flags); } -int ref_iterator_peel(struct ref_iterator *ref_iterator, - struct object_id *peeled) -{ - return ref_iterator->vtable->peel(ref_iterator, peeled); -} - void ref_iterator_free(struct ref_iterator *ref_iterator) { if (ref_iterator) { @@ -41,10 +35,7 @@ void base_ref_iterator_init(struct ref_iterator *iter, struct ref_iterator_vtable *vtable) { iter->vtable = vtable; - iter->refname = NULL; - iter->referent = NULL; - iter->oid = NULL; - iter->flags = 0; + memset(&iter->ref, 0, sizeof(iter->ref)); } struct empty_ref_iterator { @@ -63,12 +54,6 @@ static int empty_ref_iterator_seek(struct ref_iterator *ref_iterator UNUSED, return 0; } -static int empty_ref_iterator_peel(struct ref_iterator *ref_iterator UNUSED, - struct object_id *peeled UNUSED) -{ - BUG("peel called for empty iterator"); -} - static void empty_ref_iterator_release(struct ref_iterator *ref_iterator UNUSED) { } @@ -76,7 +61,6 @@ static void empty_ref_iterator_release(struct ref_iterator *ref_iterator UNUSED) static struct ref_iterator_vtable empty_ref_iterator_vtable = { .advance = empty_ref_iterator_advance, .seek = empty_ref_iterator_seek, - .peel = empty_ref_iterator_peel, .release = empty_ref_iterator_release, }; @@ -127,8 +111,8 @@ enum iterator_selection ref_iterator_select(struct ref_iterator *iter_worktree, * latter. */ if (iter_worktree) { - int cmp = strcmp(iter_worktree->refname, - iter_common->refname); + int cmp = strcmp(iter_worktree->ref.name, + iter_common->ref.name); if (cmp < 0) return ITER_SELECT_0; else if (!cmp) @@ -139,7 +123,7 @@ enum iterator_selection ref_iterator_select(struct ref_iterator *iter_worktree, * We now know that the lexicographically-next ref is a common * ref. When the common ref is a shared one we return it. */ - if (parse_worktree_ref(iter_common->refname, NULL, NULL, + if (parse_worktree_ref(iter_common->ref.name, NULL, NULL, NULL) == REF_WORKTREE_SHARED) return ITER_SELECT_1; @@ -212,10 +196,7 @@ static int merge_ref_iterator_advance(struct ref_iterator *ref_iterator) } if (selection & ITER_YIELD_CURRENT) { - iter->base.referent = (*iter->current)->referent; - iter->base.refname = (*iter->current)->refname; - iter->base.oid = (*iter->current)->oid; - iter->base.flags = (*iter->current)->flags; + iter->base.ref = (*iter->current)->ref; return ITER_OK; } } @@ -246,18 +227,6 @@ static int merge_ref_iterator_seek(struct ref_iterator *ref_iterator, return 0; } -static int merge_ref_iterator_peel(struct ref_iterator *ref_iterator, - struct object_id *peeled) -{ - struct merge_ref_iterator *iter = - (struct merge_ref_iterator *)ref_iterator; - - if (!iter->current) { - BUG("peel called before advance for merge iterator"); - } - return ref_iterator_peel(*iter->current, peeled); -} - static void merge_ref_iterator_release(struct ref_iterator *ref_iterator) { struct merge_ref_iterator *iter = @@ -269,7 +238,6 @@ static void merge_ref_iterator_release(struct ref_iterator *ref_iterator) static struct ref_iterator_vtable merge_ref_iterator_vtable = { .advance = merge_ref_iterator_advance, .seek = merge_ref_iterator_seek, - .peel = merge_ref_iterator_peel, .release = merge_ref_iterator_release, }; @@ -313,7 +281,7 @@ static enum iterator_selection overlay_iterator_select( else if (!front) return ITER_SELECT_1; - cmp = strcmp(front->refname, back->refname); + cmp = strcmp(front->ref.name, back->ref.name); if (cmp < 0) return ITER_SELECT_0; @@ -371,7 +339,7 @@ static int prefix_ref_iterator_advance(struct ref_iterator *ref_iterator) int ok; while ((ok = ref_iterator_advance(iter->iter0)) == ITER_OK) { - int cmp = compare_prefix(iter->iter0->refname, iter->prefix); + int cmp = compare_prefix(iter->iter0->ref.name, iter->prefix); if (cmp < 0) continue; /* @@ -382,6 +350,8 @@ static int prefix_ref_iterator_advance(struct ref_iterator *ref_iterator) if (cmp > 0) return ITER_DONE; + iter->base.ref = iter->iter0->ref; + if (iter->trim) { /* * It is nonsense to trim off characters that @@ -392,15 +362,11 @@ static int prefix_ref_iterator_advance(struct ref_iterator *ref_iterator) * one character left in the refname after * trimming, report it as a bug: */ - if (strlen(iter->iter0->refname) <= iter->trim) + if (strlen(iter->base.ref.name) <= iter->trim) BUG("attempt to trim too many characters"); - iter->base.refname = iter->iter0->refname + iter->trim; - } else { - iter->base.refname = iter->iter0->refname; + iter->base.ref.name += iter->trim; } - iter->base.oid = iter->iter0->oid; - iter->base.flags = iter->iter0->flags; return ITER_OK; } @@ -420,15 +386,6 @@ static int prefix_ref_iterator_seek(struct ref_iterator *ref_iterator, return ref_iterator_seek(iter->iter0, refname, flags); } -static int prefix_ref_iterator_peel(struct ref_iterator *ref_iterator, - struct object_id *peeled) -{ - struct prefix_ref_iterator *iter = - (struct prefix_ref_iterator *)ref_iterator; - - return ref_iterator_peel(iter->iter0, peeled); -} - static void prefix_ref_iterator_release(struct ref_iterator *ref_iterator) { struct prefix_ref_iterator *iter = @@ -440,7 +397,6 @@ static void prefix_ref_iterator_release(struct ref_iterator *ref_iterator) static struct ref_iterator_vtable prefix_ref_iterator_vtable = { .advance = prefix_ref_iterator_advance, .seek = prefix_ref_iterator_seek, - .peel = prefix_ref_iterator_peel, .release = prefix_ref_iterator_release, }; @@ -466,23 +422,18 @@ struct ref_iterator *prefix_ref_iterator_begin(struct ref_iterator *iter0, return ref_iterator; } -struct ref_iterator *current_ref_iter = NULL; - int do_for_each_ref_iterator(struct ref_iterator *iter, each_ref_fn fn, void *cb_data) { int retval = 0, ok; - struct ref_iterator *old_ref_iter = current_ref_iter; - current_ref_iter = iter; while ((ok = ref_iterator_advance(iter)) == ITER_OK) { - retval = fn(iter->refname, iter->referent, iter->oid, iter->flags, cb_data); + retval = fn(&iter->ref, cb_data); if (retval) goto out; } out: - current_ref_iter = old_ref_iter; if (ok == ITER_ERROR) retval = -1; ref_iterator_free(iter); diff --git a/refs/packed-backend.c b/refs/packed-backend.c index a8c22a0a7f..4ea0c12299 100644 --- a/refs/packed-backend.c +++ b/refs/packed-backend.c @@ -882,6 +882,7 @@ static int next_record(struct packed_ref_iterator *iter) { const char *p, *eol; + memset(&iter->base.ref, 0, sizeof(iter->base.ref)); strbuf_reset(&iter->refname_buf); /* @@ -908,7 +909,7 @@ static int next_record(struct packed_ref_iterator *iter) if (iter->pos == iter->eof) return ITER_DONE; - iter->base.flags = REF_ISPACKED; + iter->base.ref.flags = REF_ISPACKED; p = iter->pos; if (iter->eof - p < snapshot_hexsz(iter->snapshot) + 2 || @@ -916,6 +917,7 @@ static int next_record(struct packed_ref_iterator *iter) !isspace(*p++)) die_invalid_line(iter->snapshot->refs->path, iter->pos, iter->eof - iter->pos); + iter->base.ref.oid = &iter->oid; eol = memchr(p, '\n', iter->eof - p); if (!eol) @@ -923,22 +925,22 @@ static int next_record(struct packed_ref_iterator *iter) iter->pos, iter->eof - iter->pos); strbuf_add(&iter->refname_buf, p, eol - p); - iter->base.refname = iter->refname_buf.buf; + iter->base.ref.name = iter->refname_buf.buf; if (refname_contains_nul(&iter->refname_buf)) - die("packed refname contains embedded NULL: %s", iter->base.refname); + die("packed refname contains embedded NULL: %s", iter->base.ref.name); - if (check_refname_format(iter->base.refname, REFNAME_ALLOW_ONELEVEL)) { - if (!refname_is_safe(iter->base.refname)) + if (check_refname_format(iter->base.ref.name, REFNAME_ALLOW_ONELEVEL)) { + if (!refname_is_safe(iter->base.ref.name)) die("packed refname is dangerous: %s", - iter->base.refname); + iter->base.ref.name); oidclr(&iter->oid, iter->repo->hash_algo); - iter->base.flags |= REF_BAD_NAME | REF_ISBROKEN; + iter->base.ref.flags |= REF_BAD_NAME | REF_ISBROKEN; } if (iter->snapshot->peeled == PEELED_FULLY || (iter->snapshot->peeled == PEELED_TAGS && - starts_with(iter->base.refname, "refs/tags/"))) - iter->base.flags |= REF_KNOWS_PEELED; + starts_with(iter->base.ref.name, "refs/tags/"))) + iter->base.ref.flags |= REF_KNOWS_PEELED; iter->pos = eol + 1; @@ -956,11 +958,12 @@ static int next_record(struct packed_ref_iterator *iter) * definitely know the value of *this* reference. But * we suppress it if the reference is broken: */ - if ((iter->base.flags & REF_ISBROKEN)) { + if ((iter->base.ref.flags & REF_ISBROKEN)) { oidclr(&iter->peeled, iter->repo->hash_algo); - iter->base.flags &= ~REF_KNOWS_PEELED; + iter->base.ref.flags &= ~REF_KNOWS_PEELED; } else { - iter->base.flags |= REF_KNOWS_PEELED; + iter->base.ref.flags |= REF_KNOWS_PEELED; + iter->base.ref.peeled_oid = &iter->peeled; } } else { oidclr(&iter->peeled, iter->repo->hash_algo); @@ -976,15 +979,15 @@ static int packed_ref_iterator_advance(struct ref_iterator *ref_iterator) int ok; while ((ok = next_record(iter)) == ITER_OK) { - const char *refname = iter->base.refname; + const char *refname = iter->base.ref.name; const char *prefix = iter->prefix; if (iter->flags & DO_FOR_EACH_PER_WORKTREE_ONLY && - !is_per_worktree_ref(iter->base.refname)) + !is_per_worktree_ref(iter->base.ref.name)) continue; if (!(iter->flags & DO_FOR_EACH_INCLUDE_BROKEN) && - !ref_resolves_to_object(iter->base.refname, iter->repo, + !ref_resolves_to_object(iter->base.ref.name, iter->repo, &iter->oid, iter->flags)) continue; @@ -1027,22 +1030,6 @@ static int packed_ref_iterator_seek(struct ref_iterator *ref_iterator, return 0; } -static int packed_ref_iterator_peel(struct ref_iterator *ref_iterator, - struct object_id *peeled) -{ - struct packed_ref_iterator *iter = - (struct packed_ref_iterator *)ref_iterator; - - if ((iter->base.flags & REF_KNOWS_PEELED)) { - oidcpy(peeled, &iter->peeled); - return is_null_oid(&iter->peeled) ? -1 : 0; - } else if ((iter->base.flags & (REF_ISBROKEN | REF_ISSYMREF))) { - return -1; - } else { - return peel_object(iter->repo, &iter->oid, peeled) ? -1 : 0; - } -} - static void packed_ref_iterator_release(struct ref_iterator *ref_iterator) { struct packed_ref_iterator *iter = @@ -1056,7 +1043,6 @@ static void packed_ref_iterator_release(struct ref_iterator *ref_iterator) static struct ref_iterator_vtable packed_ref_iterator_vtable = { .advance = packed_ref_iterator_advance, .seek = packed_ref_iterator_seek, - .peel = packed_ref_iterator_peel, .release = packed_ref_iterator_release, }; @@ -1194,7 +1180,6 @@ static struct ref_iterator *packed_ref_iterator_begin( iter->snapshot = snapshot; acquire_snapshot(snapshot); strbuf_init(&iter->refname_buf, 0); - iter->base.oid = &iter->oid; iter->repo = ref_store->repo; iter->flags = flags; @@ -1436,7 +1421,7 @@ static enum ref_transaction_error write_with_updates(struct packed_ref_store *re if (!iter) cmp = +1; else - cmp = strcmp(iter->refname, update->refname); + cmp = strcmp(iter->ref.name, update->refname); } if (!cmp) { @@ -1459,11 +1444,11 @@ static enum ref_transaction_error write_with_updates(struct packed_ref_store *re } goto error; - } else if (!oideq(&update->old_oid, iter->oid)) { + } else if (!oideq(&update->old_oid, iter->ref.oid)) { strbuf_addf(err, "cannot update ref '%s': " "is at %s but expected %s", update->refname, - oid_to_hex(iter->oid), + oid_to_hex(iter->ref.oid), oid_to_hex(&update->old_oid)); ret = REF_TRANSACTION_ERROR_INCORRECT_OLD_VALUE; @@ -1523,13 +1508,8 @@ static enum ref_transaction_error write_with_updates(struct packed_ref_store *re if (cmp < 0) { /* Pass the old reference through. */ - - struct object_id peeled; - int peel_error = ref_iterator_peel(iter, &peeled); - - if (write_packed_entry(out, iter->refname, - iter->oid, - peel_error ? NULL : &peeled)) + if (write_packed_entry(out, iter->ref.name, + iter->ref.oid, iter->ref.peeled_oid)) goto write_error; if ((ok = ref_iterator_advance(iter)) != ITER_OK) { @@ -1547,9 +1527,8 @@ static enum ref_transaction_error write_with_updates(struct packed_ref_store *re i++; } else { struct object_id peeled; - int peel_error = peel_object(refs->base.repo, - &update->new_oid, - &peeled); + int peel_error = peel_object(refs->base.repo, &update->new_oid, + &peeled, PEEL_OBJECT_VERIFY_TAGGED_OBJECT_TYPE); if (write_packed_entry(out, update->refname, &update->new_oid, @@ -1794,8 +1773,8 @@ cleanup: return ret; } -static int packed_pack_refs(struct ref_store *ref_store UNUSED, - struct pack_refs_opts *pack_opts UNUSED) +static int packed_optimize(struct ref_store *ref_store UNUSED, + struct refs_optimize_opts *opts UNUSED) { /* * Packed refs are already packed. It might be that loose refs @@ -1805,6 +1784,17 @@ static int packed_pack_refs(struct ref_store *ref_store UNUSED, return 0; } +static int packed_optimize_required(struct ref_store *ref_store UNUSED, + struct refs_optimize_opts *opts UNUSED, + bool *required) +{ + /* + * Packed refs are already optimized. + */ + *required = false; + return 0; +} + static struct ref_iterator *packed_reflog_iterator_begin(struct ref_store *ref_store UNUSED) { return empty_ref_iterator_begin(); @@ -2150,7 +2140,9 @@ struct ref_storage_be refs_be_packed = { .transaction_finish = packed_transaction_finish, .transaction_abort = packed_transaction_abort, - .pack_refs = packed_pack_refs, + .optimize = packed_optimize, + .optimize_required = packed_optimize_required, + .rename_ref = NULL, .copy_ref = NULL, diff --git a/refs/ref-cache.c b/refs/ref-cache.c index e5e5df16d8..ffef01a597 100644 --- a/refs/ref-cache.c +++ b/refs/ref-cache.c @@ -425,10 +425,11 @@ static int cache_ref_iterator_advance(struct ref_iterator *ref_iterator) level->prefix_state = entry_prefix_state; level->index = -1; } else { - iter->base.refname = entry->name; - iter->base.referent = entry->u.value.referent; - iter->base.oid = &entry->u.value.oid; - iter->base.flags = entry->flag; + memset(&iter->base.ref, 0, sizeof(iter->base.ref)); + iter->base.ref.name = entry->name; + iter->base.ref.target = entry->u.value.referent; + iter->base.ref.oid = &entry->u.value.oid; + iter->base.ref.flags = entry->flag; return ITER_OK; } } @@ -545,14 +546,6 @@ static int cache_ref_iterator_seek(struct ref_iterator *ref_iterator, return 0; } -static int cache_ref_iterator_peel(struct ref_iterator *ref_iterator, - struct object_id *peeled) -{ - struct cache_ref_iterator *iter = - (struct cache_ref_iterator *)ref_iterator; - return peel_object(iter->repo, ref_iterator->oid, peeled) ? -1 : 0; -} - static void cache_ref_iterator_release(struct ref_iterator *ref_iterator) { struct cache_ref_iterator *iter = @@ -564,7 +557,6 @@ static void cache_ref_iterator_release(struct ref_iterator *ref_iterator) static struct ref_iterator_vtable cache_ref_iterator_vtable = { .advance = cache_ref_iterator_advance, .seek = cache_ref_iterator_seek, - .peel = cache_ref_iterator_peel, .release = cache_ref_iterator_release, }; diff --git a/refs/refs-internal.h b/refs/refs-internal.h index 4ef3bd75c6..c7d2a6e50b 100644 --- a/refs/refs-internal.h +++ b/refs/refs-internal.h @@ -249,10 +249,7 @@ const char *find_descendant_ref(const char *dirname, */ struct ref_iterator { struct ref_iterator_vtable *vtable; - const char *refname; - const char *referent; - const struct object_id *oid; - unsigned int flags; + struct reference ref; }; /* @@ -361,12 +358,6 @@ typedef int ref_iterator_seek_fn(struct ref_iterator *ref_iterator, const char *refname, unsigned int flags); /* - * Peels the current ref, returning 0 for success or -1 for failure. - */ -typedef int ref_iterator_peel_fn(struct ref_iterator *ref_iterator, - struct object_id *peeled); - -/* * Implementations of this function should free any resources specific * to the derived class. */ @@ -375,23 +366,9 @@ typedef void ref_iterator_release_fn(struct ref_iterator *ref_iterator); struct ref_iterator_vtable { ref_iterator_advance_fn *advance; ref_iterator_seek_fn *seek; - ref_iterator_peel_fn *peel; ref_iterator_release_fn *release; }; -/* - * current_ref_iter is a performance hack: when iterating over - * references using the for_each_ref*() functions, current_ref_iter is - * set to the reference iterator before calling the callback function. - * If the callback function calls peel_ref(), then peel_ref() first - * checks whether the reference to be peeled is the one referred to by - * the iterator (it usually is) and if so, asks the iterator for the - * peeled version of the reference if it is available. This avoids a - * refname lookup in a common case. current_ref_iter is set to NULL - * when the iteration is over. - */ -extern struct ref_iterator *current_ref_iter; - struct ref_store; /* refs backends */ @@ -445,10 +422,13 @@ typedef int ref_transaction_commit_fn(struct ref_store *refs, struct ref_transaction *transaction, struct strbuf *err); -typedef int pack_refs_fn(struct ref_store *ref_store, - struct pack_refs_opts *opts); typedef int optimize_fn(struct ref_store *ref_store, - struct pack_refs_opts *opts); + struct refs_optimize_opts *opts); + +typedef int optimize_required_fn(struct ref_store *ref_store, + struct refs_optimize_opts *opts, + bool *required); + typedef int rename_ref_fn(struct ref_store *ref_store, const char *oldref, const char *newref, const char *logmsg); @@ -573,8 +553,8 @@ struct ref_storage_be { ref_transaction_finish_fn *transaction_finish; ref_transaction_abort_fn *transaction_abort; - pack_refs_fn *pack_refs; optimize_fn *optimize; + optimize_required_fn *optimize_required; rename_ref_fn *rename_ref; copy_ref_fn *copy_ref; diff --git a/refs/reftable-backend.c b/refs/reftable-backend.c index d4b7928620..4319a4eacb 100644 --- a/refs/reftable-backend.c +++ b/refs/reftable-backend.c @@ -547,6 +547,7 @@ struct reftable_ref_iterator { struct reftable_iterator iter; struct reftable_ref_record ref; struct object_id oid; + struct object_id peeled_oid; char *prefix; size_t prefix_len; @@ -671,6 +672,8 @@ static int reftable_ref_iterator_advance(struct ref_iterator *ref_iterator) case REFTABLE_REF_VAL2: oidread(&iter->oid, iter->ref.value.val2.value, refs->base.repo->hash_algo); + oidread(&iter->peeled_oid, iter->ref.value.val2.target_value, + refs->base.repo->hash_algo); break; case REFTABLE_REF_SYMREF: referent = refs_resolve_ref_unsafe(&iter->refs->base, @@ -704,10 +707,13 @@ static int reftable_ref_iterator_advance(struct ref_iterator *ref_iterator) &iter->oid, flags)) continue; - iter->base.refname = iter->ref.refname; - iter->base.referent = referent; - iter->base.oid = &iter->oid; - iter->base.flags = flags; + memset(&iter->base.ref, 0, sizeof(iter->base.ref)); + iter->base.ref.name = iter->ref.refname; + iter->base.ref.target = referent; + iter->base.ref.oid = &iter->oid; + if (iter->ref.value_type == REFTABLE_REF_VAL2) + iter->base.ref.peeled_oid = &iter->peeled_oid; + iter->base.ref.flags = flags; break; } @@ -738,21 +744,6 @@ static int reftable_ref_iterator_seek(struct ref_iterator *ref_iterator, return iter->err; } -static int reftable_ref_iterator_peel(struct ref_iterator *ref_iterator, - struct object_id *peeled) -{ - struct reftable_ref_iterator *iter = - (struct reftable_ref_iterator *)ref_iterator; - - if (iter->ref.value_type == REFTABLE_REF_VAL2) { - oidread(peeled, iter->ref.value.val2.target_value, - iter->refs->base.repo->hash_algo); - return 0; - } - - return -1; -} - static void reftable_ref_iterator_release(struct ref_iterator *ref_iterator) { struct reftable_ref_iterator *iter = @@ -770,7 +761,6 @@ static void reftable_ref_iterator_release(struct ref_iterator *ref_iterator) static struct ref_iterator_vtable reftable_ref_iterator_vtable = { .advance = reftable_ref_iterator_advance, .seek = reftable_ref_iterator_seek, - .peel = reftable_ref_iterator_peel, .release = reftable_ref_iterator_release, }; @@ -828,7 +818,7 @@ static struct reftable_ref_iterator *ref_iterator_for_stack(struct reftable_ref_ iter = xcalloc(1, sizeof(*iter)); base_ref_iterator_init(&iter->base, &reftable_ref_iterator_vtable); - iter->base.oid = &iter->oid; + iter->base.ref.oid = &iter->oid; iter->flags = flags; iter->refs = refs; iter->exclude_patterns = filter_exclude_patterns(exclude_patterns); @@ -1103,7 +1093,7 @@ static enum ref_transaction_error prepare_single_update(struct reftable_ref_stor if (!(u->flags & REF_HAVE_OLD) || !(u->flags & REF_HAVE_NEW) || !(u->flags & REF_LOG_ONLY)) { - strbuf_addf(err, _("trying to write reflog for '%s'" + strbuf_addf(err, _("trying to write reflog for '%s' " "with incomplete values"), u->refname); return REF_TRANSACTION_ERROR_GENERIC; } @@ -1642,7 +1632,8 @@ static int write_transaction_table(struct reftable_writer *writer, void *cb_data ref.refname = (char *)u->refname; ref.update_index = ts; - peel_error = peel_object(arg->refs->base.repo, &u->new_oid, &peeled); + peel_error = peel_object(arg->refs->base.repo, &u->new_oid, &peeled, + PEEL_OBJECT_VERIFY_TAGGED_OBJECT_TYPE); if (!peel_error) { ref.value_type = REFTABLE_REF_VAL2; memcpy(ref.value.val2.target_value, peeled.hash, GIT_MAX_RAWSZ); @@ -1709,11 +1700,11 @@ done: return ret; } -static int reftable_be_pack_refs(struct ref_store *ref_store, - struct pack_refs_opts *opts) +static int reftable_be_optimize(struct ref_store *ref_store, + struct refs_optimize_opts *opts) { struct reftable_ref_store *refs = - reftable_be_downcast(ref_store, REF_STORE_WRITE | REF_STORE_ODB, "pack_refs"); + reftable_be_downcast(ref_store, REF_STORE_WRITE | REF_STORE_ODB, "optimize_refs"); struct reftable_stack *stack; int ret; @@ -1724,7 +1715,7 @@ static int reftable_be_pack_refs(struct ref_store *ref_store, if (!stack) stack = refs->main_backend.stack; - if (opts->flags & PACK_REFS_AUTO) + if (opts->flags & REFS_OPTIMIZE_AUTO) ret = reftable_stack_auto_compact(stack); else ret = reftable_stack_compact_all(stack, NULL); @@ -1742,10 +1733,27 @@ out: return ret; } -static int reftable_be_optimize(struct ref_store *ref_store, - struct pack_refs_opts *opts) +static int reftable_be_optimize_required(struct ref_store *ref_store, + struct refs_optimize_opts *opts, + bool *required) { - return reftable_be_pack_refs(ref_store, opts); + struct reftable_ref_store *refs = reftable_be_downcast(ref_store, REF_STORE_READ, + "optimize_refs_required"); + struct reftable_stack *stack; + bool use_heuristics = false; + + if (refs->err) + return refs->err; + + stack = refs->worktree_backend.stack; + if (!stack) + stack = refs->main_backend.stack; + + if (opts->flags & REFS_OPTIMIZE_AUTO) + use_heuristics = true; + + return reftable_stack_compaction_required(stack, use_heuristics, + required); } struct write_create_symref_arg { @@ -2072,7 +2080,7 @@ static int reftable_reflog_iterator_advance(struct ref_iterator *ref_iterator) strbuf_reset(&iter->last_name); strbuf_addstr(&iter->last_name, iter->log.refname); - iter->base.refname = iter->log.refname; + iter->base.ref.name = iter->log.refname; break; } @@ -2092,13 +2100,6 @@ static int reftable_reflog_iterator_seek(struct ref_iterator *ref_iterator UNUSE return -1; } -static int reftable_reflog_iterator_peel(struct ref_iterator *ref_iterator UNUSED, - struct object_id *peeled UNUSED) -{ - BUG("reftable reflog iterator cannot be peeled"); - return -1; -} - static void reftable_reflog_iterator_release(struct ref_iterator *ref_iterator) { struct reftable_reflog_iterator *iter = @@ -2111,7 +2112,6 @@ static void reftable_reflog_iterator_release(struct ref_iterator *ref_iterator) static struct ref_iterator_vtable reftable_reflog_iterator_vtable = { .advance = reftable_reflog_iterator_advance, .seek = reftable_reflog_iterator_seek, - .peel = reftable_reflog_iterator_peel, .release = reftable_reflog_iterator_release, }; @@ -2515,7 +2515,7 @@ static int write_reflog_expiry_table(struct reftable_writer *writer, void *cb_da ref.refname = (char *)arg->refname; ref.update_index = ts; - if (!peel_object(arg->refs->base.repo, &arg->update_oid, &peeled)) { + if (!peel_object(arg->refs->base.repo, &arg->update_oid, &peeled, 0)) { ref.value_type = REFTABLE_REF_VAL2; memcpy(ref.value.val2.target_value, peeled.hash, GIT_MAX_RAWSZ); memcpy(ref.value.val2.value, arg->update_oid.hash, GIT_MAX_RAWSZ); @@ -2778,8 +2778,9 @@ struct ref_storage_be refs_be_reftable = { .transaction_finish = reftable_be_transaction_finish, .transaction_abort = reftable_be_transaction_abort, - .pack_refs = reftable_be_pack_refs, .optimize = reftable_be_optimize, + .optimize_required = reftable_be_optimize_required, + .rename_ref = reftable_be_rename_ref, .copy_ref = reftable_be_copy_ref, diff --git a/reftable/reftable-stack.h b/reftable/reftable-stack.h index d70fcb705d..c2415cbc6e 100644 --- a/reftable/reftable-stack.h +++ b/reftable/reftable-stack.h @@ -123,6 +123,17 @@ struct reftable_log_expiry_config { int reftable_stack_compact_all(struct reftable_stack *st, struct reftable_log_expiry_config *config); +/* + * Check if compaction is required. + * + * When `use_heuristics` is false, check if all tables can be compacted to a + * single table. If true, use heuristics to determine if the tables need to be + * compacted to maintain geometric progression. + */ +int reftable_stack_compaction_required(struct reftable_stack *st, + bool use_heuristics, + bool *required); + /* heuristically compact unbalanced table stack. */ int reftable_stack_auto_compact(struct reftable_stack *st); diff --git a/reftable/stack.c b/reftable/stack.c index 65d89820bd..1c9f21dfe1 100644 --- a/reftable/stack.c +++ b/reftable/stack.c @@ -1626,7 +1626,8 @@ struct segment suggest_compaction_segment(uint64_t *sizes, size_t n, return seg; } -static uint64_t *stack_table_sizes_for_compaction(struct reftable_stack *st) +static int stack_segments_for_compaction(struct reftable_stack *st, + struct segment *seg) { int version = (st->opts.hash_id == REFTABLE_HASH_SHA1) ? 1 : 2; int overhead = header_size(version) - 1; @@ -1634,31 +1635,63 @@ static uint64_t *stack_table_sizes_for_compaction(struct reftable_stack *st) REFTABLE_CALLOC_ARRAY(sizes, st->merged->tables_len); if (!sizes) - return NULL; + return REFTABLE_OUT_OF_MEMORY_ERROR; for (size_t i = 0; i < st->merged->tables_len; i++) sizes[i] = st->tables[i]->size - overhead; - return sizes; + *seg = suggest_compaction_segment(sizes, st->merged->tables_len, + st->opts.auto_compaction_factor); + reftable_free(sizes); + + return 0; } -int reftable_stack_auto_compact(struct reftable_stack *st) +static int update_segment_if_compaction_required(struct reftable_stack *st, + struct segment *seg, + bool use_geometric, + bool *required) { - struct segment seg; - uint64_t *sizes; + int err; - if (st->merged->tables_len < 2) + if (st->merged->tables_len < 2) { + *required = false; return 0; + } - sizes = stack_table_sizes_for_compaction(st); - if (!sizes) - return REFTABLE_OUT_OF_MEMORY_ERROR; + if (!use_geometric) { + *required = true; + return 0; + } - seg = suggest_compaction_segment(sizes, st->merged->tables_len, - st->opts.auto_compaction_factor); - reftable_free(sizes); + err = stack_segments_for_compaction(st, seg); + if (err) + return err; + + *required = segment_size(seg) > 0; + return 0; +} + +int reftable_stack_compaction_required(struct reftable_stack *st, + bool use_heuristics, + bool *required) +{ + struct segment seg; + return update_segment_if_compaction_required(st, &seg, use_heuristics, + required); +} + +int reftable_stack_auto_compact(struct reftable_stack *st) +{ + struct segment seg; + bool required; + int err; + + err = update_segment_if_compaction_required(st, &seg, true, &required); + if (err) + return err; - if (segment_size(&seg) > 0) + if (required) return stack_compact_range(st, seg.start, seg.end - 1, NULL, STACK_COMPACT_RANGE_BEST_EFFORT); @@ -2315,21 +2315,19 @@ int format_tracking_info(struct branch *branch, struct strbuf *sb, return 1; } -static int one_local_ref(const char *refname, const char *referent UNUSED, const struct object_id *oid, - int flag UNUSED, - void *cb_data) +static int one_local_ref(const struct reference *ref, void *cb_data) { struct ref ***local_tail = cb_data; - struct ref *ref; + struct ref *local_ref; /* we already know it starts with refs/ to get here */ - if (check_refname_format(refname + 5, 0)) + if (check_refname_format(ref->name + 5, 0)) return 0; - ref = alloc_ref(refname); - oidcpy(&ref->new_oid, oid); - **local_tail = ref; - *local_tail = &ref->next; + local_ref = alloc_ref(ref->name); + oidcpy(&local_ref->new_oid, ref->oid); + **local_tail = local_ref; + *local_tail = &local_ref->next; return 0; } @@ -2402,15 +2400,14 @@ struct stale_heads_info { struct refspec *rs; }; -static int get_stale_heads_cb(const char *refname, const char *referent UNUSED, const struct object_id *oid, - int flags, void *cb_data) +static int get_stale_heads_cb(const struct reference *ref, void *cb_data) { struct stale_heads_info *info = cb_data; struct string_list matches = STRING_LIST_INIT_DUP; struct refspec_item query; int i, stale = 1; memset(&query, 0, sizeof(struct refspec_item)); - query.dst = (char *)refname; + query.dst = (char *)ref->name; refspec_find_all_matches(info->rs, &query, &matches); if (matches.nr == 0) @@ -2423,7 +2420,7 @@ static int get_stale_heads_cb(const char *refname, const char *referent UNUSED, * overlapping refspecs, we need to go over all of the * matching refs. */ - if (flags & REF_ISSYMREF) + if (ref->flags & REF_ISSYMREF) goto clean_exit; for (i = 0; stale && i < matches.nr; i++) @@ -2431,8 +2428,8 @@ static int get_stale_heads_cb(const char *refname, const char *referent UNUSED, stale = 0; if (stale) { - struct ref *ref = make_linked_ref(refname, &info->stale_refs_tail); - oidcpy(&ref->new_oid, oid); + struct ref *linked_ref = make_linked_ref(ref->name, &info->stale_refs_tail); + oidcpy(&linked_ref->new_oid, ref->oid); } clean_exit: diff --git a/repack-midx.c b/repack-midx.c index 6f6202c5bc..74bdfa3a6e 100644 --- a/repack-midx.c +++ b/repack-midx.c @@ -16,25 +16,23 @@ struct midx_snapshot_ref_data { int preferred; }; -static int midx_snapshot_ref_one(const char *refname UNUSED, - const char *referent UNUSED, - const struct object_id *oid, - int flag UNUSED, void *_data) +static int midx_snapshot_ref_one(const struct reference *ref, void *_data) { struct midx_snapshot_ref_data *data = _data; + const struct object_id *maybe_peeled = ref->oid; struct object_id peeled; - if (!peel_iterated_oid(data->repo, oid, &peeled)) - oid = &peeled; + if (!reference_get_peeled_oid(data->repo, ref, &peeled)) + maybe_peeled = &peeled; - if (oidset_insert(&data->seen, oid)) + if (oidset_insert(&data->seen, maybe_peeled)) return 0; /* already seen */ - if (odb_read_object_info(data->repo->objects, oid, NULL) != OBJ_COMMIT) + if (odb_read_object_info(data->repo->objects, maybe_peeled, NULL) != OBJ_COMMIT) return 0; fprintf(data->f->fp, "%s%s\n", data->preferred ? "+" : "", - oid_to_hex(oid)); + oid_to_hex(maybe_peeled)); return 0; } diff --git a/replace-object.c b/replace-object.c index 3eae051074..03d0f1f083 100644 --- a/replace-object.c +++ b/replace-object.c @@ -8,31 +8,27 @@ #include "repository.h" #include "commit.h" -static int register_replace_ref(const char *refname, - const char *referent UNUSED, - const struct object_id *oid, - int flag UNUSED, - void *cb_data) +static int register_replace_ref(const struct reference *ref, void *cb_data) { struct repository *r = cb_data; /* Get sha1 from refname */ - const char *slash = strrchr(refname, '/'); - const char *hash = slash ? slash + 1 : refname; + const char *slash = strrchr(ref->name, '/'); + const char *hash = slash ? slash + 1 : ref->name; struct replace_object *repl_obj = xmalloc(sizeof(*repl_obj)); if (get_oid_hex_algop(hash, &repl_obj->original.oid, r->hash_algo)) { free(repl_obj); - warning(_("bad replace ref name: %s"), refname); + warning(_("bad replace ref name: %s"), ref->name); return 0; } /* Copy sha1 from the read ref */ - oidcpy(&repl_obj->replacement, oid); + oidcpy(&repl_obj->replacement, ref->oid); /* Register new object */ if (oidmap_put(&r->objects->replace_map, repl_obj)) - die(_("duplicate replace ref: %s"), refname); + die(_("duplicate replace ref: %s"), ref->name); return 0; } diff --git a/revision.c b/revision.c index cf5e6c1ec9..5f0850ae5c 100644 --- a/revision.c +++ b/revision.c @@ -1644,19 +1644,17 @@ struct all_refs_cb { struct worktree *wt; }; -static int handle_one_ref(const char *path, const char *referent UNUSED, const struct object_id *oid, - int flag UNUSED, - void *cb_data) +static int handle_one_ref(const struct reference *ref, void *cb_data) { struct all_refs_cb *cb = cb_data; struct object *object; - if (ref_excluded(&cb->all_revs->ref_excludes, path)) + if (ref_excluded(&cb->all_revs->ref_excludes, ref->name)) return 0; - object = get_reference(cb->all_revs, path, oid, cb->all_flags); - add_rev_cmdline(cb->all_revs, object, path, REV_CMD_REF, cb->all_flags); - add_pending_object(cb->all_revs, object, path); + object = get_reference(cb->all_revs, ref->name, ref->oid, cb->all_flags); + add_rev_cmdline(cb->all_revs, object, ref->name, REV_CMD_REF, cb->all_flags); + add_pending_object(cb->all_revs, object, ref->name); return 0; } diff --git a/server-info.c b/server-info.c index b9a710544a..4243e24edc 100644 --- a/server-info.c +++ b/server-info.c @@ -148,23 +148,21 @@ out: return ret; } -static int add_info_ref(const char *path, const char *referent UNUSED, const struct object_id *oid, - int flag UNUSED, - void *cb_data) +static int add_info_ref(const struct reference *ref, void *cb_data) { struct update_info_ctx *uic = cb_data; - struct object *o = parse_object(uic->repo, oid); + struct object *o = parse_object(uic->repo, ref->oid); if (!o) return -1; - if (uic_printf(uic, "%s %s\n", oid_to_hex(oid), path) < 0) + if (uic_printf(uic, "%s %s\n", oid_to_hex(ref->oid), ref->name) < 0) return -1; if (o->type == OBJ_TAG) { - o = deref_tag(uic->repo, o, path, 0); + o = deref_tag(uic->repo, o, ref->name, 0); if (o) if (uic_printf(uic, "%s %s^{}\n", - oid_to_hex(&o->oid), path) < 0) + oid_to_hex(&o->oid), ref->name) < 0) return -1; } return 0; @@ -626,14 +626,10 @@ static void paint_down(struct paint_info *info, const struct object_id *oid, free(tmp); } -static int mark_uninteresting(const char *refname UNUSED, - const char *referent UNUSED, - const struct object_id *oid, - int flags UNUSED, - void *cb_data UNUSED) +static int mark_uninteresting(const struct reference *ref, void *cb_data UNUSED) { struct commit *commit = lookup_commit_reference_gently(the_repository, - oid, 1); + ref->oid, 1); if (!commit) return 0; commit->object.flags |= UNINTERESTING; @@ -742,16 +738,12 @@ struct commit_array { size_t nr, alloc; }; -static int add_ref(const char *refname UNUSED, - const char *referent UNUSED, - const struct object_id *oid, - int flags UNUSED, - void *cb_data) +static int add_ref(const struct reference *ref, void *cb_data) { struct commit_array *ca = cb_data; ALLOC_GROW(ca->commits, ca->nr + 1, ca->alloc); ca->commits[ca->nr] = lookup_commit_reference_gently(the_repository, - oid, 1); + ref->oid, 1); if (ca->commits[ca->nr]) ca->nr++; return 0; diff --git a/submodule.c b/submodule.c index 35c55155f7..40a5c6fb9d 100644 --- a/submodule.c +++ b/submodule.c @@ -934,10 +934,7 @@ static void free_submodules_data(struct string_list *submodules) string_list_clear(submodules, 1); } -static int has_remote(const char *refname UNUSED, - const char *referent UNUSED, - const struct object_id *oid UNUSED, - int flags UNUSED, void *cb_data UNUSED) +static int has_remote(const struct reference *ref UNUSED, void *cb_data UNUSED) { return 1; } @@ -1255,13 +1252,10 @@ int push_unpushed_submodules(struct repository *r, return ret; } -static int append_oid_to_array(const char *ref UNUSED, - const char *referent UNUSED, - const struct object_id *oid, - int flags UNUSED, void *data) +static int append_oid_to_array(const struct reference *ref, void *data) { struct oid_array *array = data; - oid_array_append(array, oid); + oid_array_append(array, ref->oid); return 0; } diff --git a/t/for-each-ref-tests.sh b/t/for-each-ref-tests.sh index e3ad19298a..4593be5fd5 100644 --- a/t/for-each-ref-tests.sh +++ b/t/for-each-ref-tests.sh @@ -1809,7 +1809,9 @@ test_expect_success "${git_for_each_ref} reports broken tags" ' bad=$(git hash-object -w -t tag bad) && git update-ref refs/tags/broken-tag-bad $bad && test_must_fail ${git_for_each_ref} --format="%(*objectname)" \ - refs/tags/broken-tag-* + refs/tags/broken-tag-* && + test_must_fail ${git_for_each_ref} --format="%(*objectname)" \ + refs/tags/broken-tag-bad ' test_expect_success 'set up tag with signature and no blank lines' ' diff --git a/t/helper/test-delete-gpgsig.c b/t/helper/test-delete-gpgsig.c index e36831af03..658c7a37f7 100644 --- a/t/helper/test-delete-gpgsig.c +++ b/t/helper/test-delete-gpgsig.c @@ -23,8 +23,7 @@ int cmd__delete_gpgsig(int argc, const char **argv) if (!strcmp(pattern, "trailer")) { size_t payload_size = parse_signed_buffer(buf.buf, buf.len); fwrite(buf.buf, 1, payload_size, stdout); - fflush(stdout); - return 0; + goto out; } bufptr = buf.buf; @@ -56,7 +55,9 @@ int cmd__delete_gpgsig(int argc, const char **argv) fwrite(bufptr, 1, (eol - bufptr) + 1, stdout); bufptr = eol + 1; } - fflush(stdout); +out: + fflush(stdout); + strbuf_release(&buf); return 0; } diff --git a/t/helper/test-reach.c b/t/helper/test-reach.c index 028ec00306..c58c93800f 100644 --- a/t/helper/test-reach.c +++ b/t/helper/test-reach.c @@ -63,7 +63,7 @@ int cmd__reach(int ac, const char **av) die("failed to resolve %s", buf.buf + 2); orig = parse_object(r, &oid); - peeled = deref_tag_noverify(the_repository, orig); + peeled = deref_tag(the_repository, orig, NULL, 0); if (!peeled) die("failed to load commit for input %s resulting in oid %s", diff --git a/t/helper/test-ref-store.c b/t/helper/test-ref-store.c index 83b06d39a3..b1215947c5 100644 --- a/t/helper/test-ref-store.c +++ b/t/helper/test-ref-store.c @@ -154,10 +154,9 @@ static int cmd_rename_ref(struct ref_store *refs, const char **argv) return refs_rename_ref(refs, oldref, newref, logmsg); } -static int each_ref(const char *refname, const char *referent UNUSED, const struct object_id *oid, - int flags, void *cb_data UNUSED) +static int each_ref(const struct reference *ref, void *cb_data UNUSED) { - printf("%s %s 0x%x\n", oid_to_hex(oid), refname, flags); + printf("%s %s 0x%x\n", oid_to_hex(ref->oid), ref->name, ref->flags); return 0; } diff --git a/t/lib-gpg.sh b/t/lib-gpg.sh index b99ae39a06..97268ae07c 100644 --- a/t/lib-gpg.sh +++ b/t/lib-gpg.sh @@ -71,6 +71,7 @@ test_lazy_prereq GPG2 ' exit 1 ;; *) + prepare_gnupghome && (gpgconf --kill all || : ) && # NEEDSWORK: prepare_gnupghome() should definitely be diff --git a/t/meson.build b/t/meson.build index c9ddd89889..a5531df415 100644 --- a/t/meson.build +++ b/t/meson.build @@ -238,6 +238,7 @@ integration_tests = [ 't1701-racy-split-index.sh', 't1800-hook.sh', 't1900-repo.sh', + 't1901-repo-structure.sh', 't2000-conflict-when-checking-files-out.sh', 't2002-checkout-cache-u.sh', 't2003-checkout-cache-mkdir.sh', diff --git a/t/pack-refs-tests.sh b/t/pack-refs-tests.sh index 3dbcc01718..81086c3690 100644 --- a/t/pack-refs-tests.sh +++ b/t/pack-refs-tests.sh @@ -428,4 +428,34 @@ do ' done -test_done +test_expect_success 'pack-refs does not store invalid peeled tag value' ' + test_when_finished rm -rf repo && + git init repo && + ( + cd repo && + git commit --allow-empty --message initial && + + echo garbage >blob-content && + blob_id=$(git hash-object -w -t blob blob-content) && + + # Write an invalid tag into the object database. The tag itself + # is well-formed, but the tagged object is a blob while we + # claim that it is a commit. + cat >tag-content <<-EOF && + object $blob_id + type commit + tag bad-tag + tagger C O Mitter <committer@example.com> 1112354055 +0200 + + annotated + EOF + tag_id=$(git hash-object -w -t tag tag-content) && + git update-ref refs/tags/bad-tag "$tag_id" && + + # The packed-refs file should not contain the peeled object ID. + # If it did this would cause commands that use the peeled value + # to not notice this corrupted tag. + git pack-refs --all && + test_grep ! "^\^" .git/packed-refs + ) +' diff --git a/t/perf/p6010-merge-base.sh b/t/perf/p6010-merge-base.sh new file mode 100755 index 0000000000..54f52fa23e --- /dev/null +++ b/t/perf/p6010-merge-base.sh @@ -0,0 +1,101 @@ +#!/bin/sh + +test_description='Test git merge-base' + +. ./perf-lib.sh + +test_perf_fresh_repo + +# +# Creates lots of merges to make history traversal costly. In +# particular it creates 2^($max_level-1)-1 2-way merges on top of +# 2^($max_level-1) root commits. E.g., the commit history looks like +# this for a $max_level of 3: +# +# _1_ +# / \ +# 2 3 +# / \ / \ +# 4 5 6 7 +# +# The numbers are the fast-import marks, which also are the commit +# messages. 1 is the HEAD commit and a merge, 2 and 3 are also merges, +# 4-7 are the root commits. +# +build_history () { + local max_level="$1" && + local level="${2:-1}" && + local mark="${3:-1}" && + if test $level -eq $max_level + then + echo "reset refs/heads/master" && + echo "from $ZERO_OID" && + echo "commit refs/heads/master" && + echo "mark :$mark" && + echo "committer C <c@example.com> 1234567890 +0000" && + echo "data <<EOF" && + echo "$mark" && + echo "EOF" + else + local level1=$((level+1)) && + local mark1=$((2*mark)) && + local mark2=$((2*mark+1)) && + build_history $max_level $level1 $mark1 && + build_history $max_level $level1 $mark2 && + echo "commit refs/heads/master" && + echo "mark :$mark" && + echo "committer C <c@example.com> 1234567890 +0000" && + echo "data <<EOF" && + echo "$mark" && + echo "EOF" && + echo "from :$mark1" && + echo "merge :$mark2" + fi +} + +# +# Creates a new merge history in the same shape as build_history does, +# while reusing the same root commits. This way the two top commits +# have 2^($max_level-1) merge bases between them. +# +build_history2 () { + local max_level="$1" && + local level="${2:-1}" && + local mark="${3:-1}" && + if test $level -lt $max_level + then + local level1=$((level+1)) && + local mark1=$((2*mark)) && + local mark2=$((2*mark+1)) && + build_history2 $max_level $level1 $mark1 && + build_history2 $max_level $level1 $mark2 && + echo "commit refs/heads/master" && + echo "mark :$mark" && + echo "committer C <c@example.com> 1234567890 +0000" && + echo "data <<EOF" && + echo "$mark II" && + echo "EOF" && + echo "from :$mark1" && + echo "merge :$mark2" + fi +} + +test_expect_success 'setup' ' + max_level=15 && + build_history $max_level | git fast-import --export-marks=marks && + git tag one && + build_history2 $max_level | git fast-import --import-marks=marks --force && + git tag two && + git gc && + git log --format=%H --no-merges >expect +' + +test_perf 'git merge-base' ' + git merge-base --all one two >actual +' + +test_expect_success 'verify result' ' + test_cmp expect actual +' + +test_done diff --git a/t/t0003-attributes.sh b/t/t0003-attributes.sh index 3c98b622f2..582e207aa1 100755 --- a/t/t0003-attributes.sh +++ b/t/t0003-attributes.sh @@ -664,4 +664,24 @@ test_expect_success 'user defined builtin_objectmode values are ignored' ' test_cmp expect err ' +test_expect_success ULIMIT_STACK_SIZE 'deep macro recursion' ' + n=3000 && + { + i=0 && + while test $i -lt $n; do + echo "[attr]a$i a$((i+1))" && + i=$((i+1)) || + return 1 + done && + echo "[attr]a$n -text" && + echo "file a0" + } >.gitattributes && + { + echo "file: text: unset" && + test_seq -f "file: a%d: set" 0 $n + } >expect && + run_with_limited_stack git check-attr -a file >actual && + test_cmp expect actual +' + test_done diff --git a/t/t0008-ignores.sh b/t/t0008-ignores.sh index 273d71411f..db8bde280e 100755 --- a/t/t0008-ignores.sh +++ b/t/t0008-ignores.sh @@ -847,6 +847,17 @@ test_expect_success 'directories and ** matches' ' test_cmp expect actual ' +test_expect_success '** not confused by matching leading prefix' ' + cat >.gitignore <<-\EOF && + foo**/bar + EOF + git check-ignore foobar foo/bar >actual && + cat >expect <<-\EOF && + foo/bar + EOF + test_cmp expect actual +' + ############################################################################ # # test whitespace handling diff --git a/t/t0450/adoc-help-mismatches b/t/t0450/adoc-help-mismatches index 2c6ecd5fc8..8ee2d3f7c8 100644 --- a/t/t0450/adoc-help-mismatches +++ b/t/t0450/adoc-help-mismatches @@ -2,7 +2,6 @@ add am apply archive -bisect blame branch check-ref-format diff --git a/t/t0601-reffiles-pack-refs.sh b/t/t0601-reffiles-pack-refs.sh index 12cf5d1dcb..3c706978ef 100755 --- a/t/t0601-reffiles-pack-refs.sh +++ b/t/t0601-reffiles-pack-refs.sh @@ -18,3 +18,5 @@ export GIT_TEST_DEFAULT_REF_FORMAT . ./test-lib.sh . "$TEST_DIRECTORY"/pack-refs-tests.sh + +test_done diff --git a/t/t0610-reftable-basics.sh b/t/t0610-reftable-basics.sh index 3ea5d51532..6575528f21 100755 --- a/t/t0610-reftable-basics.sh +++ b/t/t0610-reftable-basics.sh @@ -1135,4 +1135,32 @@ test_expect_success 'fetch: accessing FETCH_HEAD special ref works' ' test_cmp expect actual ' +test_expect_success 'writes do not persist peeled value for invalid tags' ' + test_when_finished rm -rf repo && + git init repo && + ( + cd repo && + git commit --allow-empty --message initial && + + # We cannot easily verify that the peeled value is not stored + # in the tables. Instead, we test this indirectly: we create + # two tags that both point to the same object, but they claim + # different object types. If we parse both tags we notice that + # the parsed tagged object has a mismatch between the two tags + # and bail out. + # + # If we instead use the persisted peeled value we would not + # even parse the tags. As such, we would not notice the + # discrepancy either and thus listing these tags would succeed. + git tag tag-1 -m "tag 1" && + git cat-file tag tag-1 >raw-tag && + sed "s/^type commit$/type blob/" <raw-tag >broken-tag && + broken_tag_id=$(git hash-object -w -t tag broken-tag) && + git update-ref refs/tags/tag-2 $broken_tag_id && + + test_must_fail git for-each-ref --format="%(*objectname)" refs/tags/ 2>err && + test_grep "bad tag pointer" err + ) +' + test_done diff --git a/t/t1016-compatObjectFormat.sh b/t/t1016-compatObjectFormat.sh index a9af8b2396..0efce53f3a 100755 --- a/t/t1016-compatObjectFormat.sh +++ b/t/t1016-compatObjectFormat.sh @@ -21,6 +21,12 @@ test_description='Test how well compatObjectFormat works' # different hash functions result in the same content in the commits. # This means that when the commit is translated between hash functions # the commit is identical to the commit in the other repository. +# +# Similarly this test relies on: +# gpg --faked-system-time '20230918T154812! +# freezing the system time from gpg perspective so that two different +# runs of gpg applied to the same data result in identical signatures. +# compat_hash () { case "$1" in diff --git a/t/t1016/gpg b/t/t1016/gpg index 2601cb18a5..34d6e055fc 100755 --- a/t/t1016/gpg +++ b/t/t1016/gpg @@ -1,2 +1,2 @@ #!/bin/sh -exec gpg --faked-system-time "20230918T154812" "$@" +exec gpg --faked-system-time '20230918T154812!' "$@" diff --git a/t/t1463-refs-optimize.sh b/t/t1463-refs-optimize.sh index c11c905d79..9afe3c1ed7 100755 --- a/t/t1463-refs-optimize.sh +++ b/t/t1463-refs-optimize.sh @@ -15,3 +15,5 @@ export GIT_TEST_DEFAULT_REF_FORMAT pack_refs='refs optimize' . "$TEST_DIRECTORY"/pack-refs-tests.sh + +test_done diff --git a/t/t1901-repo-structure.sh b/t/t1901-repo-structure.sh new file mode 100755 index 0000000000..36a71a144e --- /dev/null +++ b/t/t1901-repo-structure.sh @@ -0,0 +1,129 @@ +#!/bin/sh + +test_description='test git repo structure' + +. ./test-lib.sh + +test_expect_success 'empty repository' ' + test_when_finished "rm -rf repo" && + git init repo && + ( + cd repo && + cat >expect <<-\EOF && + | Repository structure | Value | + | -------------------- | ----- | + | * References | | + | * Count | 0 | + | * Branches | 0 | + | * Tags | 0 | + | * Remotes | 0 | + | * Others | 0 | + | | | + | * Reachable objects | | + | * Count | 0 | + | * Commits | 0 | + | * Trees | 0 | + | * Blobs | 0 | + | * Tags | 0 | + EOF + + git repo structure >out 2>err && + + test_cmp expect out && + test_line_count = 0 err + ) +' + +test_expect_success 'repository with references and objects' ' + test_when_finished "rm -rf repo" && + git init repo && + ( + cd repo && + test_commit_bulk 42 && + git tag -a foo -m bar && + + oid="$(git rev-parse HEAD)" && + git update-ref refs/remotes/origin/foo "$oid" && + + # Also creates a commit, tree, and blob. + git notes add -m foo && + + cat >expect <<-\EOF && + | Repository structure | Value | + | -------------------- | ----- | + | * References | | + | * Count | 4 | + | * Branches | 1 | + | * Tags | 1 | + | * Remotes | 1 | + | * Others | 1 | + | | | + | * Reachable objects | | + | * Count | 130 | + | * Commits | 43 | + | * Trees | 43 | + | * Blobs | 43 | + | * Tags | 1 | + EOF + + git repo structure >out 2>err && + + test_cmp expect out && + test_line_count = 0 err + ) +' + +test_expect_success 'keyvalue and nul format' ' + test_when_finished "rm -rf repo" && + git init repo && + ( + cd repo && + test_commit_bulk 42 && + git tag -a foo -m bar && + + cat >expect <<-\EOF && + references.branches.count=1 + references.tags.count=1 + references.remotes.count=0 + references.others.count=0 + objects.commits.count=42 + objects.trees.count=42 + objects.blobs.count=42 + objects.tags.count=1 + EOF + + git repo structure --format=keyvalue >out 2>err && + + test_cmp expect out && + test_line_count = 0 err && + + # Replace key and value delimiters for nul format. + tr "\n=" "\0\n" <expect >expect_nul && + git repo structure --format=nul >out 2>err && + + test_cmp expect_nul out && + test_line_count = 0 err + ) +' + +test_expect_success 'progress meter option' ' + test_when_finished "rm -rf repo" && + git init repo && + ( + cd repo && + test_commit foo && + + GIT_PROGRESS_DELAY=0 git repo structure --progress >out 2>err && + + test_file_not_empty out && + test_grep "Counting references: 2, done." err && + test_grep "Counting objects: 3, done." err && + + GIT_PROGRESS_DELAY=0 git repo structure --no-progress >out 2>err && + + test_file_not_empty out && + test_line_count = 0 err + ) +' + +test_done diff --git a/t/t3070-wildmatch.sh b/t/t3070-wildmatch.sh index 3da824117c..655bb1a0f2 100755 --- a/t/t3070-wildmatch.sh +++ b/t/t3070-wildmatch.sh @@ -235,6 +235,8 @@ match 1 1 1 1 aaaaaaabababab '*ab' match 1 1 1 1 'foo*' 'foo\*' match 0 0 0 0 foobar 'foo\*bar' match 1 1 1 1 'f\oo' 'f\\oo' +match 0 0 0 0 \ + 1 1 1 1 'foo\' 'foo\' match 1 1 1 1 ball '*[al]?' match 0 0 0 0 ten '[ten]' match 1 1 1 1 ten '**[!te]' diff --git a/t/t3650-replay-basics.sh b/t/t3650-replay-basics.sh index 58b3759935..cf3aacf355 100755 --- a/t/t3650-replay-basics.sh +++ b/t/t3650-replay-basics.sh @@ -52,7 +52,7 @@ test_expect_success 'setup bare' ' ' test_expect_success 'using replay to rebase two branches, one on top of other' ' - git replay --onto main topic1..topic2 >result && + git replay --ref-action=print --onto main topic1..topic2 >result && test_line_count = 1 result && @@ -68,7 +68,7 @@ test_expect_success 'using replay to rebase two branches, one on top of other' ' ' test_expect_success 'using replay on bare repo to rebase two branches, one on top of other' ' - git -C bare replay --onto main topic1..topic2 >result-bare && + git -C bare replay --ref-action=print --onto main topic1..topic2 >result-bare && test_cmp expect result-bare ' @@ -86,7 +86,7 @@ test_expect_success 'using replay to perform basic cherry-pick' ' # 2nd field of result is refs/heads/main vs. refs/heads/topic2 # 4th field of result is hash for main instead of hash for topic2 - git replay --advance main topic1..topic2 >result && + git replay --ref-action=print --advance main topic1..topic2 >result && test_line_count = 1 result && @@ -102,7 +102,7 @@ test_expect_success 'using replay to perform basic cherry-pick' ' ' test_expect_success 'using replay on bare repo to perform basic cherry-pick' ' - git -C bare replay --advance main topic1..topic2 >result-bare && + git -C bare replay --ref-action=print --advance main topic1..topic2 >result-bare && test_cmp expect result-bare ' @@ -115,7 +115,7 @@ test_expect_success 'replay fails when both --advance and --onto are omitted' ' ' test_expect_success 'using replay to also rebase a contained branch' ' - git replay --contained --onto main main..topic3 >result && + git replay --ref-action=print --contained --onto main main..topic3 >result && test_line_count = 2 result && cut -f 3 -d " " result >new-branch-tips && @@ -139,12 +139,12 @@ test_expect_success 'using replay to also rebase a contained branch' ' ' test_expect_success 'using replay on bare repo to also rebase a contained branch' ' - git -C bare replay --contained --onto main main..topic3 >result-bare && + git -C bare replay --ref-action=print --contained --onto main main..topic3 >result-bare && test_cmp expect result-bare ' test_expect_success 'using replay to rebase multiple divergent branches' ' - git replay --onto main ^topic1 topic2 topic4 >result && + git replay --ref-action=print --onto main ^topic1 topic2 topic4 >result && test_line_count = 2 result && cut -f 3 -d " " result >new-branch-tips && @@ -168,7 +168,7 @@ test_expect_success 'using replay to rebase multiple divergent branches' ' ' test_expect_success 'using replay on bare repo to rebase multiple divergent branches, including contained ones' ' - git -C bare replay --contained --onto main ^main topic2 topic3 topic4 >result && + git -C bare replay --ref-action=print --contained --onto main ^main topic2 topic3 topic4 >result && test_line_count = 4 result && cut -f 3 -d " " result >new-branch-tips && @@ -217,4 +217,101 @@ test_expect_success 'merge.directoryRenames=false' ' --onto rename-onto rename-onto..rename-from ' +test_expect_success 'default atomic behavior updates refs directly' ' + # Use a separate branch to avoid contaminating topic2 for later tests + git branch test-atomic topic2 && + test_when_finished "git branch -D test-atomic" && + + # Test default atomic behavior (no output, refs updated) + git replay --onto main topic1..test-atomic >output && + test_must_be_empty output && + + # Verify ref was updated + git log --format=%s test-atomic >actual && + test_write_lines E D M L B A >expect && + test_cmp expect actual && + + # Verify reflog message includes SHA of onto commit + git reflog test-atomic -1 --format=%gs >reflog-msg && + ONTO_SHA=$(git rev-parse main) && + echo "replay --onto $ONTO_SHA" >expect-reflog && + test_cmp expect-reflog reflog-msg +' + +test_expect_success 'atomic behavior in bare repository' ' + # Store original state for cleanup + START=$(git -C bare rev-parse topic2) && + test_when_finished "git -C bare update-ref refs/heads/topic2 $START" && + + # Test atomic updates work in bare repo + git -C bare replay --onto main topic1..topic2 >output && + test_must_be_empty output && + + # Verify ref was updated in bare repo + git -C bare log --format=%s topic2 >actual && + test_write_lines E D M L B A >expect && + test_cmp expect actual +' + +test_expect_success 'reflog message for --advance mode' ' + # Store original state + START=$(git rev-parse main) && + test_when_finished "git update-ref refs/heads/main $START" && + + # Test --advance mode reflog message + git replay --advance main topic1..topic2 >output && + test_must_be_empty output && + + # Verify reflog message includes --advance and branch name + git reflog main -1 --format=%gs >reflog-msg && + echo "replay --advance main" >expect-reflog && + test_cmp expect-reflog reflog-msg +' + +test_expect_success 'replay.refAction=print config option' ' + # Store original state + START=$(git rev-parse topic2) && + test_when_finished "git branch -f topic2 $START" && + + # Test with config set to print + test_config replay.refAction print && + git replay --onto main topic1..topic2 >output && + test_line_count = 1 output && + test_grep "^update refs/heads/topic2 " output +' + +test_expect_success 'replay.refAction=update config option' ' + # Store original state + START=$(git rev-parse topic2) && + test_when_finished "git branch -f topic2 $START" && + + # Test with config set to update + test_config replay.refAction update && + git replay --onto main topic1..topic2 >output && + test_must_be_empty output && + + # Verify ref was updated + git log --format=%s topic2 >actual && + test_write_lines E D M L B A >expect && + test_cmp expect actual +' + +test_expect_success 'command-line --ref-action overrides config' ' + # Store original state + START=$(git rev-parse topic2) && + test_when_finished "git branch -f topic2 $START" && + + # Set config to update but use --ref-action=print + test_config replay.refAction update && + git replay --ref-action=print --onto main topic1..topic2 >output && + test_line_count = 1 output && + test_grep "^update refs/heads/topic2 " output +' + +test_expect_success 'invalid replay.refAction value' ' + test_config replay.refAction invalid && + test_must_fail git replay --onto main topic1..topic2 2>error && + test_grep "invalid.*replay.refAction.*value" error +' + test_done diff --git a/t/t3700-add.sh b/t/t3700-add.sh index df580a5806..af93e53c12 100755 --- a/t/t3700-add.sh +++ b/t/t3700-add.sh @@ -388,6 +388,7 @@ test_expect_success 'error on a repository with no commits' ' test_must_fail git add empty >actual 2>&1 && cat >expect <<-EOF && error: '"'empty/'"' does not have a commit checked out + error: unable to index file '"'empty/'"' fatal: adding files failed EOF test_cmp expect actual @@ -541,6 +542,31 @@ test_expect_success 'all statuses changed in folder if . is given' ' ) ' +test_expect_success 'cannot add a submodule of a different algorithm' ' + git init --object-format=sha256 sha256 && + ( + cd sha256 && + test_commit abc && + git init --object-format=sha1 submodule && + test_commit -C submodule def && + test_must_fail git add submodule 2>err && + test_grep "cannot add a submodule of a different hash algorithm" err && + git ls-files --stage >entries && + test_grep ! ^160000 entries + ) && + git init --object-format=sha1 sha1 && + ( + cd sha1 && + test_commit abc && + git init --object-format=sha256 submodule && + test_commit -C submodule def && + test_must_fail git add submodule 2>err && + test_grep "cannot add a submodule of a different hash algorithm" err && + git ls-files --stage >entries && + test_grep ! ^160000 entries + ) +' + test_expect_success CASE_INSENSITIVE_FS 'path is case-insensitive' ' path="$(pwd)/BLUB" && touch "$path" && diff --git a/t/t3701-add-interactive.sh b/t/t3701-add-interactive.sh index 851ca6dd91..4285314f35 100755 --- a/t/t3701-add-interactive.sh +++ b/t/t3701-add-interactive.sh @@ -1431,4 +1431,15 @@ test_expect_success 'invalid option s is rejected' ' test_cmp expect actual ' +test_expect_success 'EOF quits' ' + echo a >file && + echo a >file2 && + git add file file2 && + echo X >file && + echo X >file2 && + git add -p </dev/null >out && + test_grep file out && + test_grep ! file2 out +' + test_done diff --git a/t/t4007-rename-3.sh b/t/t4007-rename-3.sh index e8faf0dd2e..3fc81bcd76 100755 --- a/t/t4007-rename-3.sh +++ b/t/t4007-rename-3.sh @@ -41,6 +41,16 @@ test_expect_success 'copy detection, cached' ' compare_diff_raw current expected ' +test_expect_success 'exit code of quiet copy detection' ' + test_expect_code 1 \ + git diff --quiet --cached --find-copies-harder $tree +' + +test_expect_success 'exit code of quiet copy detection with --no-ext-diff' ' + test_expect_code 1 \ + git diff --quiet --cached --find-copies-harder --no-ext-diff $tree +' + # In the tree, there is only path0/COPYING. In the cache, path0 and # path1 both have COPYING and the latter is a copy of path0/COPYING. # However when we say we care only about path1, we should just see diff --git a/t/t4020-diff-external.sh b/t/t4020-diff-external.sh index c8a23d5148..7ec5854f74 100755 --- a/t/t4020-diff-external.sh +++ b/t/t4020-diff-external.sh @@ -44,6 +44,16 @@ test_expect_success 'GIT_EXTERNAL_DIFF environment and --no-ext-diff' ' ' +test_expect_success 'GIT_EXTERNAL_DIFF and --output' ' + cat >expect <<-EOF && + file $(git rev-parse --verify HEAD:file) 100644 file $(test_oid zero) 100644 + EOF + GIT_EXTERNAL_DIFF=echo git diff --output=out >stdout && + cut -d" " -f1,3- <out >actual && + test_must_be_empty stdout && + test_cmp expect actual +' + test_expect_success SYMLINKS 'typechange diff' ' rm -f file && ln -s elif file && diff --git a/t/t7004-tag.sh b/t/t7004-tag.sh index 10835631ca..ce2ff2a28a 100755 --- a/t/t7004-tag.sh +++ b/t/t7004-tag.sh @@ -2293,24 +2293,26 @@ test_expect_success '--contains combined with --no-contains' ' # don't recurse down to tags for trees or blobs pointed to by *those* # commits. test_expect_success 'Does --[no-]contains stop at commits? Yes!' ' - cd no-contains && - blob=$(git rev-parse v0.3:v0.3.t) && - tree=$(git rev-parse v0.3^{tree}) && - git tag tag-blob $blob && - git tag tag-tree $tree && - git tag --contains v0.3 >actual && - cat >expected <<-\EOF && - v0.3 - v0.4 - v0.5 - EOF - test_cmp expected actual && - git tag --no-contains v0.3 >actual && - cat >expected <<-\EOF && - v0.1 - v0.2 - EOF - test_cmp expected actual + ( + cd no-contains && + blob=$(git rev-parse v0.3:v0.3.t) && + tree=$(git rev-parse v0.3^{tree}) && + git tag tag-blob $blob && + git tag tag-tree $tree && + git tag --contains v0.3 >actual && + cat >expected <<-\EOF && + v0.3 + v0.4 + v0.5 + EOF + test_cmp expected actual && + git tag --no-contains v0.3 >actual && + cat >expected <<-\EOF && + v0.1 + v0.2 + EOF + test_cmp expected actual + ) ' test_expect_success 'If tag is created then tag message file is unlinked' ' @@ -2332,4 +2334,24 @@ test_expect_success 'If tag cannot be created then tag message file is not unlin test_path_exists .git/TAG_EDITMSG ' +test_expect_success 'annotated tag version sort' ' + git tag -a -m "sample 1.0" vsample-1.0 && + git tag -a -m "sample 2.0" vsample-2.0 && + git tag -a -m "sample 10.0" vsample-10.0 && + cat >expect <<-EOF && + vsample-1.0 + vsample-2.0 + vsample-10.0 + EOF + + git tag --list --sort=version:tag vsample-\* >actual && + test_cmp expect actual && + + # Ensure that we also handle this case alright in the case we have the + # peeled values cached e.g. via the packed-refs file. + git pack-refs --all && + git tag --list --sort=version:tag vsample-\* && + test_cmp expect actual +' + test_done diff --git a/t/t7400-submodule-basic.sh b/t/t7400-submodule-basic.sh index fd3e7e355e..e6b551daad 100755 --- a/t/t7400-submodule-basic.sh +++ b/t/t7400-submodule-basic.sh @@ -407,6 +407,31 @@ test_expect_success 'submodule add in subdirectory with relative path should fai test_grep toplevel output.err ' +test_expect_success 'submodule add of a different algorithm fails' ' + git init --object-format=sha256 sha256 && + ( + cd sha256 && + test_commit abc && + git init --object-format=sha1 submodule && + test_commit -C submodule def && + test_must_fail git submodule add "$submodurl" submodule 2>err && + test_grep "cannot add a submodule of a different hash algorithm" err && + git ls-files --stage >entries && + test_grep ! ^160000 entries + ) && + git init --object-format=sha1 sha1 && + ( + cd sha1 && + test_commit abc && + git init --object-format=sha256 submodule && + test_commit -C submodule def && + test_must_fail git submodule add "$submodurl" submodule 2>err && + test_grep "cannot add a submodule of a different hash algorithm" err && + git ls-files --stage >entries && + test_grep ! ^160000 entries + ) +' + test_expect_success 'setup - add an example entry to .gitmodules' ' git config --file=.gitmodules submodule.example.url git://example.com/init.git ' diff --git a/t/t7900-maintenance.sh b/t/t7900-maintenance.sh index ddd273d8dc..6b36f52df7 100755 --- a/t/t7900-maintenance.sh +++ b/t/t7900-maintenance.sh @@ -49,7 +49,9 @@ test_expect_success 'run [--auto|--quiet]' ' git maintenance run --auto 2>/dev/null && GIT_TRACE2_EVENT="$(pwd)/run-no-quiet.txt" \ git maintenance run --no-quiet 2>/dev/null && + git maintenance is-needed && test_subcommand git gc --quiet --no-detach --skip-foreground-tasks <run-no-auto.txt && + ! git maintenance is-needed --auto && test_subcommand ! git gc --auto --quiet --no-detach --skip-foreground-tasks <run-auto.txt && test_subcommand git gc --no-quiet --no-detach --skip-foreground-tasks <run-no-quiet.txt ' @@ -180,6 +182,11 @@ test_expect_success 'commit-graph auto condition' ' test_commit first && + ! git -c maintenance.commit-graph.auto=0 \ + maintenance is-needed --auto --task=commit-graph && + git -c maintenance.commit-graph.auto=1 \ + maintenance is-needed --auto --task=commit-graph && + GIT_TRACE2_EVENT="$(pwd)/cg-zero-means-no.txt" \ git -c maintenance.commit-graph.auto=0 $COMMAND && GIT_TRACE2_EVENT="$(pwd)/cg-one-satisfied.txt" \ @@ -290,16 +297,23 @@ test_expect_success 'maintenance.loose-objects.auto' ' git -c maintenance.loose-objects.auto=1 maintenance \ run --auto --task=loose-objects 2>/dev/null && test_subcommand ! git prune-packed --quiet <trace-lo1.txt && + printf data-A | git hash-object -t blob --stdin -w && + ! git -c maintenance.loose-objects.auto=2 \ + maintenance is-needed --auto --task=loose-objects && GIT_TRACE2_EVENT="$(pwd)/trace-loA" \ git -c maintenance.loose-objects.auto=2 \ maintenance run --auto --task=loose-objects 2>/dev/null && test_subcommand ! git prune-packed --quiet <trace-loA && + printf data-B | git hash-object -t blob --stdin -w && + git -c maintenance.loose-objects.auto=2 \ + maintenance is-needed --auto --task=loose-objects && GIT_TRACE2_EVENT="$(pwd)/trace-loB" \ git -c maintenance.loose-objects.auto=2 \ maintenance run --auto --task=loose-objects 2>/dev/null && test_subcommand git prune-packed --quiet <trace-loB && + GIT_TRACE2_EVENT="$(pwd)/trace-loC" \ git -c maintenance.loose-objects.auto=2 \ maintenance run --auto --task=loose-objects 2>/dev/null && @@ -421,10 +435,13 @@ run_incremental_repack_and_verify () { test_commit A && git repack -adk && git multi-pack-index write && + ! git -c maintenance.incremental-repack.auto=1 \ + maintenance is-needed --auto --task=incremental-repack && GIT_TRACE2_EVENT="$(pwd)/midx-init.txt" git \ -c maintenance.incremental-repack.auto=1 \ maintenance run --auto --task=incremental-repack 2>/dev/null && test_subcommand ! git multi-pack-index write --no-progress <midx-init.txt && + test_commit B && git pack-objects --revs .git/objects/pack/pack <<-\EOF && HEAD @@ -434,11 +451,14 @@ run_incremental_repack_and_verify () { -c maintenance.incremental-repack.auto=2 \ maintenance run --auto --task=incremental-repack 2>/dev/null && test_subcommand ! git multi-pack-index write --no-progress <trace-A && + test_commit C && git pack-objects --revs .git/objects/pack/pack <<-\EOF && HEAD ^HEAD~1 EOF + git -c maintenance.incremental-repack.auto=2 \ + maintenance is-needed --auto --task=incremental-repack && GIT_TRACE2_EVENT=$(pwd)/trace-B git \ -c maintenance.incremental-repack.auto=2 \ maintenance run --auto --task=incremental-repack 2>/dev/null && @@ -465,6 +485,176 @@ test_expect_success 'maintenance.incremental-repack.auto (when config is unset)' ) ' +run_and_verify_geometric_pack () { + EXPECTED_PACKS="$1" && + + # Verify that we perform a geometric repack. + rm -f "trace2.txt" && + GIT_TRACE2_EVENT="$(pwd)/trace2.txt" \ + git maintenance run --task=geometric-repack 2>/dev/null && + test_subcommand git repack -d -l --geometric=2 \ + --quiet --write-midx <trace2.txt && + + # Verify that the number of packfiles matches our expectation. + ls -l .git/objects/pack/*.pack >packfiles && + test_line_count = "$EXPECTED_PACKS" packfiles && + + # And verify that there are no loose objects anymore. + git count-objects -v >count && + test_grep '^count: 0$' count +} + +test_expect_success 'geometric repacking task' ' + test_when_finished "rm -rf repo" && + git init repo && + ( + cd repo && + git config set maintenance.auto false && + test_commit initial && + + # The initial repack causes an all-into-one repack. + GIT_TRACE2_EVENT="$(pwd)/initial-repack.txt" \ + git maintenance run --task=geometric-repack 2>/dev/null && + test_subcommand git repack -d -l --cruft --cruft-expiration=2.weeks.ago \ + --quiet --write-midx <initial-repack.txt && + + # Repacking should now cause a no-op geometric repack because + # no packfiles need to be combined. + ls -l .git/objects/pack/*.pack >before && + run_and_verify_geometric_pack 1 && + ls -l .git/objects/pack/*.pack >after && + test_cmp before after && + + # This incremental change creates a new packfile that only + # soaks up loose objects. The packfiles are not getting merged + # at this point. + test_commit loose && + run_and_verify_geometric_pack 2 && + + # Both packfiles have 3 objects, so the next run would cause us + # to merge all packfiles together. This should be turned into + # an all-into-one-repack. + GIT_TRACE2_EVENT="$(pwd)/all-into-one-repack.txt" \ + git maintenance run --task=geometric-repack 2>/dev/null && + test_subcommand git repack -d -l --cruft --cruft-expiration=2.weeks.ago \ + --quiet --write-midx <all-into-one-repack.txt && + + # The geometric repack soaks up unreachable objects. + echo blob-1 | git hash-object -w --stdin -t blob && + run_and_verify_geometric_pack 2 && + + # A second unreachable object should be written into another packfile. + echo blob-2 | git hash-object -w --stdin -t blob && + run_and_verify_geometric_pack 3 && + + # And these two small packs should now be merged via the + # geometric repack. The large packfile should remain intact. + run_and_verify_geometric_pack 2 && + + # If we now add two more objects and repack twice we should + # then see another all-into-one repack. This time around + # though, as we have unreachable objects, we should also see a + # cruft pack. + echo blob-3 | git hash-object -w --stdin -t blob && + echo blob-4 | git hash-object -w --stdin -t blob && + run_and_verify_geometric_pack 3 && + GIT_TRACE2_EVENT="$(pwd)/cruft-repack.txt" \ + git maintenance run --task=geometric-repack 2>/dev/null && + test_subcommand git repack -d -l --cruft --cruft-expiration=2.weeks.ago \ + --quiet --write-midx <cruft-repack.txt && + ls .git/objects/pack/*.pack >packs && + test_line_count = 2 packs && + ls .git/objects/pack/*.mtimes >cruft && + test_line_count = 1 cruft + ) +' + +test_geometric_repack_needed () { + NEEDED="$1" + GEOMETRIC_CONFIG="$2" && + rm -f trace2.txt && + GIT_TRACE2_EVENT="$(pwd)/trace2.txt" \ + git ${GEOMETRIC_CONFIG:+-c maintenance.geometric-repack.$GEOMETRIC_CONFIG} \ + maintenance run --auto --task=geometric-repack 2>/dev/null && + case "$NEEDED" in + true) + test_grep "\[\"git\",\"repack\"," trace2.txt;; + false) + ! test_grep "\[\"git\",\"repack\"," trace2.txt;; + *) + BUG "invalid parameter: $NEEDED";; + esac +} + +test_expect_success 'geometric repacking with --auto' ' + test_when_finished "rm -rf repo" && + git init repo && + ( + cd repo && + + # An empty repository does not need repacking, except when + # explicitly told to do it. + test_geometric_repack_needed false && + test_geometric_repack_needed false auto=0 && + test_geometric_repack_needed false auto=1 && + test_geometric_repack_needed true auto=-1 && + + test_oid_init && + + # Loose objects cause a repack when crossing the limit. Note + # that the number of objects gets extrapolated by having a look + # at the "objects/17/" shard. + test_commit "$(test_oid blob17_1)" && + test_geometric_repack_needed false && + test_commit "$(test_oid blob17_2)" && + test_geometric_repack_needed false auto=257 && + test_geometric_repack_needed true auto=256 && + + # Force another repack. + test_commit first && + test_commit second && + test_geometric_repack_needed true auto=-1 && + + # We now have two packfiles that would be merged together. As + # such, the repack should always happen unless the user has + # disabled the auto task. + test_geometric_repack_needed false auto=0 && + test_geometric_repack_needed true auto=9000 + ) +' + +test_expect_success 'geometric repacking honors configured split factor' ' + test_when_finished "rm -rf repo" && + git init repo && + ( + cd repo && + git config set maintenance.auto false && + + # Create three different packs with 9, 2 and 1 object, respectively. + # This is done so that only a subset of packs would be merged + # together so that we can verify that `git repack` receives the + # correct geometric factor. + for i in $(test_seq 9) + do + echo first-$i | git hash-object -w --stdin -t blob || return 1 + done && + git repack --geometric=2 -d && + + for i in $(test_seq 2) + do + echo second-$i | git hash-object -w --stdin -t blob || return 1 + done && + git repack --geometric=2 -d && + + echo third | git hash-object -w --stdin -t blob && + git repack --geometric=2 -d && + + test_geometric_repack_needed false splitFactor=2 && + test_geometric_repack_needed true splitFactor=3 && + test_subcommand git repack -d -l --geometric=3 --quiet --write-midx <trace2.txt + ) +' + test_expect_success 'pack-refs task' ' for n in $(test_seq 1 5) do @@ -485,9 +675,15 @@ test_expect_success 'reflog-expire task --auto only packs when exceeding limits' git reflog expire --all --expire=now && test_commit reflog-one && test_commit reflog-two && + + ! git -c maintenance.reflog-expire.auto=3 \ + maintenance is-needed --auto --task=reflog-expire && GIT_TRACE2_EVENT="$(pwd)/reflog-expire-auto.txt" \ git -c maintenance.reflog-expire.auto=3 maintenance run --auto --task=reflog-expire && test_subcommand ! git reflog expire --all <reflog-expire-auto.txt && + + git -c maintenance.reflog-expire.auto=2 \ + maintenance is-needed --auto --task=reflog-expire && GIT_TRACE2_EVENT="$(pwd)/reflog-expire-auto.txt" \ git -c maintenance.reflog-expire.auto=2 maintenance run --auto --task=reflog-expire && test_subcommand git reflog expire --all <reflog-expire-auto.txt @@ -514,6 +710,7 @@ test_expect_success 'worktree-prune task --auto only prunes with prunable worktr test_expect_worktree_prune ! git maintenance run --auto --task=worktree-prune && mkdir .git/worktrees && : >.git/worktrees/abc && + git maintenance is-needed --auto --task=worktree-prune && test_expect_worktree_prune git maintenance run --auto --task=worktree-prune ' @@ -530,22 +727,7 @@ test_expect_success 'worktree-prune task with --auto honors maintenance.worktree test_expect_worktree_prune ! git -c maintenance.worktree-prune.auto=0 maintenance run --auto --task=worktree-prune && # A positive value should require at least this many prunable worktrees. test_expect_worktree_prune ! git -c maintenance.worktree-prune.auto=4 maintenance run --auto --task=worktree-prune && - test_expect_worktree_prune git -c maintenance.worktree-prune.auto=3 maintenance run --auto --task=worktree-prune -' - -test_expect_success 'worktree-prune task with --auto honors maintenance.worktree-prune.auto' ' - # A negative value should always prune. - test_expect_worktree_prune git -c maintenance.worktree-prune.auto=-1 maintenance run --auto --task=worktree-prune && - - mkdir .git/worktrees && - : >.git/worktrees/first && - : >.git/worktrees/second && - : >.git/worktrees/third && - - # Zero should never prune. - test_expect_worktree_prune ! git -c maintenance.worktree-prune.auto=0 maintenance run --auto --task=worktree-prune && - # A positive value should require at least this many prunable worktrees. - test_expect_worktree_prune ! git -c maintenance.worktree-prune.auto=4 maintenance run --auto --task=worktree-prune && + git -c maintenance.worktree-prune.auto=3 maintenance is-needed --auto --task=worktree-prune && test_expect_worktree_prune git -c maintenance.worktree-prune.auto=3 maintenance run --auto --task=worktree-prune ' @@ -554,11 +736,13 @@ test_expect_success 'worktree-prune task honors gc.worktreePruneExpire' ' rm -rf worktree && rm -f worktree-prune.txt && + ! git -c gc.worktreePruneExpire=1.week.ago maintenance is-needed --auto --task=worktree-prune && GIT_TRACE2_EVENT="$(pwd)/worktree-prune.txt" git -c gc.worktreePruneExpire=1.week.ago maintenance run --auto --task=worktree-prune && test_subcommand ! git worktree prune --expire 1.week.ago <worktree-prune.txt && test_path_is_dir .git/worktrees/worktree && rm -f worktree-prune.txt && + git -c gc.worktreePruneExpire=now maintenance is-needed --auto --task=worktree-prune && GIT_TRACE2_EVENT="$(pwd)/worktree-prune.txt" git -c gc.worktreePruneExpire=now maintenance run --auto --task=worktree-prune && test_subcommand git worktree prune --expire now <worktree-prune.txt && test_path_is_missing .git/worktrees/worktree @@ -583,10 +767,13 @@ test_expect_success 'rerere-gc task without --auto always collects garbage' ' test_expect_success 'rerere-gc task with --auto only prunes with prunable entries' ' test_when_finished "rm -rf .git/rr-cache" && + ! git maintenance is-needed --auto --task=rerere-gc && test_expect_rerere_gc ! git maintenance run --auto --task=rerere-gc && mkdir .git/rr-cache && + ! git maintenance is-needed --auto --task=rerere-gc && test_expect_rerere_gc ! git maintenance run --auto --task=rerere-gc && : >.git/rr-cache/entry && + git maintenance is-needed --auto --task=rerere-gc && test_expect_rerere_gc git maintenance run --auto --task=rerere-gc ' @@ -594,17 +781,22 @@ test_expect_success 'rerere-gc task with --auto honors maintenance.rerere-gc.aut test_when_finished "rm -rf .git/rr-cache" && # A negative value should always prune. + git -c maintenance.rerere-gc.auto=-1 maintenance is-needed --auto --task=rerere-gc && test_expect_rerere_gc git -c maintenance.rerere-gc.auto=-1 maintenance run --auto --task=rerere-gc && # A positive value prunes when there is at least one entry. + ! git -c maintenance.rerere-gc.auto=9000 maintenance is-needed --auto --task=rerere-gc && test_expect_rerere_gc ! git -c maintenance.rerere-gc.auto=9000 maintenance run --auto --task=rerere-gc && mkdir .git/rr-cache && + ! git -c maintenance.rerere-gc.auto=9000 maintenance is-needed --auto --task=rerere-gc && test_expect_rerere_gc ! git -c maintenance.rerere-gc.auto=9000 maintenance run --auto --task=rerere-gc && : >.git/rr-cache/entry-1 && + git -c maintenance.rerere-gc.auto=9000 maintenance is-needed --auto --task=rerere-gc && test_expect_rerere_gc git -c maintenance.rerere-gc.auto=9000 maintenance run --auto --task=rerere-gc && # Zero should never prune. : >.git/rr-cache/entry-1 && + ! git -c maintenance.rerere-gc.auto=0 maintenance is-needed --auto --task=rerere-gc && test_expect_rerere_gc ! git -c maintenance.rerere-gc.auto=0 maintenance run --auto --task=rerere-gc ' @@ -716,6 +908,76 @@ test_expect_success 'maintenance.strategy inheritance' ' <modified-daily.txt ' +test_strategy () { + STRATEGY="$1" + shift + + cat >expect && + rm -f trace2.txt && + GIT_TRACE2_EVENT="$(pwd)/trace2.txt" \ + git -c maintenance.strategy=$STRATEGY maintenance run --quiet "$@" && + sed -n 's/{"event":"child_start","sid":"[^/"]*",.*,"argv":\["\(.*\)\"]}/\1/p' <trace2.txt | + sed 's/","/ /g' >actual + test_cmp expect actual +} + +test_expect_success 'maintenance.strategy is respected' ' + test_when_finished "rm -rf repo" && + git init repo && + ( + cd repo && + test_commit initial && + + test_must_fail git -c maintenance.strategy=unknown maintenance run 2>err && + test_grep "unknown maintenance strategy: .unknown." err && + + test_strategy incremental <<-\EOF && + git pack-refs --all --prune + git reflog expire --all + git gc --quiet --no-detach --skip-foreground-tasks + EOF + + test_strategy incremental --schedule=weekly <<-\EOF && + git pack-refs --all --prune + git prune-packed --quiet + git multi-pack-index write --no-progress + git multi-pack-index expire --no-progress + git multi-pack-index repack --no-progress --batch-size=1 + git commit-graph write --split --reachable --no-progress + EOF + + test_strategy gc <<-\EOF && + git pack-refs --all --prune + git reflog expire --all + git gc --quiet --no-detach --skip-foreground-tasks + EOF + + test_strategy gc --schedule=weekly <<-\EOF && + git pack-refs --all --prune + git reflog expire --all + git gc --quiet --no-detach --skip-foreground-tasks + EOF + + test_strategy geometric <<-\EOF && + git pack-refs --all --prune + git reflog expire --all + git repack -d -l --geometric=2 --quiet --write-midx + git commit-graph write --split --reachable --no-progress + git worktree prune --expire 3.months.ago + git rerere gc + EOF + + test_strategy geometric --schedule=weekly <<-\EOF + git pack-refs --all --prune + git reflog expire --all + git repack -d -l --geometric=2 --quiet --write-midx + git commit-graph write --split --reachable --no-progress + git worktree prune --expire 3.months.ago + git rerere gc + EOF + ) +' + test_expect_success 'register and unregister' ' test_when_finished git config --global --unset-all maintenance.repo && @@ -1093,6 +1355,11 @@ test_expect_success 'fails when running outside of a repository' ' nongit test_must_fail git maintenance unregister ' +test_expect_success 'fails when configured to use an invalid strategy' ' + test_must_fail git -c maintenance.strategy=invalid maintenance run --schedule=hourly 2>err && + test_grep "unknown maintenance strategy: .invalid." err +' + test_expect_success 'register and unregister bare repo' ' test_when_finished "git config --global --unset-all maintenance.repo || :" && test_might_fail git config --global --unset-all maintenance.repo && diff --git a/t/t8020-last-modified.sh b/t/t8020-last-modified.sh index 61f00bc15c..a4c1114ee2 100755 --- a/t/t8020-last-modified.sh +++ b/t/t8020-last-modified.sh @@ -57,9 +57,9 @@ test_expect_success 'last-modified recursive' ' test_expect_success 'last-modified recursive with show-trees' ' check_last_modified -r -t <<-\EOF - 3 a 3 a/b 3 a/b/file + 3 a 2 a/file 1 file EOF diff --git a/t/t9300-fast-import.sh b/t/t9300-fast-import.sh index 4dc3d645bf..5685cce6fe 100755 --- a/t/t9300-fast-import.sh +++ b/t/t9300-fast-import.sh @@ -2927,16 +2927,16 @@ test_expect_success 'R: blob appears only once' ' # The error message when a space is missing not at the # end of the line is: # -# Missing space after .. +# missing space after .. # # or when extra characters come after the mark at the end # of the line: # -# Garbage after .. +# garbage after .. # # or when the dataref is neither "inline " or a known SHA1, # -# Invalid dataref .. +# invalid dataref .. # test_expect_success 'S: initialize for S tests' ' test_tick && @@ -3405,15 +3405,15 @@ test_path_fail () { test_path_base_fail () { local change="$1" prefix="$2" field="$3" suffix="$4" - test_path_fail "$change" 'unclosed " in '"$field" "$prefix" '"hello.c' "$suffix" "Invalid $field" - test_path_fail "$change" "invalid escape in quoted $field" "$prefix" '"hello\xff"' "$suffix" "Invalid $field" + test_path_fail "$change" 'unclosed " in '"$field" "$prefix" '"hello.c' "$suffix" "invalid $field" + test_path_fail "$change" "invalid escape in quoted $field" "$prefix" '"hello\xff"' "$suffix" "invalid $field" test_path_fail "$change" "escaped NUL in quoted $field" "$prefix" '"hello\000"' "$suffix" "NUL in $field" } test_path_eol_quoted_fail () { local change="$1" prefix="$2" field="$3" test_path_base_fail "$change" "$prefix" "$field" '' - test_path_fail "$change" "garbage after quoted $field" "$prefix" '"hello.c"' 'x' "Garbage after $field" - test_path_fail "$change" "space after quoted $field" "$prefix" '"hello.c"' ' ' "Garbage after $field" + test_path_fail "$change" "garbage after quoted $field" "$prefix" '"hello.c"' 'x' "garbage after $field" + test_path_fail "$change" "space after quoted $field" "$prefix" '"hello.c"' ' ' "garbage after $field" } test_path_eol_fail () { local change="$1" prefix="$2" field="$3" @@ -3422,8 +3422,8 @@ test_path_eol_fail () { test_path_space_fail () { local change="$1" prefix="$2" field="$3" test_path_base_fail "$change" "$prefix" "$field" ' world.c' - test_path_fail "$change" "missing space after quoted $field" "$prefix" '"hello.c"' 'x world.c' "Missing space after $field" - test_path_fail "$change" "missing space after unquoted $field" "$prefix" 'hello.c' '' "Missing space after $field" + test_path_fail "$change" "missing space after quoted $field" "$prefix" '"hello.c"' 'x world.c' "missing space after $field" + test_path_fail "$change" "missing space after unquoted $field" "$prefix" 'hello.c' '' "missing space after $field" } test_path_eol_fail filemodify 'M 100644 :1 ' path @@ -3820,7 +3820,7 @@ test_expect_success 'X: replace ref that becomes useless is removed' ' sed -e s/othername/somename/ tmp >tmp2 && git fast-import --force <tmp2 2>msgs && - grep "Dropping.*since it would point to itself" msgs && + grep "dropping.*since it would point to itself" msgs && git show-ref >refs && ! grep refs/replace refs ) diff --git a/t/unit-tests/u-reftable-stack.c b/t/unit-tests/u-reftable-stack.c index a8b91812e8..b8110cdeee 100644 --- a/t/unit-tests/u-reftable-stack.c +++ b/t/unit-tests/u-reftable-stack.c @@ -1067,6 +1067,7 @@ void test_reftable_stack__add_performs_auto_compaction(void) .value_type = REFTABLE_REF_SYMREF, .value.symref = (char *) "master", }; + bool required = false; char buf[128]; /* @@ -1087,10 +1088,17 @@ void test_reftable_stack__add_performs_auto_compaction(void) * auto compaction is disabled. When enabled, we should merge * all tables in the stack. */ - if (i != n) + cl_assert_equal_i(reftable_stack_compaction_required(st, true, &required), 0); + if (i != n) { cl_assert_equal_i(st->merged->tables_len, i + 1); - else + if (i < 1) + cl_assert_equal_b(required, false); + else + cl_assert_equal_b(required, true); + } else { cl_assert_equal_i(st->merged->tables_len, 1); + cl_assert_equal_b(required, false); + } } reftable_stack_destroy(st); @@ -94,18 +94,6 @@ struct object *deref_tag(struct repository *r, struct object *o, const char *war return o; } -struct object *deref_tag_noverify(struct repository *r, struct object *o) -{ - while (o && o->type == OBJ_TAG) { - o = parse_object(r, &o->oid); - if (o && o->type == OBJ_TAG && ((struct tag *)o)->tagged) - o = ((struct tag *)o)->tagged; - else - o = NULL; - } - return o; -} - struct tag *lookup_tag(struct repository *r, const struct object_id *oid) { struct object *obj = lookup_object(r, oid); @@ -16,7 +16,6 @@ int parse_tag_buffer(struct repository *r, struct tag *item, const void *data, u int parse_tag(struct tag *item); void release_tag_memory(struct tag *t); struct object *deref_tag(struct repository *r, struct object *, const char *, int); -struct object *deref_tag_noverify(struct repository *r, struct object *); int gpg_verify_tag(const struct object_id *oid, const char *name_to_report, unsigned flags); struct object_id *get_tagged_oid(struct tag *tag); diff --git a/upload-pack.c b/upload-pack.c index 1e87ae9559..2d2b70cbf2 100644 --- a/upload-pack.c +++ b/upload-pack.c @@ -870,8 +870,8 @@ static void send_unshallow(struct upload_pack_data *data) } } -static int check_ref(const char *refname_full, const char *referent UNUSED, const struct object_id *oid, - int flag, void *cb_data); +static int check_ref(const struct reference *ref, void *cb_data); + static void deepen(struct upload_pack_data *data, int depth) { if (depth == INFINITE_DEPTH && !is_repository_shallow(the_repository)) { @@ -1224,13 +1224,12 @@ static int mark_our_ref(const char *refname, const char *refname_full, return 0; } -static int check_ref(const char *refname_full, const char *referent UNUSED,const struct object_id *oid, - int flag UNUSED, void *cb_data) +static int check_ref(const struct reference *ref, void *cb_data) { - const char *refname = strip_namespace(refname_full); + const char *refname = strip_namespace(ref->name); struct upload_pack_data *data = cb_data; - mark_our_ref(refname, refname_full, oid, &data->hidden_refs); + mark_our_ref(refname, ref->name, ref->oid, &data->hidden_refs); return 0; } @@ -1250,15 +1249,15 @@ static void format_session_id(struct strbuf *buf, struct upload_pack_data *d) { } static void write_v0_ref(struct upload_pack_data *data, - const char *refname, const char *refname_nons, - const struct object_id *oid) + const struct reference *ref, + const char *refname_nons) { static const char *capabilities = "multi_ack thin-pack side-band" " side-band-64k ofs-delta shallow deepen-since deepen-not" " deepen-relative no-progress include-tag multi_ack_detailed"; struct object_id peeled; - if (mark_our_ref(refname_nons, refname, oid, &data->hidden_refs)) + if (mark_our_ref(refname_nons, ref->name, ref->oid, &data->hidden_refs)) return; if (capabilities) { @@ -1268,7 +1267,7 @@ static void write_v0_ref(struct upload_pack_data *data, format_symref_info(&symref_info, &data->symref); format_session_id(&session_id, data); packet_fwrite_fmt(stdout, "%s %s%c%s%s%s%s%s%s%s object-format=%s agent=%s\n", - oid_to_hex(oid), refname_nons, + oid_to_hex(ref->oid), refname_nons, 0, capabilities, (data->allow_uor & ALLOW_TIP_SHA1) ? " allow-tip-sha1-in-want" : "", @@ -1284,35 +1283,33 @@ static void write_v0_ref(struct upload_pack_data *data, strbuf_release(&session_id); data->sent_capabilities = 1; } else { - packet_fwrite_fmt(stdout, "%s %s\n", oid_to_hex(oid), refname_nons); + packet_fwrite_fmt(stdout, "%s %s\n", oid_to_hex(ref->oid), refname_nons); } capabilities = NULL; - if (!peel_iterated_oid(the_repository, oid, &peeled)) + if (!reference_get_peeled_oid(the_repository, ref, &peeled)) packet_fwrite_fmt(stdout, "%s %s^{}\n", oid_to_hex(&peeled), refname_nons); return; } -static int send_ref(const char *refname, const char *referent UNUSED, const struct object_id *oid, - int flag UNUSED, void *cb_data) +static int send_ref(const struct reference *ref, void *cb_data) { - write_v0_ref(cb_data, refname, strip_namespace(refname), oid); + write_v0_ref(cb_data, ref, strip_namespace(ref->name)); return 0; } -static int find_symref(const char *refname, const char *referent UNUSED, - const struct object_id *oid UNUSED, - int flag, void *cb_data) +static int find_symref(const struct reference *ref, void *cb_data) { const char *symref_target; struct string_list_item *item; + int flag; - if ((flag & REF_ISSYMREF) == 0) + if ((ref->flags & REF_ISSYMREF) == 0) return 0; symref_target = refs_resolve_ref_unsafe(get_main_ref_store(the_repository), - refname, 0, NULL, &flag); + ref->name, 0, NULL, &flag); if (!symref_target || (flag & REF_ISSYMREF) == 0) - die("'%s' is a symref but it is not?", refname); - item = string_list_append(cb_data, strip_namespace(refname)); + die("'%s' is a symref but it is not?", ref->name); + item = string_list_append(cb_data, strip_namespace(ref->name)); item->util = xstrdup(strip_namespace(symref_target)); return 0; } @@ -1445,8 +1442,12 @@ void upload_pack(const int advertise_refs, const int stateless_rpc, send_ref, &data); for_each_namespaced_ref_1(send_ref, &data); if (!data.sent_capabilities) { - const char *refname = "capabilities^{}"; - write_v0_ref(&data, refname, refname, null_oid(the_hash_algo)); + struct reference ref = { + .name = "capabilities^{}", + .oid = null_oid(the_hash_algo), + }; + + write_v0_ref(&data, &ref, ref.name); } /* * fflush stdout before calling advertise_shallow_grafts because send_ref @@ -226,14 +226,10 @@ static int interpret_target(struct walker *walker, char *target, struct object_i return -1; } -static int mark_complete(const char *path UNUSED, - const char *referent UNUSED, - const struct object_id *oid, - int flag UNUSED, - void *cb_data UNUSED) +static int mark_complete(const struct reference *ref, void *cb_data UNUSED) { struct commit *commit = lookup_commit_reference_gently(the_repository, - oid, 1); + ref->oid, 1); if (commit) { commit->object.flags |= COMPLETE; diff --git a/worktree.c b/worktree.c index a2a5f51f29..9308389cb6 100644 --- a/worktree.c +++ b/worktree.c @@ -595,8 +595,15 @@ int other_head_refs(each_ref_fn fn, void *cb_data) if (refs_resolve_ref_unsafe(get_main_ref_store(the_repository), refname.buf, RESOLVE_REF_READING, - &oid, &flag)) - ret = fn(refname.buf, NULL, &oid, flag, cb_data); + &oid, &flag)) { + struct reference ref = { + .name = refname.buf, + .oid = &oid, + .flags = flag, + }; + + ret = fn(&ref, cb_data); + } if (ret) break; } |