development/git
development/git
1
0
Fork 0
mirror of https://github.com/git/git synced 2024-10-30 14:03:28 +00:00
Code Issues Projects Releases Packages Wiki Activity
git/po/git.pot
Jiang Xin bb2ba06fd3 l10n: Update one message in git.pot 
This update comes from commit v1.7.12-rc1-18-ge0453
(merge-recursive: separate message for common ancestors).

Signed-off-by: Jiang Xin <worldhello.net@gmail.com>
2012-08-06 23:48:08 +08:00

5694 lines
108 KiB
Text
Raw Blame History

# SOME DESCRIPTIVE TITLE.
# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
# This file is distributed under the same license as the PACKAGE package.
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
#
#, fuzzy
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n"
"POT-Creation-Date: 2012-08-06 23:47+0800\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
"Language: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=CHARSET\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
#: advice.c:40
#, c-format
msgid "hint: %.*s\n"
msgstr ""
#.
#. * Message used both when 'git commit' fails and when
#. * other commands doing a merge do.
#.
#: advice.c:70
msgid ""
"Fix them up in the work tree,\n"
"and then use 'git add/rm <file>' as\n"
"appropriate to mark resolution and make a commit,\n"
"or use 'git commit -a'."
msgstr ""
#: bundle.c:36
#, c-format
msgid "'%s' does not look like a v2 bundle file"
msgstr ""
#: bundle.c:63
#, c-format
msgid "unrecognized header: %s%s (%d)"
msgstr ""
#: bundle.c:89 builtin/commit.c:699
#, c-format
msgid "could not open '%s'"
msgstr ""
#: bundle.c:140
msgid "Repository lacks these prerequisite commits:"
msgstr ""
#: bundle.c:164 sequencer.c:550 sequencer.c:982 builtin/log.c:290
#: builtin/log.c:726 builtin/log.c:1316 builtin/log.c:1535 builtin/merge.c:347
#: builtin/shortlog.c:181
msgid "revision walk setup failed"
msgstr ""
#: bundle.c:186
#, c-format
msgid "The bundle contains %d ref"
msgid_plural "The bundle contains %d refs"
msgstr[0] ""
msgstr[1] ""
#: bundle.c:192
msgid "The bundle records a complete history."
msgstr ""
#: bundle.c:195
#, c-format
msgid "The bundle requires this ref"
msgid_plural "The bundle requires these %d refs"
msgstr[0] ""
msgstr[1] ""
#: bundle.c:294
msgid "rev-list died"
msgstr ""
#: bundle.c:300 builtin/log.c:1212 builtin/shortlog.c:284
#, c-format
msgid "unrecognized argument: %s"
msgstr ""
#: bundle.c:335
#, c-format
msgid "ref '%s' is excluded by the rev-list options"
msgstr ""
#: bundle.c:380
msgid "Refusing to create empty bundle."
msgstr ""
#: bundle.c:398
msgid "Could not spawn pack-objects"
msgstr ""
#: bundle.c:416
msgid "pack-objects died"
msgstr ""
#: bundle.c:419
#, c-format
msgid "cannot create '%s'"
msgstr ""
#: bundle.c:441
msgid "index-pack died"
msgstr ""
#: commit.c:48
#, c-format
msgid "could not parse %s"
msgstr ""
#: commit.c:50
#, c-format
msgid "%s %s is not a commit!"
msgstr ""
#: compat/obstack.c:406 compat/obstack.c:408
msgid "memory exhausted"
msgstr ""
#: connected.c:39
msgid "Could not run 'git rev-list'"
msgstr ""
#: connected.c:48
#, c-format
msgid "failed write to rev-list: %s"
msgstr ""
#: connected.c:56
#, c-format
msgid "failed to close rev-list's stdin: %s"
msgstr ""
#: date.c:95
msgid "in the future"
msgstr ""
#: date.c:101
#, c-format
msgid "%lu second ago"
msgid_plural "%lu seconds ago"
msgstr[0] ""
msgstr[1] ""
#: date.c:108
#, c-format
msgid "%lu minute ago"
msgid_plural "%lu minutes ago"
msgstr[0] ""
msgstr[1] ""
#: date.c:115
#, c-format
msgid "%lu hour ago"
msgid_plural "%lu hours ago"
msgstr[0] ""
msgstr[1] ""
#: date.c:122
#, c-format
msgid "%lu day ago"
msgid_plural "%lu days ago"
msgstr[0] ""
msgstr[1] ""
#: date.c:128
#, c-format
msgid "%lu week ago"
msgid_plural "%lu weeks ago"
msgstr[0] ""
msgstr[1] ""
#: date.c:135
#, c-format
msgid "%lu month ago"
msgid_plural "%lu months ago"
msgstr[0] ""
msgstr[1] ""
#: date.c:146
#, c-format
msgid "%lu year"
msgid_plural "%lu years"
msgstr[0] ""
msgstr[1] ""
#: date.c:149
#, c-format
msgid "%s, %lu month ago"
msgid_plural "%s, %lu months ago"
msgstr[0] ""
msgstr[1] ""
#: date.c:154 date.c:159
#, c-format
msgid "%lu year ago"
msgid_plural "%lu years ago"
msgstr[0] ""
msgstr[1] ""
#: diff.c:105
#, c-format
msgid " Failed to parse dirstat cut-off percentage '%.*s'\n"
msgstr ""
#: diff.c:110
#, c-format
msgid " Unknown dirstat parameter '%.*s'\n"
msgstr ""
#: diff.c:210
#, c-format
msgid ""
"Found errors in 'diff.dirstat' config variable:\n"
"%s"
msgstr ""
#: diff.c:1400
msgid " 0 files changed"
msgstr ""
#: diff.c:1404
#, c-format
msgid " %d file changed"
msgid_plural " %d files changed"
msgstr[0] ""
msgstr[1] ""
#: diff.c:1421
#, c-format
msgid ", %d insertion(+)"
msgid_plural ", %d insertions(+)"
msgstr[0] ""
msgstr[1] ""
#: diff.c:1432
#, c-format
msgid ", %d deletion(-)"
msgid_plural ", %d deletions(-)"
msgstr[0] ""
msgstr[1] ""
#: diff.c:3461
#, c-format
msgid ""
"Failed to parse --dirstat/-X option parameter:\n"
"%s"
msgstr ""
#: gpg-interface.c:59
msgid "could not run gpg."
msgstr ""
#: gpg-interface.c:71
msgid "gpg did not accept the data"
msgstr ""
#: gpg-interface.c:82
msgid "gpg failed to sign the data"
msgstr ""
#: grep.c:1320
#, c-format
msgid "'%s': unable to read %s"
msgstr ""
#: grep.c:1337
#, c-format
msgid "'%s': %s"
msgstr ""
#: grep.c:1348
#, c-format
msgid "'%s': short read %s"
msgstr ""
#: help.c:212
#, c-format
msgid "available git commands in '%s'"
msgstr ""
#: help.c:219
msgid "git commands available from elsewhere on your $PATH"
msgstr ""
#: help.c:275
#, c-format
msgid ""
"'%s' appears to be a git command, but we were not\n"
"able to execute it. Maybe git-%s is broken?"
msgstr ""
#: help.c:332
msgid "Uh oh. Your system reports no Git commands at all."
msgstr ""
#: help.c:354
#, c-format
msgid ""
"WARNING: You called a Git command named '%s', which does not exist.\n"
"Continuing under the assumption that you meant '%s'"
msgstr ""
#: help.c:359
#, c-format
msgid "in %0.1f seconds automatically..."
msgstr ""
#: help.c:366
#, c-format
msgid "git: '%s' is not a git command. See 'git --help'."
msgstr ""
#: help.c:370
msgid ""
"\n"
"Did you mean this?"
msgid_plural ""
"\n"
"Did you mean one of these?"
msgstr[0] ""
msgstr[1] ""
#: merge-recursive.c:190
#, c-format
msgid "(bad commit)\n"
msgstr ""
#: merge-recursive.c:206
#, c-format
msgid "addinfo_cache failed for path '%s'"
msgstr ""
#: merge-recursive.c:268
msgid "error building trees"
msgstr ""
#: merge-recursive.c:497
msgid "diff setup failed"
msgstr ""
#: merge-recursive.c:627
msgid "merge-recursive: disk full?"
msgstr ""
#: merge-recursive.c:690
#, c-format
msgid "failed to create path '%s'%s"
msgstr ""
#: merge-recursive.c:701
#, c-format
msgid "Removing %s to make room for subdirectory\n"
msgstr ""
#. something else exists
#. .. but not some other error (who really cares what?)
#: merge-recursive.c:715 merge-recursive.c:736
msgid ": perhaps a D/F conflict?"
msgstr ""
#: merge-recursive.c:726
#, c-format
msgid "refusing to lose untracked file at '%s'"
msgstr ""
#: merge-recursive.c:766
#, c-format
msgid "cannot read object %s '%s'"
msgstr ""
#: merge-recursive.c:768
#, c-format
msgid "blob expected for %s '%s'"
msgstr ""
#: merge-recursive.c:791 builtin/clone.c:302
#, c-format
msgid "failed to open '%s'"
msgstr ""
#: merge-recursive.c:799
#, c-format
msgid "failed to symlink '%s'"
msgstr ""
#: merge-recursive.c:802
#, c-format
msgid "do not know what to do with %06o %s '%s'"
msgstr ""
#: merge-recursive.c:939
msgid "Failed to execute internal merge"
msgstr ""
#: merge-recursive.c:943
#, c-format
msgid "Unable to add %s to database"
msgstr ""
#: merge-recursive.c:959
msgid "unsupported object type in the tree"
msgstr ""
#: merge-recursive.c:1038 merge-recursive.c:1052
#, c-format
msgid ""
"CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
"in tree."
msgstr ""
#: merge-recursive.c:1044 merge-recursive.c:1057
#, c-format
msgid ""
"CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
"in tree at %s."
msgstr ""
#: merge-recursive.c:1098
msgid "rename"
msgstr ""
#: merge-recursive.c:1098
msgid "renamed"
msgstr ""
#: merge-recursive.c:1154
#, c-format
msgid "%s is a directory in %s adding as %s instead"
msgstr ""
#: merge-recursive.c:1176
#, c-format
msgid ""
"CONFLICT (rename/rename): Rename \"%s\"->\"%s\" in branch \"%s\" rename \"%s"
"\"->\"%s\" in \"%s\"%s"
msgstr ""
#: merge-recursive.c:1181
msgid " (left unresolved)"
msgstr ""
#: merge-recursive.c:1235
#, c-format
msgid "CONFLICT (rename/rename): Rename %s->%s in %s. Rename %s->%s in %s"
msgstr ""
#: merge-recursive.c:1265
#, c-format
msgid "Renaming %s to %s and %s to %s instead"
msgstr ""
#: merge-recursive.c:1464
#, c-format
msgid "CONFLICT (rename/add): Rename %s->%s in %s. %s added in %s"
msgstr ""
#: merge-recursive.c:1474
#, c-format
msgid "Adding merged %s"
msgstr ""
#: merge-recursive.c:1479 merge-recursive.c:1677
#, c-format
msgid "Adding as %s instead"
msgstr ""
#: merge-recursive.c:1530
#, c-format
msgid "cannot read object %s"
msgstr ""
#: merge-recursive.c:1533
#, c-format
msgid "object %s is not a blob"
msgstr ""
#: merge-recursive.c:1581
msgid "modify"
msgstr ""
#: merge-recursive.c:1581
msgid "modified"
msgstr ""
#: merge-recursive.c:1591
msgid "content"
msgstr ""
#: merge-recursive.c:1598
msgid "add/add"
msgstr ""
#: merge-recursive.c:1632
#, c-format
msgid "Skipped %s (merged same as existing)"
msgstr ""
#: merge-recursive.c:1646
#, c-format
msgid "Auto-merging %s"
msgstr ""
#: merge-recursive.c:1650 git-submodule.sh:844
msgid "submodule"
msgstr ""
#: merge-recursive.c:1651
#, c-format
msgid "CONFLICT (%s): Merge conflict in %s"
msgstr ""
#: merge-recursive.c:1741
#, c-format
msgid "Removing %s"
msgstr ""
#: merge-recursive.c:1766
msgid "file/directory"
msgstr ""
#: merge-recursive.c:1772
msgid "directory/file"
msgstr ""
#: merge-recursive.c:1777
#, c-format
msgid "CONFLICT (%s): There is a directory with name %s in %s. Adding %s as %s"
msgstr ""
#: merge-recursive.c:1787
#, c-format
msgid "Adding %s"
msgstr ""
#: merge-recursive.c:1804
msgid "Fatal merge failure, shouldn't happen."
msgstr ""
#: merge-recursive.c:1823
msgid "Already up-to-date!"
msgstr ""
#: merge-recursive.c:1832
#, c-format
msgid "merging of trees %s and %s failed"
msgstr ""
#: merge-recursive.c:1862
#, c-format
msgid "Unprocessed path??? %s"
msgstr ""
#: merge-recursive.c:1907
msgid "Merging:"
msgstr ""
#: merge-recursive.c:1920
#, c-format
msgid "found %u common ancestor:"
msgid_plural "found %u common ancestors:"
msgstr[0] ""
msgstr[1] ""
#: merge-recursive.c:1957
msgid "merge returned no commit"
msgstr ""
#: merge-recursive.c:2014
#, c-format
msgid "Could not parse object '%s'"
msgstr ""
#: merge-recursive.c:2026 builtin/merge.c:697
msgid "Unable to write index."
msgstr ""
#: parse-options.c:494
msgid "..."
msgstr ""
#: parse-options.c:512
#, c-format
msgid "usage: %s"
msgstr ""
#. TRANSLATORS: the colon here should align with the
#. one in "usage: %s" translation
#: parse-options.c:516
#, c-format
msgid " or: %s"
msgstr ""
#: parse-options.c:519
#, c-format
msgid " %s"
msgstr ""
#: remote.c:1632
#, c-format
msgid "Your branch is ahead of '%s' by %d commit.\n"
msgid_plural "Your branch is ahead of '%s' by %d commits.\n"
msgstr[0] ""
msgstr[1] ""
#: remote.c:1638
#, c-format
msgid "Your branch is behind '%s' by %d commit, and can be fast-forwarded.\n"
msgid_plural ""
"Your branch is behind '%s' by %d commits, and can be fast-forwarded.\n"
msgstr[0] ""
msgstr[1] ""
#: remote.c:1646
#, c-format
msgid ""
"Your branch and '%s' have diverged,\n"
"and have %d and %d different commit each, respectively.\n"
msgid_plural ""
"Your branch and '%s' have diverged,\n"
"and have %d and %d different commits each, respectively.\n"
msgstr[0] ""
msgstr[1] ""
#: sequencer.c:121 builtin/merge.c:865 builtin/merge.c:978
#: builtin/merge.c:1088 builtin/merge.c:1098
#, c-format
msgid "Could not open '%s' for writing"
msgstr ""
#: sequencer.c:123 builtin/merge.c:333 builtin/merge.c:868
#: builtin/merge.c:1090 builtin/merge.c:1103
#, c-format
msgid "Could not write to '%s'"
msgstr ""
#: sequencer.c:144
msgid ""
"after resolving the conflicts, mark the corrected paths\n"
"with 'git add <paths>' or 'git rm <paths>'"
msgstr ""
#: sequencer.c:147
msgid ""
"after resolving the conflicts, mark the corrected paths\n"
"with 'git add <paths>' or 'git rm <paths>'\n"
"and commit the result with 'git commit'"
msgstr ""
#: sequencer.c:160 sequencer.c:758 sequencer.c:841
#, c-format
msgid "Could not write to %s"
msgstr ""
#: sequencer.c:163
#, c-format
msgid "Error wrapping up %s"
msgstr ""
#: sequencer.c:178
msgid "Your local changes would be overwritten by cherry-pick."
msgstr ""
#: sequencer.c:180
msgid "Your local changes would be overwritten by revert."
msgstr ""
#: sequencer.c:183
msgid "Commit your changes or stash them to proceed."
msgstr ""
#. TRANSLATORS: %s will be "revert" or "cherry-pick"
#: sequencer.c:233
#, c-format
msgid "%s: Unable to write new index file"
msgstr ""
#: sequencer.c:261
msgid "Could not resolve HEAD commit\n"
msgstr ""
#: sequencer.c:282
msgid "Unable to update cache tree\n"
msgstr ""
#: sequencer.c:324
#, c-format
msgid "Could not parse commit %s\n"
msgstr ""
#: sequencer.c:329
#, c-format
msgid "Could not parse parent commit %s\n"
msgstr ""
#: sequencer.c:395
msgid "Your index file is unmerged."
msgstr ""
#: sequencer.c:398
msgid "You do not have a valid HEAD"
msgstr ""
#: sequencer.c:413
#, c-format
msgid "Commit %s is a merge but no -m option was given."
msgstr ""
#: sequencer.c:421
#, c-format
msgid "Commit %s does not have parent %d"
msgstr ""
#: sequencer.c:425
#, c-format
msgid "Mainline was specified but commit %s is not a merge."
msgstr ""
#. TRANSLATORS: The first %s will be "revert" or
#. "cherry-pick", the second %s a SHA1
#: sequencer.c:436
#, c-format
msgid "%s: cannot parse parent commit %s"
msgstr ""
#: sequencer.c:440
#, c-format
msgid "Cannot get commit message for %s"
msgstr ""
#: sequencer.c:524
#, c-format
msgid "could not revert %s... %s"
msgstr ""
#: sequencer.c:525
#, c-format
msgid "could not apply %s... %s"
msgstr ""
#: sequencer.c:553
msgid "empty commit set passed"
msgstr ""
#: sequencer.c:561
#, c-format
msgid "git %s: failed to read the index"
msgstr ""
#: sequencer.c:566
#, c-format
msgid "git %s: failed to refresh the index"
msgstr ""
#: sequencer.c:624
#, c-format
msgid "Cannot %s during a %s"
msgstr ""
#: sequencer.c:646
#, c-format
msgid "Could not parse line %d."
msgstr ""
#: sequencer.c:651
msgid "No commits parsed."
msgstr ""
#: sequencer.c:664
#, c-format
msgid "Could not open %s"
msgstr ""
#: sequencer.c:668
#, c-format
msgid "Could not read %s."
msgstr ""
#: sequencer.c:675
#, c-format
msgid "Unusable instruction sheet: %s"
msgstr ""
#: sequencer.c:703
#, c-format
msgid "Invalid key: %s"
msgstr ""
#: sequencer.c:706
#, c-format
msgid "Invalid value for %s: %s"
msgstr ""
#: sequencer.c:718
#, c-format
msgid "Malformed options sheet: %s"
msgstr ""
#: sequencer.c:739
msgid "a cherry-pick or revert is already in progress"
msgstr ""
#: sequencer.c:740
msgid "try \"git cherry-pick (--continue | --quit | --abort)\""
msgstr ""
#: sequencer.c:744
#, c-format
msgid "Could not create sequencer directory %s"
msgstr ""
#: sequencer.c:760 sequencer.c:845
#, c-format
msgid "Error wrapping up %s."
msgstr ""
#: sequencer.c:779 sequencer.c:913
msgid "no cherry-pick or revert in progress"
msgstr ""
#: sequencer.c:781
msgid "cannot resolve HEAD"
msgstr ""
#: sequencer.c:783
msgid "cannot abort from a branch yet to be born"
msgstr ""
#: sequencer.c:805 builtin/apply.c:3988
#, c-format
msgid "cannot open %s: %s"
msgstr ""
#: sequencer.c:808
#, c-format
msgid "cannot read %s: %s"
msgstr ""
#: sequencer.c:809
msgid "unexpected end of file"
msgstr ""
#: sequencer.c:815
#, c-format
msgid "stored pre-cherry-pick HEAD file '%s' is corrupt"
msgstr ""
#: sequencer.c:838
#, c-format
msgid "Could not format %s."
msgstr ""
#: sequencer.c:1000
msgid "Can't revert as initial commit"
msgstr ""
#: sequencer.c:1001
msgid "Can't cherry-pick into empty head"
msgstr ""
#: sha1_name.c:1044
msgid "HEAD does not point to a branch"
msgstr ""
#: sha1_name.c:1047
#, c-format
msgid "No such branch: '%s'"
msgstr ""
#: sha1_name.c:1049
#, c-format
msgid "No upstream configured for branch '%s'"
msgstr ""
#: sha1_name.c:1052
#, c-format
msgid "Upstream branch '%s' not stored as a remote-tracking branch"
msgstr ""
#: wrapper.c:413
#, c-format
msgid "unable to look up current user in the passwd file: %s"
msgstr ""
#: wrapper.c:414
msgid "no such user"
msgstr ""
#: wt-status.c:140
msgid "Unmerged paths:"
msgstr ""
#: wt-status.c:167 wt-status.c:194
#, c-format
msgid " (use \"git reset %s <file>...\" to unstage)"
msgstr ""
#: wt-status.c:169 wt-status.c:196
msgid " (use \"git rm --cached <file>...\" to unstage)"
msgstr ""
#: wt-status.c:173
msgid " (use \"git add <file>...\" to mark resolution)"
msgstr ""
#: wt-status.c:175 wt-status.c:179
msgid " (use \"git add/rm <file>...\" as appropriate to mark resolution)"
msgstr ""
#: wt-status.c:177
msgid " (use \"git rm <file>...\" to mark resolution)"
msgstr ""
#: wt-status.c:188
msgid "Changes to be committed:"
msgstr ""
#: wt-status.c:206
msgid "Changes not staged for commit:"
msgstr ""
#: wt-status.c:210
msgid " (use \"git add <file>...\" to update what will be committed)"
msgstr ""
#: wt-status.c:212
msgid " (use \"git add/rm <file>...\" to update what will be committed)"
msgstr ""
#: wt-status.c:213
msgid ""
" (use \"git checkout -- <file>...\" to discard changes in working directory)"
msgstr ""
#: wt-status.c:215
msgid " (commit or discard the untracked or modified content in submodules)"
msgstr ""
#: wt-status.c:224
#, c-format
msgid "%s files:"
msgstr ""
#: wt-status.c:227
#, c-format
msgid " (use \"git %s <file>...\" to include in what will be committed)"
msgstr ""
#: wt-status.c:244
msgid "bug"
msgstr ""
#: wt-status.c:249
msgid "both deleted:"
msgstr ""
#: wt-status.c:250
msgid "added by us:"
msgstr ""
#: wt-status.c:251
msgid "deleted by them:"
msgstr ""
#: wt-status.c:252
msgid "added by them:"
msgstr ""
#: wt-status.c:253
msgid "deleted by us:"
msgstr ""
#: wt-status.c:254
msgid "both added:"
msgstr ""
#: wt-status.c:255
msgid "both modified:"
msgstr ""
#: wt-status.c:285
msgid "new commits, "
msgstr ""
#: wt-status.c:287
msgid "modified content, "
msgstr ""
#: wt-status.c:289
msgid "untracked content, "
msgstr ""
#: wt-status.c:303
#, c-format
msgid "new file: %s"
msgstr ""
#: wt-status.c:306
#, c-format
msgid "copied: %s -> %s"
msgstr ""
#: wt-status.c:309
#, c-format
msgid "deleted: %s"
msgstr ""
#: wt-status.c:312
#, c-format
msgid "modified: %s"
msgstr ""
#: wt-status.c:315
#, c-format
msgid "renamed: %s -> %s"
msgstr ""
#: wt-status.c:318
#, c-format
msgid "typechange: %s"
msgstr ""
#: wt-status.c:321
#, c-format
msgid "unknown: %s"
msgstr ""
#: wt-status.c:324
#, c-format
msgid "unmerged: %s"
msgstr ""
#: wt-status.c:327
#, c-format
msgid "bug: unhandled diff status %c"
msgstr ""
#: wt-status.c:785
msgid "You have unmerged paths."
msgstr ""
#: wt-status.c:788 wt-status.c:912
msgid " (fix conflicts and run \"git commit\")"
msgstr ""
#: wt-status.c:791
msgid "All conflicts fixed but you are still merging."
msgstr ""
#: wt-status.c:794
msgid " (use \"git commit\" to conclude merge)"
msgstr ""
#: wt-status.c:804
msgid "You are in the middle of an am session."
msgstr ""
#: wt-status.c:807
msgid "The current patch is empty."
msgstr ""
#: wt-status.c:811
msgid " (fix conflicts and then run \"git am --resolved\")"
msgstr ""
#: wt-status.c:813
msgid " (use \"git am --skip\" to skip this patch)"
msgstr ""
#: wt-status.c:815
msgid " (use \"git am --abort\" to restore the original branch)"
msgstr ""
#: wt-status.c:873 wt-status.c:883
msgid "You are currently rebasing."
msgstr ""
#: wt-status.c:876
msgid " (fix conflicts and then run \"git rebase --continue\")"
msgstr ""
#: wt-status.c:878
msgid " (use \"git rebase --skip\" to skip this patch)"
msgstr ""
#: wt-status.c:880
msgid " (use \"git rebase --abort\" to check out the original branch)"
msgstr ""
#: wt-status.c:886
msgid " (all conflicts fixed: run \"git rebase --continue\")"
msgstr ""
#: wt-status.c:888
msgid "You are currently splitting a commit during a rebase."
msgstr ""
#: wt-status.c:891
msgid " (Once your working directory is clean, run \"git rebase --continue\")"
msgstr ""
#: wt-status.c:893
msgid "You are currently editing a commit during a rebase."
msgstr ""
#: wt-status.c:896
msgid " (use \"git commit --amend\" to amend the current commit)"
msgstr ""
#: wt-status.c:898
msgid ""
" (use \"git rebase --continue\" once you are satisfied with your changes)"
msgstr ""
#: wt-status.c:908
msgid "You are currently cherry-picking."
msgstr ""
#: wt-status.c:915
msgid " (all conflicts fixed: run \"git commit\")"
msgstr ""
#: wt-status.c:924
msgid "You are currently bisecting."
msgstr ""
#: wt-status.c:927
msgid " (use \"git bisect reset\" to get back to the original branch)"
msgstr ""
#: wt-status.c:978
msgid "On branch "
msgstr ""
#: wt-status.c:985
msgid "Not currently on any branch."
msgstr ""
#: wt-status.c:997
msgid "Initial commit"
msgstr ""
#: wt-status.c:1011
msgid "Untracked"
msgstr ""
#: wt-status.c:1013
msgid "Ignored"
msgstr ""
#: wt-status.c:1015
#, c-format
msgid "Untracked files not listed%s"
msgstr ""
#: wt-status.c:1017
msgid " (use -u option to show untracked files)"
msgstr ""
#: wt-status.c:1023
msgid "No changes"
msgstr ""
#: wt-status.c:1027
#, c-format
msgid "no changes added to commit%s\n"
msgstr ""
#: wt-status.c:1029
msgid " (use \"git add\" and/or \"git commit -a\")"
msgstr ""
#: wt-status.c:1031
#, c-format
msgid "nothing added to commit but untracked files present%s\n"
msgstr ""
#: wt-status.c:1033
msgid " (use \"git add\" to track)"
msgstr ""
#: wt-status.c:1035 wt-status.c:1038 wt-status.c:1041
#, c-format
msgid "nothing to commit%s\n"
msgstr ""
#: wt-status.c:1036
msgid " (create/copy files and use \"git add\" to track)"
msgstr ""
#: wt-status.c:1039
msgid " (use -u to show untracked files)"
msgstr ""
#: wt-status.c:1042
msgid " (working directory clean)"
msgstr ""
#: wt-status.c:1150
msgid "HEAD (no branch)"
msgstr ""
#: wt-status.c:1156
msgid "Initial commit on "
msgstr ""
#: wt-status.c:1171
msgid "behind "
msgstr ""
#: wt-status.c:1174 wt-status.c:1177
msgid "ahead "
msgstr ""
#: wt-status.c:1179
msgid ", behind "
msgstr ""
#: builtin/add.c:62
#, c-format
msgid "unexpected diff status %c"
msgstr ""
#: builtin/add.c:67 builtin/commit.c:229
msgid "updating files failed"
msgstr ""
#: builtin/add.c:77
#, c-format
msgid "remove '%s'\n"
msgstr ""
#: builtin/add.c:176
#, c-format
msgid "Path '%s' is in submodule '%.*s'"
msgstr ""
#: builtin/add.c:192
msgid "Unstaged changes after refreshing the index:"
msgstr ""
#: builtin/add.c:195 builtin/add.c:459 builtin/rm.c:186
#, c-format
msgid "pathspec '%s' did not match any files"
msgstr ""
#: builtin/add.c:209
#, c-format
msgid "'%s' is beyond a symbolic link"
msgstr ""
#: builtin/add.c:276
msgid "Could not read the index"
msgstr ""
#: builtin/add.c:286
#, c-format
msgid "Could not open '%s' for writing."
msgstr ""
#: builtin/add.c:290
msgid "Could not write patch"
msgstr ""
#: builtin/add.c:295
#, c-format
msgid "Could not stat '%s'"
msgstr ""
#: builtin/add.c:297
msgid "Empty patch. Aborted."
msgstr ""
#: builtin/add.c:303
#, c-format
msgid "Could not apply '%s'"
msgstr ""
#: builtin/add.c:312
msgid "The following paths are ignored by one of your .gitignore files:\n"
msgstr ""
#: builtin/add.c:352
#, c-format
msgid "Use -f if you really want to add them.\n"
msgstr ""
#: builtin/add.c:353
msgid "no files added"
msgstr ""
#: builtin/add.c:359
msgid "adding files failed"
msgstr ""
#: builtin/add.c:391
msgid "-A and -u are mutually incompatible"
msgstr ""
#: builtin/add.c:393
msgid "Option --ignore-missing can only be used together with --dry-run"
msgstr ""
#: builtin/add.c:413
#, c-format
msgid "Nothing specified, nothing added.\n"
msgstr ""
#: builtin/add.c:414
#, c-format
msgid "Maybe you wanted to say 'git add .'?\n"
msgstr ""
#: builtin/add.c:420 builtin/clean.c:95 builtin/commit.c:289 builtin/mv.c:82
#: builtin/rm.c:162
msgid "index file corrupt"
msgstr ""
#: builtin/add.c:480 builtin/apply.c:4433 builtin/mv.c:229 builtin/rm.c:260
msgid "Unable to write new index file"
msgstr ""
#: builtin/apply.c:57
msgid "git apply [options] [<patch>...]"
msgstr ""
#: builtin/apply.c:110
#, c-format
msgid "unrecognized whitespace option '%s'"
msgstr ""
#: builtin/apply.c:125
#, c-format
msgid "unrecognized whitespace ignore option '%s'"
msgstr ""
#: builtin/apply.c:824
#, c-format
msgid "Cannot prepare timestamp regexp %s"
msgstr ""
#: builtin/apply.c:833
#, c-format
msgid "regexec returned %d for input: %s"
msgstr ""
#: builtin/apply.c:914
#, c-format
msgid "unable to find filename in patch at line %d"
msgstr ""
#: builtin/apply.c:946
#, c-format
msgid "git apply: bad git-diff - expected /dev/null, got %s on line %d"
msgstr ""
#: builtin/apply.c:950
#, c-format
msgid "git apply: bad git-diff - inconsistent new filename on line %d"
msgstr ""
#: builtin/apply.c:951
#, c-format
msgid "git apply: bad git-diff - inconsistent old filename on line %d"
msgstr ""
#: builtin/apply.c:958
#, c-format
msgid "git apply: bad git-diff - expected /dev/null on line %d"
msgstr ""
#: builtin/apply.c:1403
#, c-format
msgid "recount: unexpected line: %.*s"
msgstr ""
#: builtin/apply.c:1460
#, c-format
msgid "patch fragment without header at line %d: %.*s"
msgstr ""
#: builtin/apply.c:1477
#, c-format
msgid ""
"git diff header lacks filename information when removing %d leading pathname "
"component (line %d)"
msgid_plural ""
"git diff header lacks filename information when removing %d leading pathname "
"components (line %d)"
msgstr[0] ""
msgstr[1] ""
#: builtin/apply.c:1637
msgid "new file depends on old contents"
msgstr ""
#: builtin/apply.c:1639
msgid "deleted file still has contents"
msgstr ""
#: builtin/apply.c:1665
#, c-format
msgid "corrupt patch at line %d"
msgstr ""
#: builtin/apply.c:1701
#, c-format
msgid "new file %s depends on old contents"
msgstr ""
#: builtin/apply.c:1703
#, c-format
msgid "deleted file %s still has contents"
msgstr ""
#: builtin/apply.c:1706
#, c-format
msgid "** warning: file %s becomes empty but is not deleted"
msgstr ""
#: builtin/apply.c:1852
#, c-format
msgid "corrupt binary patch at line %d: %.*s"
msgstr ""
#. there has to be one hunk (forward hunk)
#: builtin/apply.c:1881
#, c-format
msgid "unrecognized binary patch at line %d"
msgstr ""
#: builtin/apply.c:1967
#, c-format
msgid "patch with only garbage at line %d"
msgstr ""
#: builtin/apply.c:2057
#, c-format
msgid "unable to read symlink %s"
msgstr ""
#: builtin/apply.c:2061
#, c-format
msgid "unable to open or read %s"
msgstr ""
#: builtin/apply.c:2132
msgid "oops"
msgstr ""
#: builtin/apply.c:2654
#, c-format
msgid "invalid start of line: '%c'"
msgstr ""
#: builtin/apply.c:2772
#, c-format
msgid "Hunk #%d succeeded at %d (offset %d line)."
msgid_plural "Hunk #%d succeeded at %d (offset %d lines)."
msgstr[0] ""
msgstr[1] ""
#: builtin/apply.c:2784
#, c-format
msgid "Context reduced to (%ld/%ld) to apply fragment at %d"
msgstr ""
#: builtin/apply.c:2790
#, c-format
msgid ""
"while searching for:\n"
"%.*s"
msgstr ""
#: builtin/apply.c:2809
#, c-format
msgid "missing binary patch data for '%s'"
msgstr ""
#: builtin/apply.c:2912
#, c-format
msgid "binary patch does not apply to '%s'"
msgstr ""
#: builtin/apply.c:2918
#, c-format
msgid "binary patch to '%s' creates incorrect result (expecting %s, got %s)"
msgstr ""
#: builtin/apply.c:2939
#, c-format
msgid "patch failed: %s:%ld"
msgstr ""
#: builtin/apply.c:3061
#, c-format
msgid "cannot checkout %s"
msgstr ""
#: builtin/apply.c:3106 builtin/apply.c:3115 builtin/apply.c:3159
#, c-format
msgid "read of %s failed"
msgstr ""
#: builtin/apply.c:3139 builtin/apply.c:3361
#, c-format
msgid "path %s has been renamed/deleted"
msgstr ""
#: builtin/apply.c:3220 builtin/apply.c:3375
#, c-format
msgid "%s: does not exist in index"
msgstr ""
#: builtin/apply.c:3224 builtin/apply.c:3367 builtin/apply.c:3389
#, c-format
msgid "%s: %s"
msgstr ""
#: builtin/apply.c:3229 builtin/apply.c:3383
#, c-format
msgid "%s: does not match index"
msgstr ""
#: builtin/apply.c:3331
msgid "removal patch leaves file contents"
msgstr ""
#: builtin/apply.c:3400
#, c-format
msgid "%s: wrong type"
msgstr ""
#: builtin/apply.c:3402
#, c-format
msgid "%s has type %o, expected %o"
msgstr ""
#: builtin/apply.c:3503
#, c-format
msgid "%s: already exists in index"
msgstr ""
#: builtin/apply.c:3506
#, c-format
msgid "%s: already exists in working directory"
msgstr ""
#: builtin/apply.c:3526
#, c-format
msgid "new mode (%o) of %s does not match old mode (%o)"
msgstr ""
#: builtin/apply.c:3531
#, c-format
msgid "new mode (%o) of %s does not match old mode (%o) of %s"
msgstr ""
#: builtin/apply.c:3539
#, c-format
msgid "%s: patch does not apply"
msgstr ""
#: builtin/apply.c:3552
#, c-format
msgid "Checking patch %s..."
msgstr ""
#: builtin/apply.c:3607 builtin/checkout.c:213 builtin/reset.c:158
#, c-format
msgid "make_cache_entry failed for path '%s'"
msgstr ""
#: builtin/apply.c:3750
#, c-format
msgid "unable to remove %s from index"
msgstr ""
#: builtin/apply.c:3778
#, c-format
msgid "corrupt patch for subproject %s"
msgstr ""
#: builtin/apply.c:3782
#, c-format
msgid "unable to stat newly created file '%s'"
msgstr ""
#: builtin/apply.c:3787
#, c-format
msgid "unable to create backing store for newly created file %s"
msgstr ""
#: builtin/apply.c:3790 builtin/apply.c:3898
#, c-format
msgid "unable to add cache entry for %s"
msgstr ""
#: builtin/apply.c:3823
#, c-format
msgid "closing file '%s'"
msgstr ""
#: builtin/apply.c:3872
#, c-format
msgid "unable to write file '%s' mode %o"
msgstr ""
#: builtin/apply.c:3959
#, c-format
msgid "Applied patch %s cleanly."
msgstr ""
#: builtin/apply.c:3967
msgid "internal error"
msgstr ""
#. Say this even without --verbose
#: builtin/apply.c:3970
#, c-format
msgid "Applying patch %%s with %d reject..."
msgid_plural "Applying patch %%s with %d rejects..."
msgstr[0] ""
msgstr[1] ""
#: builtin/apply.c:3980
#, c-format
msgid "truncating .rej filename to %.*s.rej"
msgstr ""
#: builtin/apply.c:4001
#, c-format
msgid "Hunk #%d applied cleanly."
msgstr ""
#: builtin/apply.c:4004
#, c-format
msgid "Rejected hunk #%d."
msgstr ""
#: builtin/apply.c:4154
msgid "unrecognized input"
msgstr ""
#: builtin/apply.c:4165
msgid "unable to read index file"
msgstr ""
#: builtin/apply.c:4284 builtin/apply.c:4287
msgid "path"
msgstr ""
#: builtin/apply.c:4285
msgid "don't apply changes matching the given path"
msgstr ""
#: builtin/apply.c:4288
msgid "apply changes matching the given path"
msgstr ""
#: builtin/apply.c:4290
msgid "num"
msgstr ""
#: builtin/apply.c:4291
msgid "remove <num> leading slashes from traditional diff paths"
msgstr ""
#: builtin/apply.c:4294
msgid "ignore additions made by the patch"
msgstr ""
#: builtin/apply.c:4296
msgid "instead of applying the patch, output diffstat for the input"
msgstr ""
#: builtin/apply.c:4300
msgid "shows number of added and deleted lines in decimal notation"
msgstr ""
#: builtin/apply.c:4302
msgid "instead of applying the patch, output a summary for the input"
msgstr ""
#: builtin/apply.c:4304
msgid "instead of applying the patch, see if the patch is applicable"
msgstr ""
#: builtin/apply.c:4306
msgid "make sure the patch is applicable to the current index"
msgstr ""
#: builtin/apply.c:4308
msgid "apply a patch without touching the working tree"
msgstr ""
#: builtin/apply.c:4310
msgid "also apply the patch (use with --stat/--summary/--check)"
msgstr ""
#: builtin/apply.c:4312
msgid "attempt three-way merge if a patch does not apply"
msgstr ""
#: builtin/apply.c:4314
msgid "build a temporary index based on embedded index information"
msgstr ""
#: builtin/apply.c:4316
msgid "paths are separated with NUL character"
msgstr ""
#: builtin/apply.c:4319
msgid "ensure at least <n> lines of context match"
msgstr ""
#: builtin/apply.c:4320
msgid "action"
msgstr ""
#: builtin/apply.c:4321
msgid "detect new or modified lines that have whitespace errors"
msgstr ""
#: builtin/apply.c:4324 builtin/apply.c:4327
msgid "ignore changes in whitespace when finding context"
msgstr ""
#: builtin/apply.c:4330
msgid "apply the patch in reverse"
msgstr ""
#: builtin/apply.c:4332
msgid "don't expect at least one line of context"
msgstr ""
#: builtin/apply.c:4334
msgid "leave the rejected hunks in corresponding *.rej files"
msgstr ""
#: builtin/apply.c:4336
msgid "allow overlapping hunks"
msgstr ""
#: builtin/apply.c:4337
msgid "be verbose"
msgstr ""
#: builtin/apply.c:4339
msgid "tolerate incorrectly detected missing new-line at the end of file"
msgstr ""
#: builtin/apply.c:4342
msgid "do not trust the line counts in the hunk headers"
msgstr ""
#: builtin/apply.c:4344
msgid "root"
msgstr ""
#: builtin/apply.c:4345
msgid "prepend <root> to all filenames"
msgstr ""
#: builtin/apply.c:4367
msgid "--3way outside a repository"
msgstr ""
#: builtin/apply.c:4375
msgid "--index outside a repository"
msgstr ""
#: builtin/apply.c:4378
msgid "--cached outside a repository"
msgstr ""
#: builtin/apply.c:4394
#, c-format
msgid "can't open patch '%s'"
msgstr ""
#: builtin/apply.c:4408
#, c-format
msgid "squelched %d whitespace error"
msgid_plural "squelched %d whitespace errors"
msgstr[0] ""
msgstr[1] ""
#: builtin/apply.c:4414 builtin/apply.c:4424
#, c-format
msgid "%d line adds whitespace errors."
msgid_plural "%d lines add whitespace errors."
msgstr[0] ""
msgstr[1] ""
#: builtin/archive.c:17
#, c-format
msgid "could not create archive file '%s'"
msgstr ""
#: builtin/archive.c:20
msgid "could not redirect output"
msgstr ""
#: builtin/archive.c:37
msgid "git archive: Remote with no URL"
msgstr ""
#: builtin/archive.c:58
msgid "git archive: expected ACK/NAK, got EOF"
msgstr ""
#: builtin/archive.c:63
#, c-format
msgid "git archive: NACK %s"
msgstr ""
#: builtin/archive.c:65
#, c-format
msgid "remote error: %s"
msgstr ""
#: builtin/archive.c:66
msgid "git archive: protocol error"
msgstr ""
#: builtin/archive.c:71
msgid "git archive: expected a flush"
msgstr ""
#: builtin/branch.c:144
#, c-format
msgid ""
"deleting branch '%s' that has been merged to\n"
" '%s', but not yet merged to HEAD."
msgstr ""
#: builtin/branch.c:148
#, c-format
msgid ""
"not deleting branch '%s' that is not yet merged to\n"
" '%s', even though it is merged to HEAD."
msgstr ""
#: builtin/branch.c:180
msgid "cannot use -a with -d"
msgstr ""
#: builtin/branch.c:186
msgid "Couldn't look up commit object for HEAD"
msgstr ""
#: builtin/branch.c:191
#, c-format
msgid "Cannot delete the branch '%s' which you are currently on."
msgstr ""
#: builtin/branch.c:202
#, c-format
msgid "remote branch '%s' not found."
msgstr ""
#: builtin/branch.c:203
#, c-format
msgid "branch '%s' not found."
msgstr ""
#: builtin/branch.c:210
#, c-format
msgid "Couldn't look up commit object for '%s'"
msgstr ""
#: builtin/branch.c:216
#, c-format
msgid ""
"The branch '%s' is not fully merged.\n"
"If you are sure you want to delete it, run 'git branch -D %s'."
msgstr ""
#: builtin/branch.c:225
#, c-format
msgid "Error deleting remote branch '%s'"
msgstr ""
#: builtin/branch.c:226
#, c-format
msgid "Error deleting branch '%s'"
msgstr ""
#: builtin/branch.c:233
#, c-format
msgid "Deleted remote branch %s (was %s).\n"
msgstr ""
#: builtin/branch.c:234
#, c-format
msgid "Deleted branch %s (was %s).\n"
msgstr ""
#: builtin/branch.c:239
msgid "Update of config-file failed"
msgstr ""
#: builtin/branch.c:337
#, c-format
msgid "branch '%s' does not point at a commit"
msgstr ""
#: builtin/branch.c:409
#, c-format
msgid "[%s: behind %d]"
msgstr ""
#: builtin/branch.c:411
#, c-format
msgid "[behind %d]"
msgstr ""
#: builtin/branch.c:415
#, c-format
msgid "[%s: ahead %d]"
msgstr ""
#: builtin/branch.c:417
#, c-format
msgid "[ahead %d]"
msgstr ""
#: builtin/branch.c:420
#, c-format
msgid "[%s: ahead %d, behind %d]"
msgstr ""
#: builtin/branch.c:423
#, c-format
msgid "[ahead %d, behind %d]"
msgstr ""
#: builtin/branch.c:535
msgid "(no branch)"
msgstr ""
#: builtin/branch.c:600
msgid "some refs could not be read"
msgstr ""
#: builtin/branch.c:613
msgid "cannot rename the current branch while not on any."
msgstr ""
#: builtin/branch.c:623
#, c-format
msgid "Invalid branch name: '%s'"
msgstr ""
#: builtin/branch.c:638
msgid "Branch rename failed"
msgstr ""
#: builtin/branch.c:642
#, c-format
msgid "Renamed a misnamed branch '%s' away"
msgstr ""
#: builtin/branch.c:646
#, c-format
msgid "Branch renamed to %s, but HEAD is not updated!"
msgstr ""
#: builtin/branch.c:653
msgid "Branch is renamed, but update of config-file failed"
msgstr ""
#: builtin/branch.c:668
#, c-format
msgid "malformed object name %s"
msgstr ""
#: builtin/branch.c:692
#, c-format
msgid "could not write branch description template: %s"
msgstr ""
#: builtin/branch.c:783
msgid "Failed to resolve HEAD as a valid ref."
msgstr ""
#: builtin/branch.c:788 builtin/clone.c:561
msgid "HEAD not found below refs/heads!"
msgstr ""
#: builtin/branch.c:808
msgid "--column and --verbose are incompatible"
msgstr ""
#: builtin/branch.c:857
msgid "-a and -r options to 'git branch' do not make sense with a branch name"
msgstr ""
#: builtin/bundle.c:47
#, c-format
msgid "%s is okay\n"
msgstr ""
#: builtin/bundle.c:56
msgid "Need a repository to create a bundle."
msgstr ""
#: builtin/bundle.c:60
msgid "Need a repository to unbundle."
msgstr ""
#: builtin/checkout.c:114 builtin/checkout.c:147
#, c-format
msgid "path '%s' does not have our version"
msgstr ""
#: builtin/checkout.c:116 builtin/checkout.c:149
#, c-format
msgid "path '%s' does not have their version"
msgstr ""
#: builtin/checkout.c:132
#, c-format
msgid "path '%s' does not have all necessary versions"
msgstr ""
#: builtin/checkout.c:176
#, c-format
msgid "path '%s' does not have necessary versions"
msgstr ""
#: builtin/checkout.c:193
#, c-format
msgid "path '%s': cannot merge"
msgstr ""
#: builtin/checkout.c:210
#, c-format
msgid "Unable to add merge result for '%s'"
msgstr ""
#: builtin/checkout.c:235 builtin/checkout.c:393
msgid "corrupt index file"
msgstr ""
#: builtin/checkout.c:265 builtin/checkout.c:272
#, c-format
msgid "path '%s' is unmerged"
msgstr ""
#: builtin/checkout.c:303 builtin/checkout.c:499 builtin/clone.c:586
#: builtin/merge.c:812
msgid "unable to write new index file"
msgstr ""
#: builtin/checkout.c:320 builtin/diff.c:302 builtin/merge.c:408
msgid "diff_setup_done failed"
msgstr ""
#: builtin/checkout.c:415
msgid "you need to resolve your current index first"
msgstr ""
#: builtin/checkout.c:534
#, c-format
msgid "Can not do reflog for '%s'\n"
msgstr ""
#: builtin/checkout.c:567
msgid "HEAD is now at"
msgstr ""
#: builtin/checkout.c:574
#, c-format
msgid "Reset branch '%s'\n"
msgstr ""
#: builtin/checkout.c:577
#, c-format
msgid "Already on '%s'\n"
msgstr ""
#: builtin/checkout.c:581
#, c-format
msgid "Switched to and reset branch '%s'\n"
msgstr ""
#: builtin/checkout.c:583
#, c-format
msgid "Switched to a new branch '%s'\n"
msgstr ""
#: builtin/checkout.c:585
#, c-format
msgid "Switched to branch '%s'\n"
msgstr ""
#: builtin/checkout.c:641
#, c-format
msgid " ... and %d more.\n"
msgstr ""
#. The singular version
#: builtin/checkout.c:647
#, c-format
msgid ""
"Warning: you are leaving %d commit behind, not connected to\n"
"any of your branches:\n"
"\n"
"%s\n"
msgid_plural ""
"Warning: you are leaving %d commits behind, not connected to\n"
"any of your branches:\n"
"\n"
"%s\n"
msgstr[0] ""
msgstr[1] ""
#: builtin/checkout.c:665
#, c-format
msgid ""
"If you want to keep them by creating a new branch, this may be a good time\n"
"to do so with:\n"
"\n"
" git branch new_branch_name %s\n"
"\n"
msgstr ""
#: builtin/checkout.c:695
msgid "internal error in revision walk"
msgstr ""
#: builtin/checkout.c:699
msgid "Previous HEAD position was"
msgstr ""
#: builtin/checkout.c:725 builtin/checkout.c:920
msgid "You are on a branch yet to be born"
msgstr ""
#. case (1)
#: builtin/checkout.c:856
#, c-format
msgid "invalid reference: %s"
msgstr ""
#. case (1): want a tree
#: builtin/checkout.c:895
#, c-format
msgid "reference is not a tree: %s"
msgstr ""
#: builtin/checkout.c:977
msgid "-B cannot be used with -b"
msgstr ""
#: builtin/checkout.c:986
msgid "--patch is incompatible with all other options"
msgstr ""
#: builtin/checkout.c:989
msgid "--detach cannot be used with -b/-B/--orphan"
msgstr ""
#: builtin/checkout.c:991
msgid "--detach cannot be used with -t"
msgstr ""
#: builtin/checkout.c:997
msgid "--track needs a branch name"
msgstr ""
#: builtin/checkout.c:1004
msgid "Missing branch name; try -b"
msgstr ""
#: builtin/checkout.c:1010
msgid "--orphan and -b|-B are mutually exclusive"
msgstr ""
#: builtin/checkout.c:1012
msgid "--orphan cannot be used with -t"
msgstr ""
#: builtin/checkout.c:1022
msgid "git checkout: -f and -m are incompatible"
msgstr ""
#: builtin/checkout.c:1056
msgid "invalid path specification"
msgstr ""
#: builtin/checkout.c:1064
#, c-format
msgid ""
"git checkout: updating paths is incompatible with switching branches.\n"
"Did you intend to checkout '%s' which can not be resolved as commit?"
msgstr ""
#: builtin/checkout.c:1066
msgid "git checkout: updating paths is incompatible with switching branches."
msgstr ""
#: builtin/checkout.c:1071
msgid "git checkout: --detach does not take a path argument"
msgstr ""
#: builtin/checkout.c:1074
msgid ""
"git checkout: --ours/--theirs, --force and --merge are incompatible when\n"
"checking out of the index."
msgstr ""
#: builtin/checkout.c:1093
msgid "Cannot switch branch to a non-commit."
msgstr ""
#: builtin/checkout.c:1096
msgid "--ours/--theirs is incompatible with switching branches."
msgstr ""
#: builtin/clean.c:78
msgid "-x and -X cannot be used together"
msgstr ""
#: builtin/clean.c:82
msgid ""
"clean.requireForce set to true and neither -n nor -f given; refusing to clean"
msgstr ""
#: builtin/clean.c:85
msgid ""
"clean.requireForce defaults to true and neither -n nor -f given; refusing to "
"clean"
msgstr ""
#: builtin/clean.c:155 builtin/clean.c:176
#, c-format
msgid "Would remove %s\n"
msgstr ""
#: builtin/clean.c:159 builtin/clean.c:179
#, c-format
msgid "Removing %s\n"
msgstr ""
#: builtin/clean.c:162 builtin/clean.c:182
#, c-format
msgid "failed to remove %s"
msgstr ""
#: builtin/clean.c:166
#, c-format
msgid "Would not remove %s\n"
msgstr ""
#: builtin/clean.c:168
#, c-format
msgid "Not removing %s\n"
msgstr ""
#: builtin/clone.c:243
#, c-format
msgid "reference repository '%s' is not a local directory."
msgstr ""
#: builtin/clone.c:306
#, c-format
msgid "failed to create directory '%s'"
msgstr ""
#: builtin/clone.c:308 builtin/diff.c:75
#, c-format
msgid "failed to stat '%s'"
msgstr ""
#: builtin/clone.c:310
#, c-format
msgid "%s exists and is not a directory"
msgstr ""
#: builtin/clone.c:324
#, c-format
msgid "failed to stat %s\n"
msgstr ""
#: builtin/clone.c:341
#, c-format
msgid "failed to unlink '%s'"
msgstr ""
#: builtin/clone.c:346
#, c-format
msgid "failed to create link '%s'"
msgstr ""
#: builtin/clone.c:350
#, c-format
msgid "failed to copy file to '%s'"
msgstr ""
#: builtin/clone.c:373
#, c-format
msgid "done.\n"
msgstr ""
#: builtin/clone.c:443
#, c-format
msgid "Could not find remote branch %s to clone."
msgstr ""
#: builtin/clone.c:552
msgid "remote HEAD refers to nonexistent ref, unable to checkout.\n"
msgstr ""
#: builtin/clone.c:642
msgid "Too many arguments."
msgstr ""
#: builtin/clone.c:646
msgid "You must specify a repository to clone."
msgstr ""
#: builtin/clone.c:657
#, c-format
msgid "--bare and --origin %s options are incompatible."
msgstr ""
#: builtin/clone.c:671
#, c-format
msgid "repository '%s' does not exist"
msgstr ""
#: builtin/clone.c:676
msgid "--depth is ignored in local clones; use file:// instead."
msgstr ""
#: builtin/clone.c:686
#, c-format
msgid "destination path '%s' already exists and is not an empty directory."
msgstr ""
#: builtin/clone.c:696
#, c-format
msgid "working tree '%s' already exists."
msgstr ""
#: builtin/clone.c:709 builtin/clone.c:723
#, c-format
msgid "could not create leading directories of '%s'"
msgstr ""
#: builtin/clone.c:712
#, c-format
msgid "could not create work tree dir '%s'."
msgstr ""
#: builtin/clone.c:731
#, c-format
msgid "Cloning into bare repository '%s'...\n"
msgstr ""
#: builtin/clone.c:733
#, c-format
msgid "Cloning into '%s'...\n"
msgstr ""
#: builtin/clone.c:789
#, c-format
msgid "Don't know how to clone %s"
msgstr ""
#: builtin/clone.c:838
#, c-format
msgid "Remote branch %s not found in upstream %s"
msgstr ""
#: builtin/clone.c:845
msgid "You appear to have cloned an empty repository."
msgstr ""
#: builtin/column.c:51
msgid "--command must be the first argument"
msgstr ""
#: builtin/commit.c:43
msgid ""
"Your name and email address were configured automatically based\n"
"on your username and hostname. Please check that they are accurate.\n"
"You can suppress this message by setting them explicitly:\n"
"\n"
" git config --global user.name \"Your Name\"\n"
" git config --global user.email you@example.com\n"
"\n"
"After doing this, you may fix the identity used for this commit with:\n"
"\n"
" git commit --amend --reset-author\n"
msgstr ""
#: builtin/commit.c:55
msgid ""
"You asked to amend the most recent commit, but doing so would make\n"
"it empty. You can repeat your command with --allow-empty, or you can\n"
"remove the commit entirely with \"git reset HEAD^\".\n"
msgstr ""
#: builtin/commit.c:60
msgid ""
"The previous cherry-pick is now empty, possibly due to conflict resolution.\n"
"If you wish to commit it anyway, use:\n"
"\n"
" git commit --allow-empty\n"
"\n"
"Otherwise, please use 'git reset'\n"
msgstr ""
#: builtin/commit.c:256
msgid "failed to unpack HEAD tree object"
msgstr ""
#: builtin/commit.c:298
msgid "unable to create temporary index"
msgstr ""
#: builtin/commit.c:304
msgid "interactive add failed"
msgstr ""
#: builtin/commit.c:337 builtin/commit.c:358 builtin/commit.c:408
msgid "unable to write new_index file"
msgstr ""
#: builtin/commit.c:389
msgid "cannot do a partial commit during a merge."
msgstr ""
#: builtin/commit.c:391
msgid "cannot do a partial commit during a cherry-pick."
msgstr ""
#: builtin/commit.c:401
msgid "cannot read the index"
msgstr ""
#: builtin/commit.c:421
msgid "unable to write temporary index file"
msgstr ""
#: builtin/commit.c:496 builtin/commit.c:502
#, c-format
msgid "invalid commit: %s"
msgstr ""
#: builtin/commit.c:525
msgid "malformed --author parameter"
msgstr ""
#: builtin/commit.c:585
#, c-format
msgid "Malformed ident string: '%s'"
msgstr ""
#: builtin/commit.c:623 builtin/commit.c:656 builtin/commit.c:970
#, c-format
msgid "could not lookup commit %s"
msgstr ""
#: builtin/commit.c:635 builtin/shortlog.c:296
#, c-format
msgid "(reading log message from standard input)\n"
msgstr ""
#: builtin/commit.c:637
msgid "could not read log from standard input"
msgstr ""
#: builtin/commit.c:641
#, c-format
msgid "could not read log file '%s'"
msgstr ""
#: builtin/commit.c:647
msgid "commit has empty message"
msgstr ""
#: builtin/commit.c:663
msgid "could not read MERGE_MSG"
msgstr ""
#: builtin/commit.c:667
msgid "could not read SQUASH_MSG"
msgstr ""
#: builtin/commit.c:671
#, c-format
msgid "could not read '%s'"
msgstr ""
#: builtin/commit.c:723
msgid "could not write commit template"
msgstr ""
#: builtin/commit.c:734
#, c-format
msgid ""
"\n"
"It looks like you may be committing a merge.\n"
"If this is not correct, please remove the file\n"
"\t%s\n"
"and try again.\n"
msgstr ""
#: builtin/commit.c:739
#, c-format
msgid ""
"\n"
"It looks like you may be committing a cherry-pick.\n"
"If this is not correct, please remove the file\n"
"\t%s\n"
"and try again.\n"
msgstr ""
#: builtin/commit.c:751
msgid ""
"Please enter the commit message for your changes. Lines starting\n"
"with '#' will be ignored, and an empty message aborts the commit.\n"
msgstr ""
#: builtin/commit.c:756
msgid ""
"Please enter the commit message for your changes. Lines starting\n"
"with '#' will be kept; you may remove them yourself if you want to.\n"
"An empty message aborts the commit.\n"
msgstr ""
#: builtin/commit.c:769
#, c-format
msgid "%sAuthor: %s"
msgstr ""
#: builtin/commit.c:776
#, c-format
msgid "%sCommitter: %s"
msgstr ""
#: builtin/commit.c:796
msgid "Cannot read index"
msgstr ""
#: builtin/commit.c:833
msgid "Error building trees"
msgstr ""
#: builtin/commit.c:848 builtin/tag.c:361
#, c-format
msgid "Please supply the message using either -m or -F option.\n"
msgstr ""
#: builtin/commit.c:945
#, c-format
msgid "No existing author found with '%s'"
msgstr ""
#: builtin/commit.c:960 builtin/commit.c:1160
#, c-format
msgid "Invalid untracked files mode '%s'"
msgstr ""
#: builtin/commit.c:1000
msgid "Using both --reset-author and --author does not make sense"
msgstr ""
#: builtin/commit.c:1011
msgid "You have nothing to amend."
msgstr ""
#: builtin/commit.c:1014
msgid "You are in the middle of a merge -- cannot amend."
msgstr ""
#: builtin/commit.c:1016
msgid "You are in the middle of a cherry-pick -- cannot amend."
msgstr ""
#: builtin/commit.c:1019
msgid "Options --squash and --fixup cannot be used together"
msgstr ""
#: builtin/commit.c:1029
msgid "Only one of -c/-C/-F/--fixup can be used."
msgstr ""
#: builtin/commit.c:1031
msgid "Option -m cannot be combined with -c/-C/-F/--fixup."
msgstr ""
#: builtin/commit.c:1039
msgid "--reset-author can be used only with -C, -c or --amend."
msgstr ""
#: builtin/commit.c:1056
msgid "Only one of --include/--only/--all/--interactive/--patch can be used."
msgstr ""
#: builtin/commit.c:1058
msgid "No paths with --include/--only does not make sense."
msgstr ""
#: builtin/commit.c:1060
msgid "Clever... amending the last one with dirty index."
msgstr ""
#: builtin/commit.c:1062
msgid "Explicit paths specified without -i nor -o; assuming --only paths..."
msgstr ""
#: builtin/commit.c:1072 builtin/tag.c:577
#, c-format
msgid "Invalid cleanup mode %s"
msgstr ""
#: builtin/commit.c:1077
msgid "Paths with -a does not make sense."
msgstr ""
#: builtin/commit.c:1260
msgid "couldn't look up newly created commit"
msgstr ""
#: builtin/commit.c:1262
msgid "could not parse newly created commit"
msgstr ""
#: builtin/commit.c:1303
msgid "detached HEAD"
msgstr ""
#: builtin/commit.c:1305
msgid " (root-commit)"
msgstr ""
#: builtin/commit.c:1449
msgid "could not parse HEAD commit"
msgstr ""
#: builtin/commit.c:1487 builtin/merge.c:509
#, c-format
msgid "could not open '%s' for reading"
msgstr ""
#: builtin/commit.c:1494
#, c-format
msgid "Corrupt MERGE_HEAD file (%s)"
msgstr ""
#: builtin/commit.c:1501
msgid "could not read MERGE_MODE"
msgstr ""
#: builtin/commit.c:1520
#, c-format
msgid "could not read commit message: %s"
msgstr ""
#: builtin/commit.c:1534
#, c-format
msgid "Aborting commit; you did not edit the message.\n"
msgstr ""
#: builtin/commit.c:1539
#, c-format
msgid "Aborting commit due to empty commit message.\n"
msgstr ""
#: builtin/commit.c:1554 builtin/merge.c:936 builtin/merge.c:961
msgid "failed to write commit object"
msgstr ""
#: builtin/commit.c:1575
msgid "cannot lock HEAD ref"
msgstr ""
#: builtin/commit.c:1579
msgid "cannot update HEAD ref"
msgstr ""
#: builtin/commit.c:1590
msgid ""
"Repository has been updated, but unable to write\n"
"new_index file. Check that disk is not full or quota is\n"
"not exceeded, and then \"git reset HEAD\" to recover."
msgstr ""
#: builtin/describe.c:234
#, c-format
msgid "annotated tag %s not available"
msgstr ""
#: builtin/describe.c:238
#, c-format
msgid "annotated tag %s has no embedded name"
msgstr ""
#: builtin/describe.c:240
#, c-format
msgid "tag '%s' is really '%s' here"
msgstr ""
#: builtin/describe.c:267
#, c-format
msgid "Not a valid object name %s"
msgstr ""
#: builtin/describe.c:270
#, c-format
msgid "%s is not a valid '%s' object"
msgstr ""
#: builtin/describe.c:287
#, c-format
msgid "no tag exactly matches '%s'"
msgstr ""
#: builtin/describe.c:289
#, c-format
msgid "searching to describe %s\n"
msgstr ""
#: builtin/describe.c:329
#, c-format
msgid "finished search at %s\n"
msgstr ""
#: builtin/describe.c:353
#, c-format
msgid ""
"No annotated tags can describe '%s'.\n"
"However, there were unannotated tags: try --tags."
msgstr ""
#: builtin/describe.c:357
#, c-format
msgid ""
"No tags can describe '%s'.\n"
"Try --always, or create some tags."
msgstr ""
#: builtin/describe.c:378
#, c-format
msgid "traversed %lu commits\n"
msgstr ""
#: builtin/describe.c:381
#, c-format
msgid ""
"more than %i tags found; listed %i most recent\n"
"gave up search at %s\n"
msgstr ""
#: builtin/describe.c:436
msgid "--long is incompatible with --abbrev=0"
msgstr ""
#: builtin/describe.c:462
msgid "No names found, cannot describe anything."
msgstr ""
#: builtin/describe.c:482
msgid "--dirty is incompatible with committishes"
msgstr ""
#: builtin/diff.c:77
#, c-format
msgid "'%s': not a regular file or symlink"
msgstr ""
#: builtin/diff.c:220
#, c-format
msgid "invalid option: %s"
msgstr ""
#: builtin/diff.c:297
msgid "Not a git repository"
msgstr ""
#: builtin/diff.c:341
#, c-format
msgid "invalid object '%s' given."
msgstr ""
#: builtin/diff.c:346
#, c-format
msgid "more than %d trees given: '%s'"
msgstr ""
#: builtin/diff.c:356
#, c-format
msgid "more than two blobs given: '%s'"
msgstr ""
#: builtin/diff.c:364
#, c-format
msgid "unhandled object '%s' given."
msgstr ""
#: builtin/fetch.c:200
msgid "Couldn't find remote ref HEAD"
msgstr ""
#: builtin/fetch.c:253
#, c-format
msgid "object %s not found"
msgstr ""
#: builtin/fetch.c:259
msgid "[up to date]"
msgstr ""
#: builtin/fetch.c:273
#, c-format
msgid "! %-*s %-*s -> %s (can't fetch in current branch)"
msgstr ""
#: builtin/fetch.c:274 builtin/fetch.c:360
msgid "[rejected]"
msgstr ""
#: builtin/fetch.c:285
msgid "[tag update]"
msgstr ""
#: builtin/fetch.c:287 builtin/fetch.c:322 builtin/fetch.c:340
msgid " (unable to update local ref)"
msgstr ""
#: builtin/fetch.c:305
msgid "[new tag]"
msgstr ""
#: builtin/fetch.c:308
msgid "[new branch]"
msgstr ""
#: builtin/fetch.c:311
msgid "[new ref]"
msgstr ""
#: builtin/fetch.c:356
msgid "unable to update local ref"
msgstr ""
#: builtin/fetch.c:356
msgid "forced update"
msgstr ""
#: builtin/fetch.c:362
msgid "(non-fast-forward)"
msgstr ""
#: builtin/fetch.c:393 builtin/fetch.c:685
#, c-format
msgid "cannot open %s: %s\n"
msgstr ""
#: builtin/fetch.c:402
#, c-format
msgid "%s did not send all necessary objects\n"
msgstr ""
#: builtin/fetch.c:488
#, c-format
msgid "From %.*s\n"
msgstr ""
#: builtin/fetch.c:499
#, c-format
msgid ""
"some local refs could not be updated; try running\n"
" 'git remote prune %s' to remove any old, conflicting branches"
msgstr ""
#: builtin/fetch.c:549
#, c-format
msgid " (%s will become dangling)"
msgstr ""
#: builtin/fetch.c:550
#, c-format
msgid " (%s has become dangling)"
msgstr ""
#: builtin/fetch.c:557
msgid "[deleted]"
msgstr ""
#: builtin/fetch.c:558 builtin/remote.c:1055
msgid "(none)"
msgstr ""
#: builtin/fetch.c:675
#, c-format
msgid "Refusing to fetch into current branch %s of non-bare repository"
msgstr ""
#: builtin/fetch.c:709
#, c-format
msgid "Don't know how to fetch from %s"
msgstr ""
#: builtin/fetch.c:786
#, c-format
msgid "Option \"%s\" value \"%s\" is not valid for %s"
msgstr ""
#: builtin/fetch.c:789
#, c-format
msgid "Option \"%s\" is ignored for %s\n"
msgstr ""
#: builtin/fetch.c:888
#, c-format
msgid "Fetching %s\n"
msgstr ""
#: builtin/fetch.c:890 builtin/remote.c:100
#, c-format
msgid "Could not fetch %s"
msgstr ""
#: builtin/fetch.c:907
msgid ""
"No remote repository specified. Please, specify either a URL or a\n"
"remote name from which new revisions should be fetched."
msgstr ""
#: builtin/fetch.c:927
msgid "You need to specify a tag name."
msgstr ""
#: builtin/fetch.c:979
msgid "fetch --all does not take a repository argument"
msgstr ""
#: builtin/fetch.c:981
msgid "fetch --all does not make sense with refspecs"
msgstr ""
#: builtin/fetch.c:992
#, c-format
msgid "No such remote or remote group: %s"
msgstr ""
#: builtin/fetch.c:1000
msgid "Fetching a group and specifying refspecs does not make sense"
msgstr ""
#: builtin/gc.c:63
#, c-format
msgid "Invalid %s: '%s'"
msgstr ""
#: builtin/gc.c:90
#, c-format
msgid "insanely long object directory %.*s"
msgstr ""
#: builtin/gc.c:221
#, c-format
msgid "Auto packing the repository for optimum performance.\n"
msgstr ""
#: builtin/gc.c:224
#, c-format
msgid ""
"Auto packing the repository for optimum performance. You may also\n"
"run \"git gc\" manually. See \"git help gc\" for more information.\n"
msgstr ""
#: builtin/gc.c:251
msgid ""
"There are too many unreachable loose objects; run 'git prune' to remove them."
msgstr ""
#: builtin/grep.c:216
#, c-format
msgid "grep: failed to create thread: %s"
msgstr ""
#: builtin/grep.c:402
#, c-format
msgid "Failed to chdir: %s"
msgstr ""
#: builtin/grep.c:478 builtin/grep.c:512
#, c-format
msgid "unable to read tree (%s)"
msgstr ""
#: builtin/grep.c:526
#, c-format
msgid "unable to grep from object of type %s"
msgstr ""
#: builtin/grep.c:584
#, c-format
msgid "switch `%c' expects a numerical value"
msgstr ""
#: builtin/grep.c:601
#, c-format
msgid "cannot open '%s'"
msgstr ""
#: builtin/grep.c:885
msgid "no pattern given."
msgstr ""
#: builtin/grep.c:899
#, c-format
msgid "bad object %s"
msgstr ""
#: builtin/grep.c:940
msgid "--open-files-in-pager only works on the worktree"
msgstr ""
#: builtin/grep.c:963
msgid "--cached or --untracked cannot be used with --no-index."
msgstr ""
#: builtin/grep.c:968
msgid "--no-index or --untracked cannot be used with revs."
msgstr ""
#: builtin/grep.c:971
msgid "--[no-]exclude-standard cannot be used for tracked contents."
msgstr ""
#: builtin/grep.c:979
msgid "both --cached and trees are given."
msgstr ""
#: builtin/help.c:65
#, c-format
msgid "unrecognized help format '%s'"
msgstr ""
#: builtin/help.c:93
msgid "Failed to start emacsclient."
msgstr ""
#: builtin/help.c:106
msgid "Failed to parse emacsclient version."
msgstr ""
#: builtin/help.c:114
#, c-format
msgid "emacsclient version '%d' too old (< 22)."
msgstr ""
#: builtin/help.c:132 builtin/help.c:160 builtin/help.c:169 builtin/help.c:177
#, c-format
msgid "failed to exec '%s': %s"
msgstr ""
#: builtin/help.c:217
#, c-format
msgid ""
"'%s': path for unsupported man viewer.\n"
"Please consider using 'man.<tool>.cmd' instead."
msgstr ""
#: builtin/help.c:229
#, c-format
msgid ""
"'%s': cmd for supported man viewer.\n"
"Please consider using 'man.<tool>.path' instead."
msgstr ""
#: builtin/help.c:299
msgid "The most commonly used git commands are:"
msgstr ""
#: builtin/help.c:367
#, c-format
msgid "'%s': unknown man viewer."
msgstr ""
#: builtin/help.c:384
msgid "no man viewer handled the request"
msgstr ""
#: builtin/help.c:392
msgid "no info viewer handled the request"
msgstr ""
#: builtin/help.c:447 builtin/help.c:454
#, c-format
msgid "usage: %s%s"
msgstr ""
#: builtin/help.c:470
#, c-format
msgid "`git %s' is aliased to `%s'"
msgstr ""
#: builtin/index-pack.c:170
#, c-format
msgid "object type mismatch at %s"
msgstr ""
#: builtin/index-pack.c:190
msgid "object of unexpected type"
msgstr ""
#: builtin/index-pack.c:227
#, c-format
msgid "cannot fill %d byte"
msgid_plural "cannot fill %d bytes"
msgstr[0] ""
msgstr[1] ""
#: builtin/index-pack.c:237
msgid "early EOF"
msgstr ""
#: builtin/index-pack.c:238
msgid "read error on input"
msgstr ""
#: builtin/index-pack.c:250
msgid "used more bytes than were available"
msgstr ""
#: builtin/index-pack.c:257
msgid "pack too large for current definition of off_t"
msgstr ""
#: builtin/index-pack.c:273
#, c-format
msgid "unable to create '%s'"
msgstr ""
#: builtin/index-pack.c:278
#, c-format
msgid "cannot open packfile '%s'"
msgstr ""
#: builtin/index-pack.c:292
msgid "pack signature mismatch"
msgstr ""
#: builtin/index-pack.c:312
#, c-format
msgid "pack has bad object at offset %lu: %s"
msgstr ""
#: builtin/index-pack.c:434
#, c-format
msgid "inflate returned %d"
msgstr ""
#: builtin/index-pack.c:483
msgid "offset value overflow for delta base object"
msgstr ""
#: builtin/index-pack.c:491
msgid "delta base offset is out of bound"
msgstr ""
#: builtin/index-pack.c:499
#, c-format
msgid "unknown object type %d"
msgstr ""
#: builtin/index-pack.c:530
msgid "cannot pread pack file"
msgstr ""
#: builtin/index-pack.c:532
#, c-format
msgid "premature end of pack file, %lu byte missing"
msgid_plural "premature end of pack file, %lu bytes missing"
msgstr[0] ""
msgstr[1] ""
#: builtin/index-pack.c:558
msgid "serious inflate inconsistency"
msgstr ""
#: builtin/index-pack.c:649 builtin/index-pack.c:655 builtin/index-pack.c:678
#: builtin/index-pack.c:712 builtin/index-pack.c:721
#, c-format
msgid "SHA1 COLLISION FOUND WITH %s !"
msgstr ""
#: builtin/index-pack.c:652 builtin/pack-objects.c:170
#: builtin/pack-objects.c:262
#, c-format
msgid "unable to read %s"
msgstr ""
#: builtin/index-pack.c:718
#, c-format
msgid "cannot read existing object %s"
msgstr ""
#: builtin/index-pack.c:732
#, c-format
msgid "invalid blob object %s"
msgstr ""
#: builtin/index-pack.c:747
#, c-format
msgid "invalid %s"
msgstr ""
#: builtin/index-pack.c:749
msgid "Error in object"
msgstr ""
#: builtin/index-pack.c:751
#, c-format
msgid "Not all child objects of %s are reachable"
msgstr ""
#: builtin/index-pack.c:821 builtin/index-pack.c:847
msgid "failed to apply delta"
msgstr ""
#: builtin/index-pack.c:986
msgid "Receiving objects"
msgstr ""
#: builtin/index-pack.c:986
msgid "Indexing objects"
msgstr ""
#: builtin/index-pack.c:1012
msgid "pack is corrupted (SHA1 mismatch)"
msgstr ""
#: builtin/index-pack.c:1017
msgid "cannot fstat packfile"
msgstr ""
#: builtin/index-pack.c:1020
msgid "pack has junk at the end"
msgstr ""
#: builtin/index-pack.c:1031
msgid "confusion beyond insanity in parse_pack_objects()"
msgstr ""
#: builtin/index-pack.c:1054
msgid "Resolving deltas"
msgstr ""
#: builtin/index-pack.c:1105
msgid "confusion beyond insanity"
msgstr ""
#: builtin/index-pack.c:1124
#, c-format
msgid "pack has %d unresolved delta"
msgid_plural "pack has %d unresolved deltas"
msgstr[0] ""
msgstr[1] ""
#: builtin/index-pack.c:1149
#, c-format
msgid "unable to deflate appended object (%d)"
msgstr ""
#: builtin/index-pack.c:1228
#, c-format
msgid "local object %s is corrupt"
msgstr ""
#: builtin/index-pack.c:1252
msgid "error while closing pack file"
msgstr ""
#: builtin/index-pack.c:1265
#, c-format
msgid "cannot write keep file '%s'"
msgstr ""
#: builtin/index-pack.c:1273
#, c-format
msgid "cannot close written keep file '%s'"
msgstr ""
#: builtin/index-pack.c:1286
msgid "cannot store pack file"
msgstr ""
#: builtin/index-pack.c:1297
msgid "cannot store index file"
msgstr ""
#: builtin/index-pack.c:1398
#, c-format
msgid "Cannot open existing pack file '%s'"
msgstr ""
#: builtin/index-pack.c:1400
#, c-format
msgid "Cannot open existing pack idx file for '%s'"
msgstr ""
#: builtin/index-pack.c:1447
#, c-format
msgid "non delta: %d object"
msgid_plural "non delta: %d objects"
msgstr[0] ""
msgstr[1] ""
#: builtin/index-pack.c:1454
#, c-format
msgid "chain length = %d: %lu object"
msgid_plural "chain length = %d: %lu objects"
msgstr[0] ""
msgstr[1] ""
#: builtin/index-pack.c:1481
msgid "Cannot come back to cwd"
msgstr ""
#: builtin/index-pack.c:1525 builtin/index-pack.c:1528
#: builtin/index-pack.c:1540 builtin/index-pack.c:1544
#, c-format
msgid "bad %s"
msgstr ""
#: builtin/index-pack.c:1558
msgid "--fix-thin cannot be used without --stdin"
msgstr ""
#: builtin/index-pack.c:1562 builtin/index-pack.c:1572
#, c-format
msgid "packfile name '%s' does not end with '.pack'"
msgstr ""
#: builtin/index-pack.c:1581
msgid "--verify with no packfile name given"
msgstr ""
#: builtin/init-db.c:35
#, c-format
msgid "Could not make %s writable by group"
msgstr ""
#: builtin/init-db.c:62
#, c-format
msgid "insanely long template name %s"
msgstr ""
#: builtin/init-db.c:67
#, c-format
msgid "cannot stat '%s'"
msgstr ""
#: builtin/init-db.c:73
#, c-format
msgid "cannot stat template '%s'"
msgstr ""
#: builtin/init-db.c:80
#, c-format
msgid "cannot opendir '%s'"
msgstr ""
#: builtin/init-db.c:97
#, c-format
msgid "cannot readlink '%s'"
msgstr ""
#: builtin/init-db.c:99
#, c-format
msgid "insanely long symlink %s"
msgstr ""
#: builtin/init-db.c:102
#, c-format
msgid "cannot symlink '%s' '%s'"
msgstr ""
#: builtin/init-db.c:106
#, c-format
msgid "cannot copy '%s' to '%s'"
msgstr ""
#: builtin/init-db.c:110
#, c-format
msgid "ignoring template %s"
msgstr ""
#: builtin/init-db.c:133
#, c-format
msgid "insanely long template path %s"
msgstr ""
#: builtin/init-db.c:141
#, c-format
msgid "templates not found %s"
msgstr ""
#: builtin/init-db.c:154
#, c-format
msgid "not copying templates of a wrong format version %d from '%s'"
msgstr ""
#: builtin/init-db.c:192
#, c-format
msgid "insane git directory %s"
msgstr ""
#: builtin/init-db.c:323 builtin/init-db.c:326
#, c-format
msgid "%s already exists"
msgstr ""
#: builtin/init-db.c:355
#, c-format
msgid "unable to handle file type %d"
msgstr ""
#: builtin/init-db.c:358
#, c-format
msgid "unable to move %s to %s"
msgstr ""
#: builtin/init-db.c:363
#, c-format
msgid "Could not create git link %s"
msgstr ""
#.
#. * TRANSLATORS: The first '%s' is either "Reinitialized
#. * existing" or "Initialized empty", the second " shared" or
#. * "", and the last '%s%s' is the verbatim directory name.
#.
#: builtin/init-db.c:420
#, c-format
msgid "%s%s Git repository in %s%s\n"
msgstr ""
#: builtin/init-db.c:421
msgid "Reinitialized existing"
msgstr ""
#: builtin/init-db.c:421
msgid "Initialized empty"
msgstr ""
#: builtin/init-db.c:422
msgid " shared"
msgstr ""
#: builtin/init-db.c:441
msgid "cannot tell cwd"
msgstr ""
#: builtin/init-db.c:522 builtin/init-db.c:529
#, c-format
msgid "cannot mkdir %s"
msgstr ""
#: builtin/init-db.c:533
#, c-format
msgid "cannot chdir to %s"
msgstr ""
#: builtin/init-db.c:555
#, c-format
msgid ""
"%s (or --work-tree=<directory>) not allowed without specifying %s (or --git-"
"dir=<directory>)"
msgstr ""
#: builtin/init-db.c:579
msgid "Cannot access current working directory"
msgstr ""
#: builtin/init-db.c:586
#, c-format
msgid "Cannot access work tree '%s'"
msgstr ""
#: builtin/log.c:189
#, c-format
msgid "Final output: %d %s\n"
msgstr ""
#: builtin/log.c:403 builtin/log.c:494
#, c-format
msgid "Could not read object %s"
msgstr ""
#: builtin/log.c:518
#, c-format
msgid "Unknown type: %d"
msgstr ""
#: builtin/log.c:608
msgid "format.headers without value"
msgstr ""
#: builtin/log.c:682
msgid "name of output directory is too long"
msgstr ""
#: builtin/log.c:693
#, c-format
msgid "Cannot open patch file %s"
msgstr ""
#: builtin/log.c:707
msgid "Need exactly one range."
msgstr ""
#: builtin/log.c:715
msgid "Not a range."
msgstr ""
#: builtin/log.c:792
msgid "Cover letter needs email format"
msgstr ""
#: builtin/log.c:865
#, c-format
msgid "insane in-reply-to: %s"
msgstr ""
#: builtin/log.c:938
msgid "Two output directories?"
msgstr ""
#: builtin/log.c:1160
#, c-format
msgid "bogus committer info %s"
msgstr ""
#: builtin/log.c:1205
msgid "-n and -k are mutually exclusive."
msgstr ""
#: builtin/log.c:1207
msgid "--subject-prefix and -k are mutually exclusive."
msgstr ""
#: builtin/log.c:1215
msgid "--name-only does not make sense"
msgstr ""
#: builtin/log.c:1217
msgid "--name-status does not make sense"
msgstr ""
#: builtin/log.c:1219
msgid "--check does not make sense"
msgstr ""
#: builtin/log.c:1242
msgid "standard output, or directory, which one?"
msgstr ""
#: builtin/log.c:1244
#, c-format
msgid "Could not create directory '%s'"
msgstr ""
#: builtin/log.c:1397
msgid "Failed to create output files"
msgstr ""
#: builtin/log.c:1501
#, c-format
msgid ""
"Could not find a tracked remote branch, please specify <upstream> manually.\n"
msgstr ""
#: builtin/log.c:1517 builtin/log.c:1519 builtin/log.c:1531
#, c-format
msgid "Unknown commit %s"
msgstr ""
#: builtin/merge.c:90
msgid "switch `m' requires a value"
msgstr ""
#: builtin/merge.c:127
#, c-format
msgid "Could not find merge strategy '%s'.\n"
msgstr ""
#: builtin/merge.c:128
#, c-format
msgid "Available strategies are:"
msgstr ""
#: builtin/merge.c:133
#, c-format
msgid "Available custom strategies are:"
msgstr ""
#: builtin/merge.c:240
msgid "could not run stash."
msgstr ""
#: builtin/merge.c:245
msgid "stash failed"
msgstr ""
#: builtin/merge.c:250
#, c-format
msgid "not a valid object: %s"
msgstr ""
#: builtin/merge.c:269 builtin/merge.c:286
msgid "read-tree failed"
msgstr ""
#: builtin/merge.c:316
msgid " (nothing to squash)"
msgstr ""
#: builtin/merge.c:329
#, c-format
msgid "Squash commit -- not updating HEAD\n"
msgstr ""
#: builtin/merge.c:361
msgid "Writing SQUASH_MSG"
msgstr ""
#: builtin/merge.c:363
msgid "Finishing SQUASH_MSG"
msgstr ""
#: builtin/merge.c:386
#, c-format
msgid "No merge message -- not updating HEAD\n"
msgstr ""
#: builtin/merge.c:437
#, c-format
msgid "'%s' does not point to a commit"
msgstr ""
#: builtin/merge.c:536
#, c-format
msgid "Bad branch.%s.mergeoptions string: %s"
msgstr ""
#: builtin/merge.c:629
msgid "git write-tree failed to write a tree"
msgstr ""
#: builtin/merge.c:679
msgid "failed to read the cache"
msgstr ""
#: builtin/merge.c:710
msgid "Not handling anything other than two heads merge."
msgstr ""
#: builtin/merge.c:724
#, c-format
msgid "Unknown option for merge-recursive: -X%s"
msgstr ""
#: builtin/merge.c:738
#, c-format
msgid "unable to write %s"
msgstr ""
#: builtin/merge.c:877
#, c-format
msgid "Could not read from '%s'"
msgstr ""
#: builtin/merge.c:886
#, c-format
msgid "Not committing merge; use 'git commit' to complete the merge.\n"
msgstr ""
#: builtin/merge.c:892
msgid ""
"Please enter a commit message to explain why this merge is necessary,\n"
"especially if it merges an updated upstream into a topic branch.\n"
"\n"
"Lines starting with '#' will be ignored, and an empty message aborts\n"
"the commit.\n"
msgstr ""
#: builtin/merge.c:916
msgid "Empty commit message."
msgstr ""
#: builtin/merge.c:928
#, c-format
msgid "Wonderful.\n"
msgstr ""
#: builtin/merge.c:993
#, c-format
msgid "Automatic merge failed; fix conflicts and then commit the result.\n"
msgstr ""
#: builtin/merge.c:1009
#, c-format
msgid "'%s' is not a commit"
msgstr ""
#: builtin/merge.c:1050
msgid "No current branch."
msgstr ""
#: builtin/merge.c:1052
msgid "No remote for the current branch."
msgstr ""
#: builtin/merge.c:1054
msgid "No default upstream defined for the current branch."
msgstr ""
#: builtin/merge.c:1059
#, c-format
msgid "No remote tracking branch for %s from %s"
msgstr ""
#: builtin/merge.c:1146 builtin/merge.c:1303
#, c-format
msgid "%s - not something we can merge"
msgstr ""
#: builtin/merge.c:1214
msgid "There is no merge to abort (MERGE_HEAD missing)."
msgstr ""
#: builtin/merge.c:1230 git-pull.sh:31
msgid ""
"You have not concluded your merge (MERGE_HEAD exists).\n"
"Please, commit your changes before you can merge."
msgstr ""
#: builtin/merge.c:1233 git-pull.sh:34
msgid "You have not concluded your merge (MERGE_HEAD exists)."
msgstr ""
#: builtin/merge.c:1237
msgid ""
"You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n"
"Please, commit your changes before you can merge."
msgstr ""
#: builtin/merge.c:1240
msgid "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists)."
msgstr ""
#: builtin/merge.c:1249
msgid "You cannot combine --squash with --no-ff."
msgstr ""
#: builtin/merge.c:1254
msgid "You cannot combine --no-ff with --ff-only."
msgstr ""
#: builtin/merge.c:1261
msgid "No commit specified and merge.defaultToUpstream not set."
msgstr ""
#: builtin/merge.c:1293
msgid "Can merge only exactly one commit into empty head"
msgstr ""
#: builtin/merge.c:1296
msgid "Squash commit into empty head not supported yet"
msgstr ""
#: builtin/merge.c:1298
msgid "Non-fast-forward commit does not make sense into an empty head"
msgstr ""
#: builtin/merge.c:1413
#, c-format
msgid "Updating %s..%s\n"
msgstr ""
#: builtin/merge.c:1451
#, c-format
msgid "Trying really trivial in-index merge...\n"
msgstr ""
#: builtin/merge.c:1458
#, c-format
msgid "Nope.\n"
msgstr ""
#: builtin/merge.c:1490
msgid "Not possible to fast-forward, aborting."
msgstr ""
#: builtin/merge.c:1513 builtin/merge.c:1592
#, c-format
msgid "Rewinding the tree to pristine...\n"
msgstr ""
#: builtin/merge.c:1517
#, c-format
msgid "Trying merge strategy %s...\n"
msgstr ""
#: builtin/merge.c:1583
#, c-format
msgid "No merge strategy handled the merge.\n"
msgstr ""
#: builtin/merge.c:1585
#, c-format
msgid "Merge with strategy %s failed.\n"
msgstr ""
#: builtin/merge.c:1594
#, c-format
msgid "Using the %s to prepare resolving by hand.\n"
msgstr ""
#: builtin/merge.c:1606
#, c-format
msgid "Automatic merge went well; stopped before committing as requested\n"
msgstr ""
#: builtin/mv.c:108
#, c-format
msgid "Checking rename of '%s' to '%s'\n"
msgstr ""
#: builtin/mv.c:112
msgid "bad source"
msgstr ""
#: builtin/mv.c:115
msgid "can not move directory into itself"
msgstr ""
#: builtin/mv.c:118
msgid "cannot move directory over file"
msgstr ""
#: builtin/mv.c:128
#, c-format
msgid "Huh? %.*s is in index?"
msgstr ""
#: builtin/mv.c:140
msgid "source directory is empty"
msgstr ""
#: builtin/mv.c:171
msgid "not under version control"
msgstr ""
#: builtin/mv.c:173
msgid "destination exists"
msgstr ""
#: builtin/mv.c:181
#, c-format
msgid "overwriting '%s'"
msgstr ""
#: builtin/mv.c:184
msgid "Cannot overwrite"
msgstr ""
#: builtin/mv.c:187
msgid "multiple sources for the same target"
msgstr ""
#: builtin/mv.c:202
#, c-format
msgid "%s, source=%s, destination=%s"
msgstr ""
#: builtin/mv.c:212
#, c-format
msgid "Renaming %s to %s\n"
msgstr ""
#: builtin/mv.c:215 builtin/remote.c:731
#, c-format
msgid "renaming '%s' failed"
msgstr ""
#: builtin/notes.c:139
#, c-format
msgid "unable to start 'show' for object '%s'"
msgstr ""
#: builtin/notes.c:145
msgid "can't fdopen 'show' output fd"
msgstr ""
#: builtin/notes.c:155
#, c-format
msgid "failed to close pipe to 'show' for object '%s'"
msgstr ""
#: builtin/notes.c:158
#, c-format
msgid "failed to finish 'show' for object '%s'"
msgstr ""
#: builtin/notes.c:175 builtin/tag.c:347
#, c-format
msgid "could not create file '%s'"
msgstr ""
#: builtin/notes.c:189
msgid "Please supply the note contents using either -m or -F option"
msgstr ""
#: builtin/notes.c:210 builtin/notes.c:973
#, c-format
msgid "Removing note for object %s\n"
msgstr ""
#: builtin/notes.c:215
msgid "unable to write note object"
msgstr ""
#: builtin/notes.c:217
#, c-format
msgid "The note contents has been left in %s"
msgstr ""
#: builtin/notes.c:251 builtin/tag.c:542
#, c-format
msgid "cannot read '%s'"
msgstr ""
#: builtin/notes.c:253 builtin/tag.c:545
#, c-format
msgid "could not open or read '%s'"
msgstr ""
#: builtin/notes.c:272 builtin/notes.c:445 builtin/notes.c:447
#: builtin/notes.c:507 builtin/notes.c:561 builtin/notes.c:644
#: builtin/notes.c:649 builtin/notes.c:724 builtin/notes.c:766
#: builtin/notes.c:968 builtin/reset.c:293 builtin/tag.c:558
#, c-format
msgid "Failed to resolve '%s' as a valid ref."
msgstr ""
#: builtin/notes.c:275
#, c-format
msgid "Failed to read object '%s'."
msgstr ""
#: builtin/notes.c:299
msgid "Cannot commit uninitialized/unreferenced notes tree"
msgstr ""
#: builtin/notes.c:340
#, c-format
msgid "Bad notes.rewriteMode value: '%s'"
msgstr ""
#: builtin/notes.c:350
#, c-format
msgid "Refusing to rewrite notes in %s (outside of refs/notes/)"
msgstr ""
#. TRANSLATORS: The first %s is the name of the
#. environment variable, the second %s is its value
#: builtin/notes.c:377
#, c-format
msgid "Bad %s value: '%s'"
msgstr ""
#: builtin/notes.c:441
#, c-format
msgid "Malformed input line: '%s'."
msgstr ""
#: builtin/notes.c:456
#, c-format
msgid "Failed to copy notes from '%s' to '%s'"
msgstr ""
#: builtin/notes.c:500 builtin/notes.c:554 builtin/notes.c:627
#: builtin/notes.c:639 builtin/notes.c:712 builtin/notes.c:759
#: builtin/notes.c:1033
msgid "too many parameters"
msgstr ""
#: builtin/notes.c:513 builtin/notes.c:772
#, c-format
msgid "No note found for object %s."
msgstr ""
#: builtin/notes.c:580
#, c-format
msgid ""
"Cannot add notes. Found existing notes for object %s. Use '-f' to overwrite "
"existing notes"
msgstr ""
#: builtin/notes.c:585 builtin/notes.c:662
#, c-format
msgid "Overwriting existing notes for object %s\n"
msgstr ""
#: builtin/notes.c:635
msgid "too few parameters"
msgstr ""
#: builtin/notes.c:656
#, c-format
msgid ""
"Cannot copy notes. Found existing notes for object %s. Use '-f' to overwrite "
"existing notes"
msgstr ""
#: builtin/notes.c:668
#, c-format
msgid "Missing notes on source object %s. Cannot copy."
msgstr ""
#: builtin/notes.c:717
#, c-format
msgid ""
"The -m/-F/-c/-C options have been deprecated for the 'edit' subcommand.\n"
"Please use 'git notes add -f -m/-F/-c/-C' instead.\n"
msgstr ""
#: builtin/notes.c:971
#, c-format
msgid "Object %s has no note\n"
msgstr ""
#: builtin/notes.c:1103 builtin/remote.c:1598
#, c-format
msgid "Unknown subcommand: %s"
msgstr ""
#: builtin/pack-objects.c:183 builtin/pack-objects.c:186
#, c-format
msgid "deflate error (%d)"
msgstr ""
#: builtin/pack-objects.c:2398
#, c-format
msgid "unsupported index version %s"
msgstr ""
#: builtin/pack-objects.c:2402
#, c-format
msgid "bad index version '%s'"
msgstr ""
#: builtin/pack-objects.c:2425
#, c-format
msgid "option %s does not accept negative form"
msgstr ""
#: builtin/pack-objects.c:2429
#, c-format
msgid "unable to parse value '%s' for option %s"
msgstr ""
#: builtin/push.c:45
msgid "tag shorthand without <tag>"
msgstr ""
#: builtin/push.c:64
msgid "--delete only accepts plain target ref names"
msgstr ""
#: builtin/push.c:99
msgid ""
"\n"
"To choose either option permanently, see push.default in 'git help config'."
msgstr ""
#: builtin/push.c:102
#, c-format
msgid ""
"The upstream branch of your current branch does not match\n"
"the name of your current branch. To push to the upstream branch\n"
"on the remote, use\n"
"\n"
" git push %s HEAD:%s\n"
"\n"
"To push to the branch of the same name on the remote, use\n"
"\n"
" git push %s %s\n"
"%s"
msgstr ""
#: builtin/push.c:121
#, c-format
msgid ""
"You are not currently on a branch.\n"
"To push the history leading to the current (detached HEAD)\n"
"state now, use\n"
"\n"
" git push %s HEAD:<name-of-remote-branch>\n"
msgstr ""
#: builtin/push.c:128
#, c-format
msgid ""
"The current branch %s has no upstream branch.\n"
"To push the current branch and set the remote as upstream, use\n"
"\n"
" git push --set-upstream %s %s\n"
msgstr ""
#: builtin/push.c:136
#, c-format
msgid "The current branch %s has multiple upstream branches, refusing to push."
msgstr ""
#: builtin/push.c:139
#, c-format
msgid ""
"You are pushing to remote '%s', which is not the upstream of\n"
"your current branch '%s', without telling me what to push\n"
"to update which remote branch."
msgstr ""
#: builtin/push.c:174
msgid ""
"You didn't specify any refspecs to push, and push.default is \"nothing\"."
msgstr ""
#: builtin/push.c:181
msgid ""
"Updates were rejected because the tip of your current branch is behind\n"
"its remote counterpart. Merge the remote changes (e.g. 'git pull')\n"
"before pushing again.\n"
"See the 'Note about fast-forwards' in 'git push --help' for details."
msgstr ""
#: builtin/push.c:187
msgid ""
"Updates were rejected because a pushed branch tip is behind its remote\n"
"counterpart. If you did not intend to push that branch, you may want to\n"
"specify branches to push or set the 'push.default' configuration\n"
"variable to 'current' or 'upstream' to push only the current branch."
msgstr ""
#: builtin/push.c:193
msgid ""
"Updates were rejected because a pushed branch tip is behind its remote\n"
"counterpart. Check out this branch and merge the remote changes\n"
"(e.g. 'git pull') before pushing again.\n"
"See the 'Note about fast-forwards' in 'git push --help' for details."
msgstr ""
#: builtin/push.c:233
#, c-format
msgid "Pushing to %s\n"
msgstr ""
#: builtin/push.c:237
#, c-format
msgid "failed to push some refs to '%s'"
msgstr ""
#: builtin/push.c:269
#, c-format
msgid "bad repository '%s'"
msgstr ""
#: builtin/push.c:270
msgid ""
"No configured push destination.\n"
"Either specify the URL from the command-line or configure a remote "
"repository using\n"
"\n"
" git remote add <name> <url>\n"
"\n"
"and then push using the remote name\n"
"\n"
" git push <name>\n"
msgstr ""
#: builtin/push.c:285
msgid "--all and --tags are incompatible"
msgstr ""
#: builtin/push.c:286
msgid "--all can't be combined with refspecs"
msgstr ""
#: builtin/push.c:291
msgid "--mirror and --tags are incompatible"
msgstr ""
#: builtin/push.c:292
msgid "--mirror can't be combined with refspecs"
msgstr ""
#: builtin/push.c:297
msgid "--all and --mirror are incompatible"
msgstr ""
#: builtin/push.c:385
msgid "--delete is incompatible with --all, --mirror and --tags"
msgstr ""
#: builtin/push.c:387
msgid "--delete doesn't make sense without any refs"
msgstr ""
#: builtin/remote.c:98
#, c-format
msgid "Updating %s"
msgstr ""
#: builtin/remote.c:130
msgid ""
"--mirror is dangerous and deprecated; please\n"
"\t use --mirror=fetch or --mirror=push instead"
msgstr ""
#: builtin/remote.c:147
#, c-format
msgid "unknown mirror argument: %s"
msgstr ""
#: builtin/remote.c:185
msgid "specifying a master branch makes no sense with --mirror"
msgstr ""
#: builtin/remote.c:187
msgid "specifying branches to track makes sense only with fetch mirrors"
msgstr ""
#: builtin/remote.c:195 builtin/remote.c:646
#, c-format
msgid "remote %s already exists."
msgstr ""
#: builtin/remote.c:199 builtin/remote.c:650
#, c-format
msgid "'%s' is not a valid remote name"
msgstr ""
#: builtin/remote.c:243
#, c-format
msgid "Could not setup master '%s'"
msgstr ""
#: builtin/remote.c:299
#, c-format
msgid "more than one %s"
msgstr ""
#: builtin/remote.c:339
#, c-format
msgid "Could not get fetch map for refspec %s"
msgstr ""
#: builtin/remote.c:440 builtin/remote.c:448
msgid "(matching)"
msgstr ""
#: builtin/remote.c:452
msgid "(delete)"
msgstr ""
#: builtin/remote.c:595 builtin/remote.c:601 builtin/remote.c:607
#, c-format
msgid "Could not append '%s' to '%s'"
msgstr ""
#: builtin/remote.c:639 builtin/remote.c:792 builtin/remote.c:890
#, c-format
msgid "No such remote: %s"
msgstr ""
#: builtin/remote.c:656
#, c-format
msgid "Could not rename config section '%s' to '%s'"
msgstr ""
#: builtin/remote.c:662 builtin/remote.c:799
#, c-format
msgid "Could not remove config section '%s'"
msgstr ""
#: builtin/remote.c:677
#, c-format
msgid ""
"Not updating non-default fetch refspec\n"
"\t%s\n"
"\tPlease update the configuration manually if necessary."
msgstr ""
#: builtin/remote.c:683
#, c-format
msgid "Could not append '%s'"
msgstr ""
#: builtin/remote.c:694
#, c-format
msgid "Could not set '%s'"
msgstr ""
#: builtin/remote.c:716
#, c-format
msgid "deleting '%s' failed"
msgstr ""
#: builtin/remote.c:750
#, c-format
msgid "creating '%s' failed"
msgstr ""
#: builtin/remote.c:764
#, c-format
msgid "Could not remove branch %s"
msgstr ""
#: builtin/remote.c:834
msgid ""
"Note: A branch outside the refs/remotes/ hierarchy was not removed;\n"
"to delete it, use:"
msgid_plural ""
"Note: Some branches outside the refs/remotes/ hierarchy were not removed;\n"
"to delete them, use:"
msgstr[0] ""
msgstr[1] ""
#: builtin/remote.c:943
#, c-format
msgid " new (next fetch will store in remotes/%s)"
msgstr ""
#: builtin/remote.c:946
msgid " tracked"
msgstr ""
#: builtin/remote.c:948
msgid " stale (use 'git remote prune' to remove)"
msgstr ""
#: builtin/remote.c:950
msgid " ???"
msgstr ""
#: builtin/remote.c:991
#, c-format
msgid "invalid branch.%s.merge; cannot rebase onto > 1 branch"
msgstr ""
#: builtin/remote.c:998
#, c-format
msgid "rebases onto remote %s"
msgstr ""
#: builtin/remote.c:1001
#, c-format
msgid " merges with remote %s"
msgstr ""
#: builtin/remote.c:1002
msgid " and with remote"
msgstr ""
#: builtin/remote.c:1004
#, c-format
msgid "merges with remote %s"
msgstr ""
#: builtin/remote.c:1005
msgid " and with remote"
msgstr ""
#: builtin/remote.c:1051
msgid "create"
msgstr ""
#: builtin/remote.c:1054
msgid "delete"
msgstr ""
#: builtin/remote.c:1058
msgid "up to date"
msgstr ""
#: builtin/remote.c:1061
msgid "fast-forwardable"
msgstr ""
#: builtin/remote.c:1064
msgid "local out of date"
msgstr ""
#: builtin/remote.c:1071
#, c-format
msgid " %-*s forces to %-*s (%s)"
msgstr ""
#: builtin/remote.c:1074
#, c-format
msgid " %-*s pushes to %-*s (%s)"
msgstr ""
#: builtin/remote.c:1078
#, c-format
msgid " %-*s forces to %s"
msgstr ""
#: builtin/remote.c:1081
#, c-format
msgid " %-*s pushes to %s"
msgstr ""
#: builtin/remote.c:1118
#, c-format
msgid "* remote %s"
msgstr ""
#: builtin/remote.c:1119
#, c-format
msgid " Fetch URL: %s"
msgstr ""
#: builtin/remote.c:1120 builtin/remote.c:1285
msgid "(no URL)"
msgstr ""
#: builtin/remote.c:1129 builtin/remote.c:1131
#, c-format
msgid " Push URL: %s"
msgstr ""
#: builtin/remote.c:1133 builtin/remote.c:1135 builtin/remote.c:1137
#, c-format
msgid " HEAD branch: %s"
msgstr ""
#: builtin/remote.c:1139
#, c-format
msgid ""
" HEAD branch (remote HEAD is ambiguous, may be one of the following):\n"
msgstr ""
#: builtin/remote.c:1151
#, c-format
msgid " Remote branch:%s"
msgid_plural " Remote branches:%s"
msgstr[0] ""
msgstr[1] ""
#: builtin/remote.c:1154 builtin/remote.c:1181
msgid " (status not queried)"
msgstr ""
#: builtin/remote.c:1163
msgid " Local branch configured for 'git pull':"
msgid_plural " Local branches configured for 'git pull':"
msgstr[0] ""
msgstr[1] ""
#: builtin/remote.c:1171
msgid " Local refs will be mirrored by 'git push'"
msgstr ""
#: builtin/remote.c:1178
#, c-format
msgid " Local ref configured for 'git push'%s:"
msgid_plural " Local refs configured for 'git push'%s:"
msgstr[0] ""
msgstr[1] ""
#: builtin/remote.c:1216
msgid "Cannot determine remote HEAD"
msgstr ""
#: builtin/remote.c:1218
msgid "Multiple remote HEAD branches. Please choose one explicitly with:"
msgstr ""
#: builtin/remote.c:1228
#, c-format
msgid "Could not delete %s"
msgstr ""
#: builtin/remote.c:1236
#, c-format
msgid "Not a valid ref: %s"
msgstr ""
#: builtin/remote.c:1238
#, c-format
msgid "Could not setup %s"
msgstr ""
#: builtin/remote.c:1274
#, c-format
msgid " %s will become dangling!"
msgstr ""
#: builtin/remote.c:1275
#, c-format
msgid " %s has become dangling!"
msgstr ""
#: builtin/remote.c:1281
#, c-format
msgid "Pruning %s"
msgstr ""
#: builtin/remote.c:1282
#, c-format
msgid "URL: %s"
msgstr ""
#: builtin/remote.c:1295
#, c-format
msgid " * [would prune] %s"
msgstr ""
#: builtin/remote.c:1298
#, c-format
msgid " * [pruned] %s"
msgstr ""
#: builtin/remote.c:1387 builtin/remote.c:1461
#, c-format
msgid "No such remote '%s'"
msgstr ""
#: builtin/remote.c:1414
msgid "no remote specified"
msgstr ""
#: builtin/remote.c:1447
msgid "--add --delete doesn't make sense"
msgstr ""
#: builtin/remote.c:1487
#, c-format
msgid "Invalid old URL pattern: %s"
msgstr ""
#: builtin/remote.c:1495
#, c-format
msgid "No such URL found: %s"
msgstr ""
#: builtin/remote.c:1497
msgid "Will not delete all non-push URLs"
msgstr ""
#: builtin/reset.c:33
msgid "mixed"
msgstr ""
#: builtin/reset.c:33
msgid "soft"
msgstr ""
#: builtin/reset.c:33
msgid "hard"
msgstr ""
#: builtin/reset.c:33
msgid "merge"
msgstr ""
#: builtin/reset.c:33
msgid "keep"
msgstr ""
#: builtin/reset.c:77
msgid "You do not have a valid HEAD."
msgstr ""
#: builtin/reset.c:79
msgid "Failed to find tree of HEAD."
msgstr ""
#: builtin/reset.c:85
#, c-format
msgid "Failed to find tree of %s."
msgstr ""
#: builtin/reset.c:96
msgid "Could not write new index file."
msgstr ""
#: builtin/reset.c:106
#, c-format
msgid "HEAD is now at %s"
msgstr ""
#: builtin/reset.c:130
msgid "Could not read index"
msgstr ""
#: builtin/reset.c:133
msgid "Unstaged changes after reset:"
msgstr ""
#: builtin/reset.c:223
#, c-format
msgid "Cannot do a %s reset in the middle of a merge."
msgstr ""
#: builtin/reset.c:303
#, c-format
msgid "Could not parse object '%s'."
msgstr ""
#: builtin/reset.c:308
msgid "--patch is incompatible with --{hard,mixed,soft}"
msgstr ""
#: builtin/reset.c:317
msgid "--mixed with paths is deprecated; use 'git reset -- <paths>' instead."
msgstr ""
#: builtin/reset.c:319
#, c-format
msgid "Cannot do %s reset with paths."
msgstr ""
#: builtin/reset.c:331
#, c-format
msgid "%s reset is not allowed in a bare repository"
msgstr ""
#: builtin/reset.c:347
#, c-format
msgid "Could not reset index file to revision '%s'."
msgstr ""
#: builtin/revert.c:70 builtin/revert.c:92
#, c-format
msgid "%s: %s cannot be used with %s"
msgstr ""
#: builtin/revert.c:131
msgid "program error"
msgstr ""
#: builtin/revert.c:221
msgid "revert failed"
msgstr ""
#: builtin/revert.c:236
msgid "cherry-pick failed"
msgstr ""
#: builtin/rm.c:109
#, c-format
msgid ""
"'%s' has staged content different from both the file and the HEAD\n"
"(use -f to force removal)"
msgstr ""
#: builtin/rm.c:115
#, c-format
msgid ""
"'%s' has changes staged in the index\n"
"(use --cached to keep the file, or -f to force removal)"
msgstr ""
#: builtin/rm.c:119
#, c-format
msgid ""
"'%s' has local modifications\n"
"(use --cached to keep the file, or -f to force removal)"
msgstr ""
#: builtin/rm.c:194
#, c-format
msgid "not removing '%s' recursively without -r"
msgstr ""
#: builtin/rm.c:230
#, c-format
msgid "git rm: unable to remove %s"
msgstr ""
#: builtin/shortlog.c:157
#, c-format
msgid "Missing author: %s"
msgstr ""
#: builtin/tag.c:60
#, c-format
msgid "malformed object at '%s'"
msgstr ""
#: builtin/tag.c:207
#, c-format
msgid "tag name too long: %.*s..."
msgstr ""
#: builtin/tag.c:212
#, c-format
msgid "tag '%s' not found."
msgstr ""
#: builtin/tag.c:227
#, c-format
msgid "Deleted tag '%s' (was %s)\n"
msgstr ""
#: builtin/tag.c:239
#, c-format
msgid "could not verify the tag '%s'"
msgstr ""
#: builtin/tag.c:249
msgid ""
"\n"
"#\n"
"# Write a tag message\n"
"# Lines starting with '#' will be ignored.\n"
"#\n"
msgstr ""
#: builtin/tag.c:256
msgid ""
"\n"
"#\n"
"# Write a tag message\n"
"# Lines starting with '#' will be kept; you may remove them yourself if you "
"want to.\n"
"#\n"
msgstr ""
#: builtin/tag.c:298
msgid "unable to sign the tag"
msgstr ""
#: builtin/tag.c:300
msgid "unable to write tag file"
msgstr ""
#: builtin/tag.c:325
msgid "bad object type."
msgstr ""
#: builtin/tag.c:338
msgid "tag header too big."
msgstr ""
#: builtin/tag.c:370
msgid "no tag message?"
msgstr ""
#: builtin/tag.c:376
#, c-format
msgid "The tag message has been left in %s\n"
msgstr ""
#: builtin/tag.c:425
msgid "switch 'points-at' requires an object"
msgstr ""
#: builtin/tag.c:427
#, c-format
msgid "malformed object name '%s'"
msgstr ""
#: builtin/tag.c:506
msgid "--column and -n are incompatible"
msgstr ""
#: builtin/tag.c:523
msgid "-n option is only allowed with -l."
msgstr ""
#: builtin/tag.c:525
msgid "--contains option is only allowed with -l."
msgstr ""
#: builtin/tag.c:527
msgid "--points-at option is only allowed with -l."
msgstr ""
#: builtin/tag.c:535
msgid "only one -F or -m option is allowed."
msgstr ""
#: builtin/tag.c:555
msgid "too many params"
msgstr ""
#: builtin/tag.c:561
#, c-format
msgid "'%s' is not a valid tag name."
msgstr ""
#: builtin/tag.c:566
#, c-format
msgid "tag '%s' already exists"
msgstr ""
#: builtin/tag.c:584
#, c-format
msgid "%s: cannot lock the ref"
msgstr ""
#: builtin/tag.c:586
#, c-format
msgid "%s: cannot update the ref"
msgstr ""
#: builtin/tag.c:588
#, c-format
msgid "Updated tag '%s' (was %s)\n"
msgstr ""
#: git.c:16
msgid "See 'git help <command>' for more information on a specific command."
msgstr ""
#: parse-options.h:133 parse-options.h:235
msgid "n"
msgstr ""
#: parse-options.h:141
msgid "time"
msgstr ""
#: parse-options.h:149
msgid "file"
msgstr ""
#: parse-options.h:151
msgid "when"
msgstr ""
#: parse-options.h:156
msgid "no-op (backward compatibility)"
msgstr ""
#: parse-options.h:228
msgid "be more verbose"
msgstr ""
#: parse-options.h:230
msgid "be more quiet"
msgstr ""
#: parse-options.h:236
msgid "use <n> digits to display SHA-1s"
msgstr ""
#: common-cmds.h:8
msgid "Add file contents to the index"
msgstr ""
#: common-cmds.h:9
msgid "Find by binary search the change that introduced a bug"
msgstr ""
#: common-cmds.h:10
msgid "List, create, or delete branches"
msgstr ""
#: common-cmds.h:11
msgid "Checkout a branch or paths to the working tree"
msgstr ""
#: common-cmds.h:12
msgid "Clone a repository into a new directory"
msgstr ""
#: common-cmds.h:13
msgid "Record changes to the repository"
msgstr ""
#: common-cmds.h:14
msgid "Show changes between commits, commit and working tree, etc"
msgstr ""
#: common-cmds.h:15
msgid "Download objects and refs from another repository"
msgstr ""
#: common-cmds.h:16
msgid "Print lines matching a pattern"
msgstr ""
#: common-cmds.h:17
msgid "Create an empty git repository or reinitialize an existing one"
msgstr ""
#: common-cmds.h:18
msgid "Show commit logs"
msgstr ""
#: common-cmds.h:19
msgid "Join two or more development histories together"
msgstr ""
#: common-cmds.h:20
msgid "Move or rename a file, a directory, or a symlink"
msgstr ""
#: common-cmds.h:21
msgid "Fetch from and merge with another repository or a local branch"
msgstr ""
#: common-cmds.h:22
msgid "Update remote refs along with associated objects"
msgstr ""
#: common-cmds.h:23
msgid "Forward-port local commits to the updated upstream head"
msgstr ""
#: common-cmds.h:24
msgid "Reset current HEAD to the specified state"
msgstr ""
#: common-cmds.h:25
msgid "Remove files from the working tree and from the index"
msgstr ""
#: common-cmds.h:26
msgid "Show various types of objects"
msgstr ""
#: common-cmds.h:27
msgid "Show the working tree status"
msgstr ""
#: common-cmds.h:28
msgid "Create, list, delete or verify a tag object signed with GPG"
msgstr ""
#: git-am.sh:50
msgid "You need to set your committer info first"
msgstr ""
#: git-am.sh:95
msgid ""
"You seem to have moved HEAD since the last 'am' failure.\n"
"Not rewinding to ORIG_HEAD"
msgstr ""
#: git-am.sh:105
#, sh-format
msgid ""
"When you have resolved this problem, run \"$cmdline --resolved\".\n"
"If you prefer to skip this patch, run \"$cmdline --skip\" instead.\n"
"To restore the original branch and stop patching, run \"$cmdline --abort\"."
msgstr ""
#: git-am.sh:121
msgid "Cannot fall back to three-way merge."
msgstr ""
#: git-am.sh:137
msgid "Repository lacks necessary blobs to fall back on 3-way merge."
msgstr ""
#: git-am.sh:139
msgid "Using index info to reconstruct a base tree..."
msgstr ""
#: git-am.sh:154
msgid ""
"Did you hand edit your patch?\n"
"It does not apply to blobs recorded in its index."
msgstr ""
#: git-am.sh:163
msgid "Falling back to patching base and 3-way merge..."
msgstr ""
#: git-am.sh:179
msgid "Failed to merge in the changes."
msgstr ""
#: git-am.sh:274
msgid "Only one StGIT patch series can be applied at once"
msgstr ""
#: git-am.sh:361
#, sh-format
msgid "Patch format $patch_format is not supported."
msgstr ""
#: git-am.sh:363
msgid "Patch format detection failed."
msgstr ""
#: git-am.sh:389
msgid ""
"The -b/--binary option has been a no-op for long time, and\n"
"it will be removed. Please do not use it anymore."
msgstr ""
#: git-am.sh:477
#, sh-format
msgid "previous rebase directory $dotest still exists but mbox given."
msgstr ""
#: git-am.sh:482
msgid "Please make up your mind. --skip or --abort?"
msgstr ""
#: git-am.sh:509
msgid "Resolve operation not in progress, we are not resuming."
msgstr ""
#: git-am.sh:575
#, sh-format
msgid "Dirty index: cannot apply patches (dirty: $files)"
msgstr ""
#: git-am.sh:679
#, sh-format
msgid ""
"Patch is empty. Was it split wrong?\n"
"If you would prefer to skip this patch, instead run \"$cmdline --skip\".\n"
"To restore the original branch and stop patching run \"$cmdline --abort\"."
msgstr ""
#: git-am.sh:706
msgid "Patch does not have a valid e-mail address."
msgstr ""
#: git-am.sh:753
msgid "cannot be interactive without stdin connected to a terminal."
msgstr ""
#: git-am.sh:757
msgid "Commit Body is:"
msgstr ""
#. TRANSLATORS: Make sure to include [y], [n], [e], [v] and [a]
#. in your translation. The program will only accept English
#. input at this point.
#: git-am.sh:764
msgid "Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all "
msgstr ""
#: git-am.sh:800
#, sh-format
msgid "Applying: $FIRSTLINE"
msgstr ""
#: git-am.sh:821
msgid ""
"No changes - did you forget to use 'git add'?\n"
"If there is nothing left to stage, chances are that something else\n"
"already introduced the same changes; you might want to skip this patch."
msgstr ""
#: git-am.sh:829
msgid ""
"You still have unmerged paths in your index\n"
"did you forget to use 'git add'?"
msgstr ""
#: git-am.sh:845
msgid "No changes -- Patch already applied."
msgstr ""
#: git-am.sh:855
#, sh-format
msgid "Patch failed at $msgnum $FIRSTLINE"
msgstr ""
#: git-am.sh:876
msgid "applying to an empty history"
msgstr ""
#: git-bisect.sh:48
msgid "You need to start by \"git bisect start\""
msgstr ""
#. TRANSLATORS: Make sure to include [Y] and [n] in your
#. translation. The program will only accept English input
#. at this point.
#: git-bisect.sh:54
msgid "Do you want me to do it for you [Y/n]? "
msgstr ""
#: git-bisect.sh:95
#, sh-format
msgid "unrecognised option: '$arg'"
msgstr ""
#: git-bisect.sh:99
#, sh-format
msgid "'$arg' does not appear to be a valid revision"
msgstr ""
#: git-bisect.sh:117
msgid "Bad HEAD - I need a HEAD"
msgstr ""
#: git-bisect.sh:130
#, sh-format
msgid ""
"Checking out '$start_head' failed. Try 'git bisect reset <validbranch>'."
msgstr ""
#: git-bisect.sh:140
msgid "won't bisect on seeked tree"
msgstr ""
#: git-bisect.sh:144
msgid "Bad HEAD - strange symbolic ref"
msgstr ""
#: git-bisect.sh:189
#, sh-format
msgid "Bad bisect_write argument: $state"
msgstr ""
#: git-bisect.sh:218
#, sh-format
msgid "Bad rev input: $arg"
msgstr ""
#: git-bisect.sh:232
msgid "Please call 'bisect_state' with at least one argument."
msgstr ""
#: git-bisect.sh:244
#, sh-format
msgid "Bad rev input: $rev"
msgstr ""
#: git-bisect.sh:250
msgid "'git bisect bad' can take only one argument."
msgstr ""
#. have bad but not good. we could bisect although
#. this is less optimum.
#: git-bisect.sh:273
msgid "Warning: bisecting only with a bad commit."
msgstr ""
#. TRANSLATORS: Make sure to include [Y] and [n] in your
#. translation. The program will only accept English input
#. at this point.
#: git-bisect.sh:279
msgid "Are you sure [Y/n]? "
msgstr ""
#: git-bisect.sh:289
msgid ""
"You need to give me at least one good and one bad revisions.\n"
"(You can use \"git bisect bad\" and \"git bisect good\" for that.)"
msgstr ""
#: git-bisect.sh:292
msgid ""
"You need to start by \"git bisect start\".\n"
"You then need to give me at least one good and one bad revisions.\n"
"(You can use \"git bisect bad\" and \"git bisect good\" for that.)"
msgstr ""
#: git-bisect.sh:347 git-bisect.sh:474
msgid "We are not bisecting."
msgstr ""
#: git-bisect.sh:354
#, sh-format
msgid "'$invalid' is not a valid commit"
msgstr ""
#: git-bisect.sh:363
#, sh-format
msgid ""
"Could not check out original HEAD '$branch'.\n"
"Try 'git bisect reset <commit>'."
msgstr ""
#: git-bisect.sh:390
msgid "No logfile given"
msgstr ""
#: git-bisect.sh:391
#, sh-format
msgid "cannot read $file for replaying"
msgstr ""
#: git-bisect.sh:408
msgid "?? what are you talking about?"
msgstr ""
#: git-bisect.sh:420
#, sh-format
msgid "running $command"
msgstr ""
#: git-bisect.sh:427
#, sh-format
msgid ""
"bisect run failed:\n"
"exit code $res from '$command' is < 0 or >= 128"
msgstr ""
#: git-bisect.sh:453
msgid "bisect run cannot continue any more"
msgstr ""
#: git-bisect.sh:459
#, sh-format
msgid ""
"bisect run failed:\n"
"'bisect_state $state' exited with error code $res"
msgstr ""
#: git-bisect.sh:466
msgid "bisect run success"
msgstr ""
#: git-pull.sh:21
msgid ""
"Pull is not possible because you have unmerged files.\n"
"Please, fix them up in the work tree, and then use 'git add/rm <file>'\n"
"as appropriate to mark resolution, or use 'git commit -a'."
msgstr ""
#: git-pull.sh:25
msgid "Pull is not possible because you have unmerged files."
msgstr ""
#: git-pull.sh:197
msgid "updating an unborn branch with changes added to the index"
msgstr ""
#. The fetch involved updating the current branch.
#. The working tree and the index file is still based on the
#. $orig_head commit, but we are merging into $curr_head.
#. First update the working tree to match $curr_head.
#: git-pull.sh:228
#, sh-format
msgid ""
"Warning: fetch updated the current branch head.\n"
"Warning: fast-forwarding your working tree from\n"
"Warning: commit $orig_head."
msgstr ""
#: git-pull.sh:253
msgid "Cannot merge multiple branches into empty head"
msgstr ""
#: git-pull.sh:257
msgid "Cannot rebase onto multiple branches"
msgstr ""
#: git-rebase.sh:52
msgid ""
"When you have resolved this problem, run \"git rebase --continue\".\n"
"If you prefer to skip this patch, run \"git rebase --skip\" instead.\n"
"To check out the original branch and stop rebasing, run \"git rebase --abort"
"\"."
msgstr ""
#: git-rebase.sh:159
msgid "The pre-rebase hook refused to rebase."
msgstr ""
#: git-rebase.sh:164
msgid "It looks like git-am is in progress. Cannot rebase."
msgstr ""
#: git-rebase.sh:295
msgid "The --exec option must be used with the --interactive option"
msgstr ""
#: git-rebase.sh:300
msgid "No rebase in progress?"
msgstr ""
#: git-rebase.sh:313
msgid "Cannot read HEAD"
msgstr ""
#: git-rebase.sh:316
msgid ""
"You must edit all merge conflicts and then\n"
"mark them as resolved using git add"
msgstr ""
#: git-rebase.sh:334
#, sh-format
msgid "Could not move back to $head_name"
msgstr ""
#: git-rebase.sh:350
#, sh-format
msgid ""
"It seems that there is already a $state_dir_base directory, and\n"
"I wonder if you are in the middle of another rebase. If that is the\n"
"case, please try\n"
"\t$cmd_live_rebase\n"
"If that is not the case, please\n"
"\t$cmd_clear_stale_rebase\n"
"and run me again. I am stopping in case you still have something\n"
"valuable there."
msgstr ""
#: git-rebase.sh:395
#, sh-format
msgid "invalid upstream $upstream_name"
msgstr ""
#: git-rebase.sh:419
#, sh-format
msgid "$onto_name: there are more than one merge bases"
msgstr ""
#: git-rebase.sh:422 git-rebase.sh:426
#, sh-format
msgid "$onto_name: there is no merge base"
msgstr ""
#: git-rebase.sh:431
#, sh-format
msgid "Does not point to a valid commit: $onto_name"
msgstr ""
#: git-rebase.sh:454
#, sh-format
msgid "fatal: no such branch: $branch_name"
msgstr ""
#: git-rebase.sh:474
msgid "Please commit or stash them."
msgstr ""
#: git-rebase.sh:492
#, sh-format
msgid "Current branch $branch_name is up to date."
msgstr ""
#: git-rebase.sh:495
#, sh-format
msgid "Current branch $branch_name is up to date, rebase forced."
msgstr ""
#: git-rebase.sh:506
#, sh-format
msgid "Changes from $mb to $onto:"
msgstr ""
#. Detach HEAD and reset the tree
#: git-rebase.sh:515
msgid "First, rewinding head to replay your work on top of it..."
msgstr ""
#: git-rebase.sh:523
#, sh-format
msgid "Fast-forwarded $branch_name to $onto_name."
msgstr ""
#: git-stash.sh:51
msgid "git stash clear with parameters is unimplemented"
msgstr ""
#: git-stash.sh:74
msgid "You do not have the initial commit yet"
msgstr ""
#: git-stash.sh:89
msgid "Cannot save the current index state"
msgstr ""
#: git-stash.sh:123 git-stash.sh:136
msgid "Cannot save the current worktree state"
msgstr ""
#: git-stash.sh:140
msgid "No changes selected"
msgstr ""
#: git-stash.sh:143
msgid "Cannot remove temporary index (can't happen)"
msgstr ""
#: git-stash.sh:156
msgid "Cannot record working tree state"
msgstr ""
#. TRANSLATORS: $option is an invalid option, like
#. `--blah-blah'. The 7 spaces at the beginning of the
#. second line correspond to "error: ". So you should line
#. up the second line with however many characters the
#. translation of "error: " takes in your language. E.g. in
#. English this is:
#.
#. $ git stash save --blah-blah 2>&1 | head -n 2
#. error: unknown option for 'stash save': --blah-blah
#. To provide a message, use git stash save -- '--blah-blah'
#: git-stash.sh:202
#, sh-format
msgid ""
"error: unknown option for 'stash save': $option\n"
" To provide a message, use git stash save -- '$option'"
msgstr ""
#: git-stash.sh:223
msgid "No local changes to save"
msgstr ""
#: git-stash.sh:227
msgid "Cannot initialize stash"
msgstr ""
#: git-stash.sh:235
msgid "Cannot save the current status"
msgstr ""
#: git-stash.sh:253
msgid "Cannot remove worktree changes"
msgstr ""
#: git-stash.sh:352
msgid "No stash found."
msgstr ""
#: git-stash.sh:359
#, sh-format
msgid "Too many revisions specified: $REV"
msgstr ""
#: git-stash.sh:365
#, sh-format
msgid "$reference is not valid reference"
msgstr ""
#: git-stash.sh:393
#, sh-format
msgid "'$args' is not a stash-like commit"
msgstr ""
#: git-stash.sh:404
#, sh-format
msgid "'$args' is not a stash reference"
msgstr ""
#: git-stash.sh:412
msgid "unable to refresh index"
msgstr ""
#: git-stash.sh:416
msgid "Cannot apply a stash in the middle of a merge"
msgstr ""
#: git-stash.sh:424
msgid "Conflicts in index. Try without --index."
msgstr ""
#: git-stash.sh:426
msgid "Could not save index tree"
msgstr ""
#: git-stash.sh:460
msgid "Cannot unstage modified files"
msgstr ""
#: git-stash.sh:474
msgid "Index was not unstashed."
msgstr ""
#: git-stash.sh:491
#, sh-format
msgid "Dropped ${REV} ($s)"
msgstr ""
#: git-stash.sh:492
#, sh-format
msgid "${REV}: Could not drop stash entry"
msgstr ""
#: git-stash.sh:499
msgid "No branch name specified"
msgstr ""
#: git-stash.sh:570
msgid "(To restore them type \"git stash apply\")"
msgstr ""
#: git-submodule.sh:88
#, sh-format
msgid "cannot strip one component off url '$remoteurl'"
msgstr ""
#: git-submodule.sh:145
#, sh-format
msgid "No submodule mapping found in .gitmodules for path '$sm_path'"
msgstr ""
#: git-submodule.sh:189
#, sh-format
msgid "Clone of '$url' into submodule path '$sm_path' failed"
msgstr ""
#: git-submodule.sh:201
#, sh-format
msgid "Gitdir '$a' is part of the submodule path '$b' or vice versa"
msgstr ""
#: git-submodule.sh:290
#, sh-format
msgid "repo URL: '$repo' must be absolute or begin with ./|../"
msgstr ""
#: git-submodule.sh:307
#, sh-format
msgid "'$sm_path' already exists in the index"
msgstr ""
#: git-submodule.sh:311
#, sh-format
msgid ""
"The following path is ignored by one of your .gitignore files:\n"
"$sm_path\n"
"Use -f if you really want to add it."
msgstr ""
#: git-submodule.sh:322
#, sh-format
msgid "Adding existing repo at '$sm_path' to the index"
msgstr ""
#: git-submodule.sh:324
#, sh-format
msgid "'$sm_path' already exists and is not a valid git repo"
msgstr ""
#: git-submodule.sh:338
#, sh-format
msgid "Unable to checkout submodule '$sm_path'"
msgstr ""
#: git-submodule.sh:343
#, sh-format
msgid "Failed to add submodule '$sm_path'"
msgstr ""
#: git-submodule.sh:348
#, sh-format
msgid "Failed to register submodule '$sm_path'"
msgstr ""
#: git-submodule.sh:390
#, sh-format
msgid "Entering '$prefix$sm_path'"
msgstr ""
#: git-submodule.sh:404
#, sh-format
msgid "Stopping at '$sm_path'; script returned non-zero status."
msgstr ""
#: git-submodule.sh:447
#, sh-format
msgid "No url found for submodule path '$sm_path' in .gitmodules"
msgstr ""
#: git-submodule.sh:456
#, sh-format
msgid "Failed to register url for submodule path '$sm_path'"
msgstr ""
#: git-submodule.sh:458
#, sh-format
msgid "Submodule '$name' ($url) registered for path '$sm_path'"
msgstr ""
#: git-submodule.sh:466
#, sh-format
msgid "Failed to register update mode for submodule path '$sm_path'"
msgstr ""
#: git-submodule.sh:565
#, sh-format
msgid ""
"Submodule path '$sm_path' not initialized\n"
"Maybe you want to use 'update --init'?"
msgstr ""
#: git-submodule.sh:578
#, sh-format
msgid "Unable to find current revision in submodule path '$sm_path'"
msgstr ""
#: git-submodule.sh:597
#, sh-format
msgid "Unable to fetch in submodule path '$sm_path'"
msgstr ""
#: git-submodule.sh:611
#, sh-format
msgid "Unable to rebase '$sha1' in submodule path '$sm_path'"
msgstr ""
#: git-submodule.sh:612
#, sh-format
msgid "Submodule path '$sm_path': rebased into '$sha1'"
msgstr ""
#: git-submodule.sh:617
#, sh-format
msgid "Unable to merge '$sha1' in submodule path '$sm_path'"
msgstr ""
#: git-submodule.sh:618
#, sh-format
msgid "Submodule path '$sm_path': merged in '$sha1'"
msgstr ""
#: git-submodule.sh:623
#, sh-format
msgid "Unable to checkout '$sha1' in submodule path '$sm_path'"
msgstr ""
#: git-submodule.sh:624
#, sh-format
msgid "Submodule path '$sm_path': checked out '$sha1'"
msgstr ""
#: git-submodule.sh:646 git-submodule.sh:969
#, sh-format
msgid "Failed to recurse into submodule path '$sm_path'"
msgstr ""
#: git-submodule.sh:754
msgid "The --cached option cannot be used with the --files option"
msgstr ""
#. unexpected type
#: git-submodule.sh:794
#, sh-format
msgid "unexpected mode $mod_dst"
msgstr ""
#: git-submodule.sh:812
#, sh-format
msgid " Warn: $name doesn't contain commit $sha1_src"
msgstr ""
#: git-submodule.sh:815
#, sh-format
msgid " Warn: $name doesn't contain commit $sha1_dst"
msgstr ""
#: git-submodule.sh:818
#, sh-format
msgid " Warn: $name doesn't contain commits $sha1_src and $sha1_dst"
msgstr ""
#: git-submodule.sh:843
msgid "blob"
msgstr ""
#: git-submodule.sh:881
msgid "# Submodules changed but not updated:"
msgstr ""
#: git-submodule.sh:883
msgid "# Submodule changes to be committed:"
msgstr ""
#: git-submodule.sh:1027
#, sh-format
msgid "Synchronizing submodule url for '$name'"
msgstr ""
Reference in a new issue View git blame Copy permalink