msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n"
-"POT-Creation-Date: 2012-06-08 10:20+0800\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"
msgid "unrecognized header: %s%s (%d)"
msgstr ""
-#: bundle.c:89 builtin/commit.c:696
+#: bundle.c:89 builtin/commit.c:699
#, c-format
msgid "could not open '%s'"
msgstr ""
msgid "Repository lacks these prerequisite commits:"
msgstr ""
-#: bundle.c:164 sequencer.c:550 sequencer.c:982 builtin/log.c:289
-#: builtin/log.c:720 builtin/log.c:1309 builtin/log.c:1528 builtin/merge.c:347
+#: 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 ""
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:290
+#: bundle.c:294
msgid "rev-list died"
msgstr ""
-#: bundle.c:296 builtin/log.c:1205 builtin/shortlog.c:284
+#: bundle.c:300 builtin/log.c:1212 builtin/shortlog.c:284
#, c-format
msgid "unrecognized argument: %s"
msgstr ""
-#: bundle.c:331
+#: bundle.c:335
#, c-format
msgid "ref '%s' is excluded by the rev-list options"
msgstr ""
-#: bundle.c:376
+#: bundle.c:380
msgid "Refusing to create empty bundle."
msgstr ""
-#: bundle.c:394
+#: bundle.c:398
msgid "Could not spawn pack-objects"
msgstr ""
-#: bundle.c:412
+#: bundle.c:416
msgid "pack-objects died"
msgstr ""
-#: bundle.c:415
+#: bundle.c:419
#, c-format
msgid "cannot create '%s'"
msgstr ""
-#: bundle.c:437
+#: bundle.c:441
msgid "index-pack died"
msgstr ""
msgstr ""
#: diff.c:1400
-msgid " 0 files changed\n"
+msgid " 0 files changed"
msgstr ""
#: diff.c:1404
msgstr[0] ""
msgstr[1] ""
-#: diff.c:3478
+#: diff.c:3461
#, c-format
msgid ""
"Failed to parse --dirstat/-X option parameter:\n"
msgid "'%s': short read %s"
msgstr ""
-#: help.c:207
+#: help.c:212
#, c-format
msgid "available git commands in '%s'"
msgstr ""
-#: help.c:214
+#: help.c:219
msgid "git commands available from elsewhere on your $PATH"
msgstr ""
-#: help.c:270
+#: 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:327
+#: help.c:332
msgid "Uh oh. Your system reports no Git commands at all."
msgstr ""
-#: help.c:349
+#: 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:354
+#: help.c:359
#, c-format
msgid "in %0.1f seconds automatically..."
msgstr ""
-#: help.c:361
+#: help.c:366
#, c-format
msgid "git: '%s' is not a git command. See 'git --help'."
msgstr ""
-#: help.c:365
+#: help.c:370
msgid ""
"\n"
"Did you mean this?"
msgstr[0] ""
msgstr[1] ""
-#: parse-options.c:493
+#: 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:511
+#: 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:515
+#: parse-options.c:516
#, c-format
msgid " or: %s"
msgstr ""
-#: parse-options.c:518
+#: parse-options.c:519
#, c-format
msgid " %s"
msgstr ""
-#: remote.c:1629
+#: 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:1635
+#: remote.c:1638
#, c-format
msgid "Your branch is behind '%s' by %d commit, and can be fast-forwarded.\n"
msgid_plural ""
msgstr[0] ""
msgstr[1] ""
-#: remote.c:1643
+#: remote.c:1646
#, c-format
msgid ""
"Your branch and '%s' have diverged,\n"
msgid "cannot abort from a branch yet to be born"
msgstr ""
-#: sequencer.c:805 builtin/apply.c:3697
+#: sequencer.c:805 builtin/apply.c:3988
#, c-format
msgid "cannot open %s: %s"
msgstr ""
msgid "Can't cherry-pick into empty head"
msgstr ""
-#: sha1_name.c:864
+#: sha1_name.c:1044
msgid "HEAD does not point to a branch"
msgstr ""
-#: sha1_name.c:867
+#: sha1_name.c:1047
#, c-format
msgid "No such branch: '%s'"
msgstr ""
-#: sha1_name.c:869
+#: sha1_name.c:1049
#, c-format
msgid "No upstream configured for branch '%s'"
msgstr ""
-#: sha1_name.c:872
+#: sha1_name.c:1052
#, c-format
msgid "Upstream branch '%s' not stored as a remote-tracking branch"
msgstr ""
msgid "no such user"
msgstr ""
-#: wt-status.c:135
+#: wt-status.c:140
msgid "Unmerged paths:"
msgstr ""
-#: wt-status.c:141 wt-status.c:158
+#: wt-status.c:167 wt-status.c:194
#, c-format
msgid " (use \"git reset %s <file>...\" to unstage)"
msgstr ""
-#: wt-status.c:143 wt-status.c:160
+#: wt-status.c:169 wt-status.c:196
msgid " (use \"git rm --cached <file>...\" to unstage)"
msgstr ""
-#: wt-status.c:144
+#: 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:152
+#: 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:170
+#: wt-status.c:206
msgid "Changes not staged for commit:"
msgstr ""
-#: wt-status.c:174
+#: wt-status.c:210
msgid " (use \"git add <file>...\" to update what will be committed)"
msgstr ""
-#: wt-status.c:176
+#: wt-status.c:212
msgid " (use \"git add/rm <file>...\" to update what will be committed)"
msgstr ""
-#: wt-status.c:177
+#: wt-status.c:213
msgid ""
" (use \"git checkout -- <file>...\" to discard changes in working directory)"
msgstr ""
-#: wt-status.c:179
+#: wt-status.c:215
msgid " (commit or discard the untracked or modified content in submodules)"
msgstr ""
-#: wt-status.c:188
+#: wt-status.c:224
#, c-format
msgid "%s files:"
msgstr ""
-#: wt-status.c:191
+#: wt-status.c:227
#, c-format
msgid " (use \"git %s <file>...\" to include in what will be committed)"
msgstr ""
-#: wt-status.c:208
+#: wt-status.c:244
msgid "bug"
msgstr ""
-#: wt-status.c:213
+#: wt-status.c:249
msgid "both deleted:"
msgstr ""
-#: wt-status.c:214
+#: wt-status.c:250
msgid "added by us:"
msgstr ""
-#: wt-status.c:215
+#: wt-status.c:251
msgid "deleted by them:"
msgstr ""
-#: wt-status.c:216
+#: wt-status.c:252
msgid "added by them:"
msgstr ""
-#: wt-status.c:217
+#: wt-status.c:253
msgid "deleted by us:"
msgstr ""
-#: wt-status.c:218
+#: wt-status.c:254
msgid "both added:"
msgstr ""
-#: wt-status.c:219
+#: wt-status.c:255
msgid "both modified:"
msgstr ""
-#: wt-status.c:249
+#: wt-status.c:285
msgid "new commits, "
msgstr ""
-#: wt-status.c:251
+#: wt-status.c:287
msgid "modified content, "
msgstr ""
-#: wt-status.c:253
+#: wt-status.c:289
msgid "untracked content, "
msgstr ""
-#: wt-status.c:267
+#: wt-status.c:303
#, c-format
msgid "new file: %s"
msgstr ""
-#: wt-status.c:270
+#: wt-status.c:306
#, c-format
msgid "copied: %s -> %s"
msgstr ""
-#: wt-status.c:273
+#: wt-status.c:309
#, c-format
msgid "deleted: %s"
msgstr ""
-#: wt-status.c:276
+#: wt-status.c:312
#, c-format
msgid "modified: %s"
msgstr ""
-#: wt-status.c:279
+#: wt-status.c:315
#, c-format
msgid "renamed: %s -> %s"
msgstr ""
-#: wt-status.c:282
+#: wt-status.c:318
#, c-format
msgid "typechange: %s"
msgstr ""
-#: wt-status.c:285
+#: wt-status.c:321
#, c-format
msgid "unknown: %s"
msgstr ""
-#: wt-status.c:288
+#: wt-status.c:324
#, c-format
msgid "unmerged: %s"
msgstr ""
-#: wt-status.c:291
+#: wt-status.c:327
#, c-format
msgid "bug: unhandled diff status %c"
msgstr ""
-#: wt-status.c:737
+#: 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:744
+#: wt-status.c:985
msgid "Not currently on any branch."
msgstr ""
-#: wt-status.c:755
+#: wt-status.c:997
msgid "Initial commit"
msgstr ""
-#: wt-status.c:769
+#: wt-status.c:1011
msgid "Untracked"
msgstr ""
-#: wt-status.c:771
+#: wt-status.c:1013
msgid "Ignored"
msgstr ""
-#: wt-status.c:773
+#: wt-status.c:1015
#, c-format
msgid "Untracked files not listed%s"
msgstr ""
-#: wt-status.c:775
+#: wt-status.c:1017
msgid " (use -u option to show untracked files)"
msgstr ""
-#: wt-status.c:781
+#: wt-status.c:1023
msgid "No changes"
msgstr ""
-#: wt-status.c:785
+#: wt-status.c:1027
#, c-format
msgid "no changes added to commit%s\n"
msgstr ""
-#: wt-status.c:787
+#: wt-status.c:1029
msgid " (use \"git add\" and/or \"git commit -a\")"
msgstr ""
-#: wt-status.c:789
+#: wt-status.c:1031
#, c-format
msgid "nothing added to commit but untracked files present%s\n"
msgstr ""
-#: wt-status.c:791
+#: wt-status.c:1033
msgid " (use \"git add\" to track)"
msgstr ""
-#: wt-status.c:793 wt-status.c:796 wt-status.c:799
+#: wt-status.c:1035 wt-status.c:1038 wt-status.c:1041
#, c-format
msgid "nothing to commit%s\n"
msgstr ""
-#: wt-status.c:794
+#: wt-status.c:1036
msgid " (create/copy files and use \"git add\" to track)"
msgstr ""
-#: wt-status.c:797
+#: wt-status.c:1039
msgid " (use -u to show untracked files)"
msgstr ""
-#: wt-status.c:800
+#: wt-status.c:1042
msgid " (working directory clean)"
msgstr ""
-#: wt-status.c:908
+#: wt-status.c:1150
msgid "HEAD (no branch)"
msgstr ""
-#: wt-status.c:914
+#: wt-status.c:1156
msgid "Initial commit on "
msgstr ""
-#: wt-status.c:929
+#: wt-status.c:1171
msgid "behind "
msgstr ""
-#: wt-status.c:932 wt-status.c:935
+#: wt-status.c:1174 wt-status.c:1177
msgid "ahead "
msgstr ""
-#: wt-status.c:937
+#: wt-status.c:1179
msgid ", behind "
msgstr ""
msgid "unexpected diff status %c"
msgstr ""
-#: builtin/add.c:67 builtin/commit.c:226
+#: builtin/add.c:67 builtin/commit.c:229
msgid "updating files failed"
msgstr ""
msgid "Unstaged changes after refreshing the index:"
msgstr ""
-#: builtin/add.c:195 builtin/add.c:456 builtin/rm.c:186
+#: builtin/add.c:195 builtin/add.c:459 builtin/rm.c:186
#, c-format
msgid "pathspec '%s' did not match any files"
msgstr ""
msgid "Maybe you wanted to say 'git add .'?\n"
msgstr ""
-#: builtin/add.c:420 builtin/clean.c:95 builtin/commit.c:286 builtin/mv.c:82
+#: 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:476 builtin/apply.c:4108 builtin/mv.c:229 builtin/rm.c:260
+#: 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:53
+#: builtin/apply.c:57
msgid "git apply [options] [<patch>...]"
msgstr ""
-#: builtin/apply.c:106
+#: builtin/apply.c:110
#, c-format
msgid "unrecognized whitespace option '%s'"
msgstr ""
-#: builtin/apply.c:121
+#: builtin/apply.c:125
#, c-format
msgid "unrecognized whitespace ignore option '%s'"
msgstr ""
-#: builtin/apply.c:815
+#: builtin/apply.c:824
#, c-format
msgid "Cannot prepare timestamp regexp %s"
msgstr ""
-#: builtin/apply.c:824
+#: builtin/apply.c:833
#, c-format
msgid "regexec returned %d for input: %s"
msgstr ""
-#: builtin/apply.c:905
+#: builtin/apply.c:914
#, c-format
msgid "unable to find filename in patch at line %d"
msgstr ""
-#: builtin/apply.c:937
+#: builtin/apply.c:946
#, c-format
msgid "git apply: bad git-diff - expected /dev/null, got %s on line %d"
msgstr ""
-#: builtin/apply.c:941
+#: builtin/apply.c:950
#, c-format
msgid "git apply: bad git-diff - inconsistent new filename on line %d"
msgstr ""
-#: builtin/apply.c:942
+#: builtin/apply.c:951
#, c-format
msgid "git apply: bad git-diff - inconsistent old filename on line %d"
msgstr ""
-#: builtin/apply.c:949
+#: builtin/apply.c:958
#, c-format
msgid "git apply: bad git-diff - expected /dev/null on line %d"
msgstr ""
-#: builtin/apply.c:1394
+#: builtin/apply.c:1403
#, c-format
msgid "recount: unexpected line: %.*s"
msgstr ""
-#: builtin/apply.c:1451
+#: builtin/apply.c:1460
#, c-format
msgid "patch fragment without header at line %d: %.*s"
msgstr ""
-#: builtin/apply.c:1468
+#: builtin/apply.c:1477
#, c-format
msgid ""
"git diff header lacks filename information when removing %d leading pathname "
msgstr[0] ""
msgstr[1] ""
-#: builtin/apply.c:1628
+#: builtin/apply.c:1637
msgid "new file depends on old contents"
msgstr ""
-#: builtin/apply.c:1630
+#: builtin/apply.c:1639
msgid "deleted file still has contents"
msgstr ""
-#: builtin/apply.c:1656
+#: builtin/apply.c:1665
#, c-format
msgid "corrupt patch at line %d"
msgstr ""
-#: builtin/apply.c:1692
+#: builtin/apply.c:1701
#, c-format
msgid "new file %s depends on old contents"
msgstr ""
-#: builtin/apply.c:1694
+#: builtin/apply.c:1703
#, c-format
msgid "deleted file %s still has contents"
msgstr ""
-#: builtin/apply.c:1697
+#: builtin/apply.c:1706
#, c-format
msgid "** warning: file %s becomes empty but is not deleted"
msgstr ""
-#: builtin/apply.c:1843
+#: 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:1872
+#: builtin/apply.c:1881
#, c-format
msgid "unrecognized binary patch at line %d"
msgstr ""
-#: builtin/apply.c:1958
+#: builtin/apply.c:1967
#, c-format
msgid "patch with only garbage at line %d"
msgstr ""
-#: builtin/apply.c:2048
+#: builtin/apply.c:2057
#, c-format
msgid "unable to read symlink %s"
msgstr ""
-#: builtin/apply.c:2052
+#: builtin/apply.c:2061
#, c-format
msgid "unable to open or read %s"
msgstr ""
-#: builtin/apply.c:2123
+#: builtin/apply.c:2132
msgid "oops"
msgstr ""
-#: builtin/apply.c:2645
+#: builtin/apply.c:2654
#, c-format
msgid "invalid start of line: '%c'"
msgstr ""
-#: builtin/apply.c:2763
+#: 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:2775
+#: builtin/apply.c:2784
#, c-format
msgid "Context reduced to (%ld/%ld) to apply fragment at %d"
msgstr ""
-#: builtin/apply.c:2781
+#: builtin/apply.c:2790
#, c-format
msgid ""
"while searching for:\n"
"%.*s"
msgstr ""
-#: builtin/apply.c:2800
+#: builtin/apply.c:2809
#, c-format
msgid "missing binary patch data for '%s'"
msgstr ""
-#: builtin/apply.c:2903
+#: builtin/apply.c:2912
#, c-format
msgid "binary patch does not apply to '%s'"
msgstr ""
-#: builtin/apply.c:2909
+#: builtin/apply.c:2918
#, c-format
msgid "binary patch to '%s' creates incorrect result (expecting %s, got %s)"
msgstr ""
-#: builtin/apply.c:2930
+#: builtin/apply.c:2939
#, c-format
msgid "patch failed: %s:%ld"
msgstr ""
-#: builtin/apply.c:3045
+#: builtin/apply.c:3061
#, c-format
-msgid "patch %s has been renamed/deleted"
+msgid "cannot checkout %s"
msgstr ""
-#: builtin/apply.c:3052 builtin/apply.c:3069
+#: builtin/apply.c:3106 builtin/apply.c:3115 builtin/apply.c:3159
#, c-format
msgid "read of %s failed"
msgstr ""
-#: builtin/apply.c:3084
-msgid "removal patch leaves file contents"
-msgstr ""
-
-#: builtin/apply.c:3105
+#: builtin/apply.c:3139 builtin/apply.c:3361
#, c-format
-msgid "%s: already exists in working directory"
+msgid "path %s has been renamed/deleted"
msgstr ""
-#: builtin/apply.c:3143
+#: builtin/apply.c:3220 builtin/apply.c:3375
#, c-format
-msgid "%s: has been deleted/renamed"
+msgid "%s: does not exist in index"
msgstr ""
-#: builtin/apply.c:3148 builtin/apply.c:3179
+#: builtin/apply.c:3224 builtin/apply.c:3367 builtin/apply.c:3389
#, c-format
msgid "%s: %s"
msgstr ""
-#: builtin/apply.c:3159
+#: builtin/apply.c:3229 builtin/apply.c:3383
#, c-format
-msgid "%s: does not exist in index"
+msgid "%s: does not match index"
msgstr ""
-#: builtin/apply.c:3173
-#, c-format
-msgid "%s: does not match index"
+#: builtin/apply.c:3331
+msgid "removal patch leaves file contents"
msgstr ""
-#: builtin/apply.c:3190
+#: builtin/apply.c:3400
#, c-format
msgid "%s: wrong type"
msgstr ""
-#: builtin/apply.c:3192
+#: builtin/apply.c:3402
#, c-format
msgid "%s has type %o, expected %o"
msgstr ""
-#: builtin/apply.c:3247
+#: builtin/apply.c:3503
#, c-format
msgid "%s: already exists in index"
msgstr ""
-#: builtin/apply.c:3267
+#: 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:3272
+#: builtin/apply.c:3531
#, c-format
msgid "new mode (%o) of %s does not match old mode (%o) of %s"
msgstr ""
-#: builtin/apply.c:3280
+#: builtin/apply.c:3539
#, c-format
msgid "%s: patch does not apply"
msgstr ""
-#: builtin/apply.c:3293
+#: builtin/apply.c:3552
#, c-format
msgid "Checking patch %s..."
msgstr ""
-#: builtin/apply.c:3348 builtin/checkout.c:212 builtin/reset.c:158
+#: 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:3491
+#: builtin/apply.c:3750
#, c-format
msgid "unable to remove %s from index"
msgstr ""
-#: builtin/apply.c:3518
+#: builtin/apply.c:3778
#, c-format
msgid "corrupt patch for subproject %s"
msgstr ""
-#: builtin/apply.c:3522
+#: builtin/apply.c:3782
#, c-format
msgid "unable to stat newly created file '%s'"
msgstr ""
-#: builtin/apply.c:3527
+#: builtin/apply.c:3787
#, c-format
msgid "unable to create backing store for newly created file %s"
msgstr ""
-#: builtin/apply.c:3530
+#: builtin/apply.c:3790 builtin/apply.c:3898
#, c-format
msgid "unable to add cache entry for %s"
msgstr ""
-#: builtin/apply.c:3563
+#: builtin/apply.c:3823
#, c-format
msgid "closing file '%s'"
msgstr ""
-#: builtin/apply.c:3612
+#: builtin/apply.c:3872
#, c-format
msgid "unable to write file '%s' mode %o"
msgstr ""
-#: builtin/apply.c:3668
+#: builtin/apply.c:3959
#, c-format
msgid "Applied patch %s cleanly."
msgstr ""
-#: builtin/apply.c:3676
+#: builtin/apply.c:3967
msgid "internal error"
msgstr ""
#. Say this even without --verbose
-#: builtin/apply.c:3679
+#: 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:3689
+#: builtin/apply.c:3980
#, c-format
msgid "truncating .rej filename to %.*s.rej"
msgstr ""
-#: builtin/apply.c:3710
+#: builtin/apply.c:4001
#, c-format
msgid "Hunk #%d applied cleanly."
msgstr ""
-#: builtin/apply.c:3713
+#: builtin/apply.c:4004
#, c-format
msgid "Rejected hunk #%d."
msgstr ""
-#: builtin/apply.c:3844
+#: builtin/apply.c:4154
msgid "unrecognized input"
msgstr ""
-#: builtin/apply.c:3855
+#: builtin/apply.c:4165
msgid "unable to read index file"
msgstr ""
-#: builtin/apply.c:3970 builtin/apply.c:3973
+#: builtin/apply.c:4284 builtin/apply.c:4287
msgid "path"
msgstr ""
-#: builtin/apply.c:3971
+#: builtin/apply.c:4285
msgid "don't apply changes matching the given path"
msgstr ""
-#: builtin/apply.c:3974
+#: builtin/apply.c:4288
msgid "apply changes matching the given path"
msgstr ""
-#: builtin/apply.c:3976
+#: builtin/apply.c:4290
msgid "num"
msgstr ""
-#: builtin/apply.c:3977
+#: builtin/apply.c:4291
msgid "remove <num> leading slashes from traditional diff paths"
msgstr ""
-#: builtin/apply.c:3980
+#: builtin/apply.c:4294
msgid "ignore additions made by the patch"
msgstr ""
-#: builtin/apply.c:3982
+#: builtin/apply.c:4296
msgid "instead of applying the patch, output diffstat for the input"
msgstr ""
-#: builtin/apply.c:3986
+#: builtin/apply.c:4300
msgid "shows number of added and deleted lines in decimal notation"
msgstr ""
-#: builtin/apply.c:3988
+#: builtin/apply.c:4302
msgid "instead of applying the patch, output a summary for the input"
msgstr ""
-#: builtin/apply.c:3990
+#: builtin/apply.c:4304
msgid "instead of applying the patch, see if the patch is applicable"
msgstr ""
-#: builtin/apply.c:3992
+#: builtin/apply.c:4306
msgid "make sure the patch is applicable to the current index"
msgstr ""
-#: builtin/apply.c:3994
+#: builtin/apply.c:4308
msgid "apply a patch without touching the working tree"
msgstr ""
-#: builtin/apply.c:3996
+#: builtin/apply.c:4310
msgid "also apply the patch (use with --stat/--summary/--check)"
msgstr ""
-#: builtin/apply.c:3998
+#: 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:4000
+#: builtin/apply.c:4316
msgid "paths are separated with NUL character"
msgstr ""
-#: builtin/apply.c:4003
+#: builtin/apply.c:4319
msgid "ensure at least <n> lines of context match"
msgstr ""
-#: builtin/apply.c:4004
+#: builtin/apply.c:4320
msgid "action"
msgstr ""
-#: builtin/apply.c:4005
+#: builtin/apply.c:4321
msgid "detect new or modified lines that have whitespace errors"
msgstr ""
-#: builtin/apply.c:4008 builtin/apply.c:4011
+#: builtin/apply.c:4324 builtin/apply.c:4327
msgid "ignore changes in whitespace when finding context"
msgstr ""
-#: builtin/apply.c:4014
+#: builtin/apply.c:4330
msgid "apply the patch in reverse"
msgstr ""
-#: builtin/apply.c:4016
+#: builtin/apply.c:4332
msgid "don't expect at least one line of context"
msgstr ""
-#: builtin/apply.c:4018
+#: builtin/apply.c:4334
msgid "leave the rejected hunks in corresponding *.rej files"
msgstr ""
-#: builtin/apply.c:4020
+#: builtin/apply.c:4336
msgid "allow overlapping hunks"
msgstr ""
-#: builtin/apply.c:4021
+#: builtin/apply.c:4337
msgid "be verbose"
msgstr ""
-#: builtin/apply.c:4023
+#: builtin/apply.c:4339
msgid "tolerate incorrectly detected missing new-line at the end of file"
msgstr ""
-#: builtin/apply.c:4026
+#: builtin/apply.c:4342
msgid "do not trust the line counts in the hunk headers"
msgstr ""
-#: builtin/apply.c:4028
+#: builtin/apply.c:4344
msgid "root"
msgstr ""
-#: builtin/apply.c:4029
+#: builtin/apply.c:4345
msgid "prepend <root> to all filenames"
msgstr ""
-#: builtin/apply.c:4050
+#: builtin/apply.c:4367
+msgid "--3way outside a repository"
+msgstr ""
+
+#: builtin/apply.c:4375
msgid "--index outside a repository"
msgstr ""
-#: builtin/apply.c:4053
+#: builtin/apply.c:4378
msgid "--cached outside a repository"
msgstr ""
-#: builtin/apply.c:4069
+#: builtin/apply.c:4394
#, c-format
msgid "can't open patch '%s'"
msgstr ""
-#: builtin/apply.c:4083
+#: builtin/apply.c:4408
#, c-format
msgid "squelched %d whitespace error"
msgid_plural "squelched %d whitespace errors"
msgstr[0] ""
msgstr[1] ""
-#: builtin/apply.c:4089 builtin/apply.c:4099
+#: builtin/apply.c:4414 builtin/apply.c:4424
#, c-format
msgid "%d line adds whitespace errors."
msgid_plural "%d lines add whitespace errors."
msgid "Failed to resolve HEAD as a valid ref."
msgstr ""
-#: builtin/branch.c:788 builtin/clone.c:558
+#: builtin/branch.c:788 builtin/clone.c:561
msgid "HEAD not found below refs/heads!"
msgstr ""
msgid "Need a repository to unbundle."
msgstr ""
-#: builtin/checkout.c:113 builtin/checkout.c:146
+#: builtin/checkout.c:114 builtin/checkout.c:147
#, c-format
msgid "path '%s' does not have our version"
msgstr ""
-#: builtin/checkout.c:115 builtin/checkout.c:148
+#: builtin/checkout.c:116 builtin/checkout.c:149
#, c-format
msgid "path '%s' does not have their version"
msgstr ""
-#: builtin/checkout.c:131
+#: builtin/checkout.c:132
#, c-format
msgid "path '%s' does not have all necessary versions"
msgstr ""
-#: builtin/checkout.c:175
+#: builtin/checkout.c:176
#, c-format
msgid "path '%s' does not have necessary versions"
msgstr ""
-#: builtin/checkout.c:192
+#: builtin/checkout.c:193
#, c-format
msgid "path '%s': cannot merge"
msgstr ""
-#: builtin/checkout.c:209
+#: builtin/checkout.c:210
#, c-format
msgid "Unable to add merge result for '%s'"
msgstr ""
-#: builtin/checkout.c:234 builtin/checkout.c:392
+#: builtin/checkout.c:235 builtin/checkout.c:393
msgid "corrupt index file"
msgstr ""
-#: builtin/checkout.c:264 builtin/checkout.c:271
+#: builtin/checkout.c:265 builtin/checkout.c:272
#, c-format
msgid "path '%s' is unmerged"
msgstr ""
-#: builtin/checkout.c:302 builtin/checkout.c:498 builtin/clone.c:583
+#: 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:319 builtin/diff.c:302 builtin/merge.c:408
+#: builtin/checkout.c:320 builtin/diff.c:302 builtin/merge.c:408
msgid "diff_setup_done failed"
msgstr ""
-#: builtin/checkout.c:414
+#: builtin/checkout.c:415
msgid "you need to resolve your current index first"
msgstr ""
-#: builtin/checkout.c:533
+#: builtin/checkout.c:534
#, c-format
msgid "Can not do reflog for '%s'\n"
msgstr ""
-#: builtin/checkout.c:566
+#: builtin/checkout.c:567
msgid "HEAD is now at"
msgstr ""
-#: builtin/checkout.c:573
+#: builtin/checkout.c:574
#, c-format
msgid "Reset branch '%s'\n"
msgstr ""
-#: builtin/checkout.c:576
+#: builtin/checkout.c:577
#, c-format
msgid "Already on '%s'\n"
msgstr ""
-#: builtin/checkout.c:580
+#: builtin/checkout.c:581
#, c-format
msgid "Switched to and reset branch '%s'\n"
msgstr ""
-#: builtin/checkout.c:582
+#: builtin/checkout.c:583
#, c-format
msgid "Switched to a new branch '%s'\n"
msgstr ""
-#: builtin/checkout.c:584
+#: builtin/checkout.c:585
#, c-format
msgid "Switched to branch '%s'\n"
msgstr ""
-#: builtin/checkout.c:640
+#: builtin/checkout.c:641
#, c-format
msgid " ... and %d more.\n"
msgstr ""
#. The singular version
-#: builtin/checkout.c:646
+#: builtin/checkout.c:647
#, c-format
msgid ""
"Warning: you are leaving %d commit behind, not connected to\n"
msgstr[0] ""
msgstr[1] ""
-#: builtin/checkout.c:664
+#: 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"
"\n"
msgstr ""
-#: builtin/checkout.c:694
+#: builtin/checkout.c:695
msgid "internal error in revision walk"
msgstr ""
-#: builtin/checkout.c:698
+#: builtin/checkout.c:699
msgid "Previous HEAD position was"
msgstr ""
-#: builtin/checkout.c:724
+#: builtin/checkout.c:725 builtin/checkout.c:920
msgid "You are on a branch yet to be born"
msgstr ""
#. case (1)
-#: builtin/checkout.c:855
+#: builtin/checkout.c:856
#, c-format
msgid "invalid reference: %s"
msgstr ""
#. case (1): want a tree
-#: builtin/checkout.c:894
+#: builtin/checkout.c:895
#, c-format
msgid "reference is not a tree: %s"
msgstr ""
-#: builtin/checkout.c:974
+#: builtin/checkout.c:977
msgid "-B cannot be used with -b"
msgstr ""
-#: builtin/checkout.c:983
+#: builtin/checkout.c:986
msgid "--patch is incompatible with all other options"
msgstr ""
-#: builtin/checkout.c:986
+#: builtin/checkout.c:989
msgid "--detach cannot be used with -b/-B/--orphan"
msgstr ""
-#: builtin/checkout.c:988
+#: builtin/checkout.c:991
msgid "--detach cannot be used with -t"
msgstr ""
-#: builtin/checkout.c:994
+#: builtin/checkout.c:997
msgid "--track needs a branch name"
msgstr ""
-#: builtin/checkout.c:1001
+#: builtin/checkout.c:1004
msgid "Missing branch name; try -b"
msgstr ""
-#: builtin/checkout.c:1007
+#: builtin/checkout.c:1010
msgid "--orphan and -b|-B are mutually exclusive"
msgstr ""
-#: builtin/checkout.c:1009
+#: builtin/checkout.c:1012
msgid "--orphan cannot be used with -t"
msgstr ""
-#: builtin/checkout.c:1019
+#: builtin/checkout.c:1022
msgid "git checkout: -f and -m are incompatible"
msgstr ""
-#: builtin/checkout.c:1053
+#: builtin/checkout.c:1056
msgid "invalid path specification"
msgstr ""
-#: builtin/checkout.c:1061
+#: 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:1063
+#: builtin/checkout.c:1066
msgid "git checkout: updating paths is incompatible with switching branches."
msgstr ""
-#: builtin/checkout.c:1068
+#: builtin/checkout.c:1071
msgid "git checkout: --detach does not take a path argument"
msgstr ""
-#: builtin/checkout.c:1071
+#: 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:1090
+#: builtin/checkout.c:1093
msgid "Cannot switch branch to a non-commit."
msgstr ""
-#: builtin/checkout.c:1093
+#: builtin/checkout.c:1096
msgid "--ours/--theirs is incompatible with switching branches."
msgstr ""
msgid "reference repository '%s' is not a local directory."
msgstr ""
-#: builtin/clone.c:302
-#, c-format
-msgid "failed to open '%s'"
-msgstr ""
-
#: builtin/clone.c:306
#, c-format
msgid "failed to create directory '%s'"
msgid "done.\n"
msgstr ""
-#: builtin/clone.c:440
+#: builtin/clone.c:443
#, c-format
msgid "Could not find remote branch %s to clone."
msgstr ""
-#: builtin/clone.c:549
+#: builtin/clone.c:552
msgid "remote HEAD refers to nonexistent ref, unable to checkout.\n"
msgstr ""
-#: builtin/clone.c:639
+#: builtin/clone.c:642
msgid "Too many arguments."
msgstr ""
-#: builtin/clone.c:643
+#: builtin/clone.c:646
msgid "You must specify a repository to clone."
msgstr ""
-#: builtin/clone.c:654
+#: builtin/clone.c:657
#, c-format
msgid "--bare and --origin %s options are incompatible."
msgstr ""
-#: builtin/clone.c:668
+#: builtin/clone.c:671
#, c-format
msgid "repository '%s' does not exist"
msgstr ""
-#: builtin/clone.c:673
+#: builtin/clone.c:676
msgid "--depth is ignored in local clones; use file:// instead."
msgstr ""
-#: builtin/clone.c:683
+#: builtin/clone.c:686
#, c-format
msgid "destination path '%s' already exists and is not an empty directory."
msgstr ""
-#: builtin/clone.c:693
+#: builtin/clone.c:696
#, c-format
msgid "working tree '%s' already exists."
msgstr ""
-#: builtin/clone.c:706 builtin/clone.c:720
+#: builtin/clone.c:709 builtin/clone.c:723
#, c-format
msgid "could not create leading directories of '%s'"
msgstr ""
-#: builtin/clone.c:709
+#: builtin/clone.c:712
#, c-format
msgid "could not create work tree dir '%s'."
msgstr ""
-#: builtin/clone.c:728
+#: builtin/clone.c:731
#, c-format
msgid "Cloning into bare repository '%s'...\n"
msgstr ""
-#: builtin/clone.c:730
+#: builtin/clone.c:733
#, c-format
msgid "Cloning into '%s'...\n"
msgstr ""
-#: builtin/clone.c:786
+#: builtin/clone.c:789
#, c-format
msgid "Don't know how to clone %s"
msgstr ""
-#: builtin/clone.c:835
+#: builtin/clone.c:838
#, c-format
msgid "Remote branch %s not found in upstream %s"
msgstr ""
-#: builtin/clone.c:842
+#: builtin/clone.c:845
msgid "You appear to have cloned an empty repository."
msgstr ""
"Otherwise, please use 'git reset'\n"
msgstr ""
-#: builtin/commit.c:253
+#: builtin/commit.c:256
msgid "failed to unpack HEAD tree object"
msgstr ""
-#: builtin/commit.c:295
+#: builtin/commit.c:298
msgid "unable to create temporary index"
msgstr ""
-#: builtin/commit.c:301
+#: builtin/commit.c:304
msgid "interactive add failed"
msgstr ""
-#: builtin/commit.c:334 builtin/commit.c:355 builtin/commit.c:405
+#: builtin/commit.c:337 builtin/commit.c:358 builtin/commit.c:408
msgid "unable to write new_index file"
msgstr ""
-#: builtin/commit.c:386
+#: builtin/commit.c:389
msgid "cannot do a partial commit during a merge."
msgstr ""
-#: builtin/commit.c:388
+#: builtin/commit.c:391
msgid "cannot do a partial commit during a cherry-pick."
msgstr ""
-#: builtin/commit.c:398
+#: builtin/commit.c:401
msgid "cannot read the index"
msgstr ""
-#: builtin/commit.c:418
+#: builtin/commit.c:421
msgid "unable to write temporary index file"
msgstr ""
-#: builtin/commit.c:493 builtin/commit.c:499
+#: builtin/commit.c:496 builtin/commit.c:502
#, c-format
msgid "invalid commit: %s"
msgstr ""
-#: builtin/commit.c:522
+#: builtin/commit.c:525
msgid "malformed --author parameter"
msgstr ""
-#: builtin/commit.c:582
+#: builtin/commit.c:585
#, c-format
msgid "Malformed ident string: '%s'"
msgstr ""
-#: builtin/commit.c:620 builtin/commit.c:653 builtin/commit.c:967
+#: builtin/commit.c:623 builtin/commit.c:656 builtin/commit.c:970
#, c-format
msgid "could not lookup commit %s"
msgstr ""
-#: builtin/commit.c:632 builtin/shortlog.c:296
+#: builtin/commit.c:635 builtin/shortlog.c:296
#, c-format
msgid "(reading log message from standard input)\n"
msgstr ""
-#: builtin/commit.c:634
+#: builtin/commit.c:637
msgid "could not read log from standard input"
msgstr ""
-#: builtin/commit.c:638
+#: builtin/commit.c:641
#, c-format
msgid "could not read log file '%s'"
msgstr ""
-#: builtin/commit.c:644
+#: builtin/commit.c:647
msgid "commit has empty message"
msgstr ""
-#: builtin/commit.c:660
+#: builtin/commit.c:663
msgid "could not read MERGE_MSG"
msgstr ""
-#: builtin/commit.c:664
+#: builtin/commit.c:667
msgid "could not read SQUASH_MSG"
msgstr ""
-#: builtin/commit.c:668
+#: builtin/commit.c:671
#, c-format
msgid "could not read '%s'"
msgstr ""
-#: builtin/commit.c:720
+#: builtin/commit.c:723
msgid "could not write commit template"
msgstr ""
-#: builtin/commit.c:731
+#: builtin/commit.c:734
#, c-format
msgid ""
"\n"
"and try again.\n"
msgstr ""
-#: builtin/commit.c:736
+#: builtin/commit.c:739
#, c-format
msgid ""
"\n"
"and try again.\n"
msgstr ""
-#: builtin/commit.c:748
+#: 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:753
+#: 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:766
+#: builtin/commit.c:769
#, c-format
msgid "%sAuthor: %s"
msgstr ""
-#: builtin/commit.c:773
+#: builtin/commit.c:776
#, c-format
msgid "%sCommitter: %s"
msgstr ""
-#: builtin/commit.c:793
+#: builtin/commit.c:796
msgid "Cannot read index"
msgstr ""
-#: builtin/commit.c:830
+#: builtin/commit.c:833
msgid "Error building trees"
msgstr ""
-#: builtin/commit.c:845 builtin/tag.c:361
+#: 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:942
+#: builtin/commit.c:945
#, c-format
msgid "No existing author found with '%s'"
msgstr ""
-#: builtin/commit.c:957 builtin/commit.c:1157
+#: builtin/commit.c:960 builtin/commit.c:1160
#, c-format
msgid "Invalid untracked files mode '%s'"
msgstr ""
-#: builtin/commit.c:997
+#: builtin/commit.c:1000
msgid "Using both --reset-author and --author does not make sense"
msgstr ""
-#: builtin/commit.c:1008
+#: builtin/commit.c:1011
msgid "You have nothing to amend."
msgstr ""
-#: builtin/commit.c:1011
+#: builtin/commit.c:1014
msgid "You are in the middle of a merge -- cannot amend."
msgstr ""
-#: builtin/commit.c:1013
+#: builtin/commit.c:1016
msgid "You are in the middle of a cherry-pick -- cannot amend."
msgstr ""
-#: builtin/commit.c:1016
+#: builtin/commit.c:1019
msgid "Options --squash and --fixup cannot be used together"
msgstr ""
-#: builtin/commit.c:1026
+#: builtin/commit.c:1029
msgid "Only one of -c/-C/-F/--fixup can be used."
msgstr ""
-#: builtin/commit.c:1028
+#: builtin/commit.c:1031
msgid "Option -m cannot be combined with -c/-C/-F/--fixup."
msgstr ""
-#: builtin/commit.c:1036
+#: builtin/commit.c:1039
msgid "--reset-author can be used only with -C, -c or --amend."
msgstr ""
-#: builtin/commit.c:1053
+#: builtin/commit.c:1056
msgid "Only one of --include/--only/--all/--interactive/--patch can be used."
msgstr ""
-#: builtin/commit.c:1055
+#: builtin/commit.c:1058
msgid "No paths with --include/--only does not make sense."
msgstr ""
-#: builtin/commit.c:1057
+#: builtin/commit.c:1060
msgid "Clever... amending the last one with dirty index."
msgstr ""
-#: builtin/commit.c:1059
+#: builtin/commit.c:1062
msgid "Explicit paths specified without -i nor -o; assuming --only paths..."
msgstr ""
-#: builtin/commit.c:1069 builtin/tag.c:577
+#: builtin/commit.c:1072 builtin/tag.c:577
#, c-format
msgid "Invalid cleanup mode %s"
msgstr ""
-#: builtin/commit.c:1074
+#: builtin/commit.c:1077
msgid "Paths with -a does not make sense."
msgstr ""
-#: builtin/commit.c:1257
+#: builtin/commit.c:1260
msgid "couldn't look up newly created commit"
msgstr ""
-#: builtin/commit.c:1259
+#: builtin/commit.c:1262
msgid "could not parse newly created commit"
msgstr ""
-#: builtin/commit.c:1300
+#: builtin/commit.c:1303
msgid "detached HEAD"
msgstr ""
-#: builtin/commit.c:1302
+#: builtin/commit.c:1305
msgid " (root-commit)"
msgstr ""
-#: builtin/commit.c:1446
+#: builtin/commit.c:1449
msgid "could not parse HEAD commit"
msgstr ""
-#: builtin/commit.c:1484 builtin/merge.c:509
+#: builtin/commit.c:1487 builtin/merge.c:509
#, c-format
msgid "could not open '%s' for reading"
msgstr ""
-#: builtin/commit.c:1491
+#: builtin/commit.c:1494
#, c-format
msgid "Corrupt MERGE_HEAD file (%s)"
msgstr ""
-#: builtin/commit.c:1498
+#: builtin/commit.c:1501
msgid "could not read MERGE_MODE"
msgstr ""
-#: builtin/commit.c:1517
+#: builtin/commit.c:1520
#, c-format
msgid "could not read commit message: %s"
msgstr ""
-#: builtin/commit.c:1531
+#: builtin/commit.c:1534
#, c-format
msgid "Aborting commit; you did not edit the message.\n"
msgstr ""
-#: builtin/commit.c:1536
+#: builtin/commit.c:1539
#, c-format
msgid "Aborting commit due to empty commit message.\n"
msgstr ""
-#: builtin/commit.c:1551 builtin/merge.c:936 builtin/merge.c:961
+#: builtin/commit.c:1554 builtin/merge.c:936 builtin/merge.c:961
msgid "failed to write commit object"
msgstr ""
-#: builtin/commit.c:1572
+#: builtin/commit.c:1575
msgid "cannot lock HEAD ref"
msgstr ""
-#: builtin/commit.c:1576
+#: builtin/commit.c:1579
msgid "cannot update HEAD ref"
msgstr ""
-#: builtin/commit.c:1587
+#: 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"
msgid "Not a git repository"
msgstr ""
-#: builtin/diff.c:347
+#: builtin/diff.c:341
#, c-format
msgid "invalid object '%s' given."
msgstr ""
-#: builtin/diff.c:352
+#: builtin/diff.c:346
#, c-format
msgid "more than %d trees given: '%s'"
msgstr ""
-#: builtin/diff.c:362
+#: builtin/diff.c:356
#, c-format
msgid "more than two blobs given: '%s'"
msgstr ""
-#: builtin/diff.c:370
+#: builtin/diff.c:364
#, c-format
msgid "unhandled object '%s' given."
msgstr ""
msgid "both --cached and trees are given."
msgstr ""
-#: builtin/help.c:59
+#: builtin/help.c:65
#, c-format
msgid "unrecognized help format '%s'"
msgstr ""
-#: builtin/help.c:87
+#: builtin/help.c:93
msgid "Failed to start emacsclient."
msgstr ""
-#: builtin/help.c:100
+#: builtin/help.c:106
msgid "Failed to parse emacsclient version."
msgstr ""
-#: builtin/help.c:108
+#: builtin/help.c:114
#, c-format
msgid "emacsclient version '%d' too old (< 22)."
msgstr ""
-#: builtin/help.c:126 builtin/help.c:154 builtin/help.c:163 builtin/help.c:171
+#: 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:211
+#: 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:223
+#: 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:287
+#: builtin/help.c:299
msgid "The most commonly used git commands are:"
msgstr ""
-#: builtin/help.c:355
+#: builtin/help.c:367
#, c-format
msgid "'%s': unknown man viewer."
msgstr ""
-#: builtin/help.c:372
+#: builtin/help.c:384
msgid "no man viewer handled the request"
msgstr ""
-#: builtin/help.c:380
+#: builtin/help.c:392
msgid "no info viewer handled the request"
msgstr ""
-#: builtin/help.c:391
-#, c-format
-msgid "'%s': not a documentation directory."
-msgstr ""
-
-#: builtin/help.c:432 builtin/help.c:439
+#: builtin/help.c:447 builtin/help.c:454
#, c-format
msgid "usage: %s%s"
msgstr ""
-#: builtin/help.c:453
+#: builtin/help.c:470
#, c-format
msgid "`git %s' is aliased to `%s'"
msgstr ""
-#: builtin/index-pack.c:169
+#: builtin/index-pack.c:170
#, c-format
msgid "object type mismatch at %s"
msgstr ""
-#: builtin/index-pack.c:189
+#: builtin/index-pack.c:190
msgid "object of unexpected type"
msgstr ""
-#: builtin/index-pack.c:226
+#: 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:236
+#: builtin/index-pack.c:237
msgid "early EOF"
msgstr ""
-#: builtin/index-pack.c:237
+#: builtin/index-pack.c:238
msgid "read error on input"
msgstr ""
-#: builtin/index-pack.c:249
+#: builtin/index-pack.c:250
msgid "used more bytes than were available"
msgstr ""
-#: builtin/index-pack.c:256
+#: builtin/index-pack.c:257
msgid "pack too large for current definition of off_t"
msgstr ""
-#: builtin/index-pack.c:272
+#: builtin/index-pack.c:273
#, c-format
msgid "unable to create '%s'"
msgstr ""
-#: builtin/index-pack.c:277
+#: builtin/index-pack.c:278
#, c-format
msgid "cannot open packfile '%s'"
msgstr ""
-#: builtin/index-pack.c:291
+#: builtin/index-pack.c:292
msgid "pack signature mismatch"
msgstr ""
-#: builtin/index-pack.c:311
+#: builtin/index-pack.c:312
#, c-format
msgid "pack has bad object at offset %lu: %s"
msgstr ""
-#: builtin/index-pack.c:405
+#: builtin/index-pack.c:434
#, c-format
msgid "inflate returned %d"
msgstr ""
-#: builtin/index-pack.c:450
+#: builtin/index-pack.c:483
msgid "offset value overflow for delta base object"
msgstr ""
-#: builtin/index-pack.c:458
+#: builtin/index-pack.c:491
msgid "delta base offset is out of bound"
msgstr ""
-#: builtin/index-pack.c:466
+#: builtin/index-pack.c:499
#, c-format
msgid "unknown object type %d"
msgstr ""
-#: builtin/index-pack.c:495
+#: builtin/index-pack.c:530
msgid "cannot pread pack file"
msgstr ""
-#: builtin/index-pack.c:497
+#: 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:510
+#: builtin/index-pack.c:558
msgid "serious inflate inconsistency"
msgstr ""
-#: builtin/index-pack.c:583
+#: 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 "cannot read existing object %s"
+msgid "SHA1 COLLISION FOUND WITH %s !"
msgstr ""
-#: builtin/index-pack.c:586
+#: builtin/index-pack.c:652 builtin/pack-objects.c:170
+#: builtin/pack-objects.c:262
#, c-format
-msgid "SHA1 COLLISION FOUND WITH %s !"
+msgid "unable to read %s"
msgstr ""
-#: builtin/index-pack.c:598
+#: 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:610
+#: builtin/index-pack.c:747
#, c-format
msgid "invalid %s"
msgstr ""
-#: builtin/index-pack.c:612
+#: builtin/index-pack.c:749
msgid "Error in object"
msgstr ""
-#: builtin/index-pack.c:614
+#: builtin/index-pack.c:751
#, c-format
msgid "Not all child objects of %s are reachable"
msgstr ""
-#: builtin/index-pack.c:687 builtin/index-pack.c:713
+#: builtin/index-pack.c:821 builtin/index-pack.c:847
msgid "failed to apply delta"
msgstr ""
-#: builtin/index-pack.c:850
+#: builtin/index-pack.c:986
msgid "Receiving objects"
msgstr ""
-#: builtin/index-pack.c:850
+#: builtin/index-pack.c:986
msgid "Indexing objects"
msgstr ""
-#: builtin/index-pack.c:872
+#: builtin/index-pack.c:1012
msgid "pack is corrupted (SHA1 mismatch)"
msgstr ""
-#: builtin/index-pack.c:877
+#: builtin/index-pack.c:1017
msgid "cannot fstat packfile"
msgstr ""
-#: builtin/index-pack.c:880
+#: builtin/index-pack.c:1020
msgid "pack has junk at the end"
msgstr ""
-#: builtin/index-pack.c:903
+#: 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:954
+#: builtin/index-pack.c:1105
msgid "confusion beyond insanity"
msgstr ""
-#: builtin/index-pack.c:973
+#: 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:998
+#: builtin/index-pack.c:1149
#, c-format
msgid "unable to deflate appended object (%d)"
msgstr ""
-#: builtin/index-pack.c:1077
+#: builtin/index-pack.c:1228
#, c-format
msgid "local object %s is corrupt"
msgstr ""
-#: builtin/index-pack.c:1101
+#: builtin/index-pack.c:1252
msgid "error while closing pack file"
msgstr ""
-#: builtin/index-pack.c:1114
+#: builtin/index-pack.c:1265
#, c-format
msgid "cannot write keep file '%s'"
msgstr ""
-#: builtin/index-pack.c:1122
+#: builtin/index-pack.c:1273
#, c-format
msgid "cannot close written keep file '%s'"
msgstr ""
-#: builtin/index-pack.c:1135
+#: builtin/index-pack.c:1286
msgid "cannot store pack file"
msgstr ""
-#: builtin/index-pack.c:1146
+#: builtin/index-pack.c:1297
msgid "cannot store index file"
msgstr ""
-#: builtin/index-pack.c:1247
+#: builtin/index-pack.c:1398
#, c-format
msgid "Cannot open existing pack file '%s'"
msgstr ""
-#: builtin/index-pack.c:1249
+#: builtin/index-pack.c:1400
#, c-format
msgid "Cannot open existing pack idx file for '%s'"
msgstr ""
-#: builtin/index-pack.c:1296
+#: 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:1303
+#: 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:1330
+#: builtin/index-pack.c:1481
msgid "Cannot come back to cwd"
msgstr ""
-#: builtin/index-pack.c:1374 builtin/index-pack.c:1377
-#: builtin/index-pack.c:1389 builtin/index-pack.c:1393
+#: 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:1407
+#: builtin/index-pack.c:1558
msgid "--fix-thin cannot be used without --stdin"
msgstr ""
-#: builtin/index-pack.c:1411 builtin/index-pack.c:1421
+#: 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:1430
+#: builtin/index-pack.c:1581
msgid "--verify with no packfile name given"
msgstr ""
msgid "insane git directory %s"
msgstr ""
-#: builtin/init-db.c:322 builtin/init-db.c:325
+#: builtin/init-db.c:323 builtin/init-db.c:326
#, c-format
msgid "%s already exists"
msgstr ""
-#: builtin/init-db.c:354
+#: builtin/init-db.c:355
#, c-format
msgid "unable to handle file type %d"
msgstr ""
-#: builtin/init-db.c:357
+#: builtin/init-db.c:358
#, c-format
msgid "unable to move %s to %s"
msgstr ""
-#: builtin/init-db.c:362
+#: builtin/init-db.c:363
#, c-format
msgid "Could not create git link %s"
msgstr ""
#. * existing" or "Initialized empty", the second " shared" or
#. * "", and the last '%s%s' is the verbatim directory name.
#.
-#: builtin/init-db.c:419
+#: builtin/init-db.c:420
#, c-format
msgid "%s%s Git repository in %s%s\n"
msgstr ""
-#: builtin/init-db.c:420
+#: builtin/init-db.c:421
msgid "Reinitialized existing"
msgstr ""
-#: builtin/init-db.c:420
+#: builtin/init-db.c:421
msgid "Initialized empty"
msgstr ""
-#: builtin/init-db.c:421
+#: builtin/init-db.c:422
msgid " shared"
msgstr ""
-#: builtin/init-db.c:440
+#: builtin/init-db.c:441
msgid "cannot tell cwd"
msgstr ""
-#: builtin/init-db.c:521 builtin/init-db.c:528
+#: builtin/init-db.c:522 builtin/init-db.c:529
#, c-format
msgid "cannot mkdir %s"
msgstr ""
-#: builtin/init-db.c:532
+#: builtin/init-db.c:533
#, c-format
msgid "cannot chdir to %s"
msgstr ""
-#: builtin/init-db.c:554
+#: 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:578
+#: builtin/init-db.c:579
msgid "Cannot access current working directory"
msgstr ""
-#: builtin/init-db.c:585
+#: builtin/init-db.c:586
#, c-format
msgid "Cannot access work tree '%s'"
msgstr ""
-#: builtin/log.c:188
+#: builtin/log.c:189
#, c-format
msgid "Final output: %d %s\n"
msgstr ""
-#: builtin/log.c:401 builtin/log.c:489
+#: builtin/log.c:403 builtin/log.c:494
#, c-format
msgid "Could not read object %s"
msgstr ""
-#: builtin/log.c:513
+#: builtin/log.c:518
#, c-format
msgid "Unknown type: %d"
msgstr ""
-#: builtin/log.c:602
+#: builtin/log.c:608
msgid "format.headers without value"
msgstr ""
-#: builtin/log.c:676
+#: builtin/log.c:682
msgid "name of output directory is too long"
msgstr ""
-#: builtin/log.c:687
+#: builtin/log.c:693
#, c-format
msgid "Cannot open patch file %s"
msgstr ""
-#: builtin/log.c:701
+#: builtin/log.c:707
msgid "Need exactly one range."
msgstr ""
-#: builtin/log.c:709
+#: builtin/log.c:715
msgid "Not a range."
msgstr ""
-#: builtin/log.c:786
+#: builtin/log.c:792
msgid "Cover letter needs email format"
msgstr ""
-#: builtin/log.c:859
+#: builtin/log.c:865
#, c-format
msgid "insane in-reply-to: %s"
msgstr ""
-#: builtin/log.c:932
+#: builtin/log.c:938
msgid "Two output directories?"
msgstr ""
-#: builtin/log.c:1153
+#: builtin/log.c:1160
#, c-format
msgid "bogus committer info %s"
msgstr ""
-#: builtin/log.c:1198
+#: builtin/log.c:1205
msgid "-n and -k are mutually exclusive."
msgstr ""
-#: builtin/log.c:1200
+#: builtin/log.c:1207
msgid "--subject-prefix and -k are mutually exclusive."
msgstr ""
-#: builtin/log.c:1208
+#: builtin/log.c:1215
msgid "--name-only does not make sense"
msgstr ""
-#: builtin/log.c:1210
+#: builtin/log.c:1217
msgid "--name-status does not make sense"
msgstr ""
-#: builtin/log.c:1212
+#: builtin/log.c:1219
msgid "--check does not make sense"
msgstr ""
-#: builtin/log.c:1235
+#: builtin/log.c:1242
msgid "standard output, or directory, which one?"
msgstr ""
-#: builtin/log.c:1237
+#: builtin/log.c:1244
#, c-format
msgid "Could not create directory '%s'"
msgstr ""
-#: builtin/log.c:1390
+#: builtin/log.c:1397
msgid "Failed to create output files"
msgstr ""
-#: builtin/log.c:1494
+#: builtin/log.c:1501
#, c-format
msgid ""
"Could not find a tracked remote branch, please specify <upstream> manually.\n"
msgstr ""
-#: builtin/log.c:1510 builtin/log.c:1512 builtin/log.c:1524
+#: builtin/log.c:1517 builtin/log.c:1519 builtin/log.c:1531
#, c-format
msgid "Unknown commit %s"
msgstr ""
msgid "failed to read the cache"
msgstr ""
-#: builtin/merge.c:697
-msgid "Unable to write index."
-msgstr ""
-
#: builtin/merge.c:710
msgid "Not handling anything other than two heads merge."
msgstr ""
msgid "Unknown subcommand: %s"
msgstr ""
-#: builtin/pack-objects.c:2337
+#: 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:2341
+#: builtin/pack-objects.c:2402
#, c-format
msgid "bad index version '%s'"
msgstr ""
-#: builtin/pack-objects.c:2364
+#: builtin/pack-objects.c:2425
#, c-format
msgid "option %s does not accept negative form"
msgstr ""
-#: builtin/pack-objects.c:2368
+#: builtin/pack-objects.c:2429
#, c-format
msgid "unable to parse value '%s' for option %s"
msgstr ""
msgid "Cannot do a %s reset in the middle of a merge."
msgstr ""
-#: builtin/reset.c:297
+#: builtin/reset.c:303
#, c-format
msgid "Could not parse object '%s'."
msgstr ""
-#: builtin/reset.c:302
+#: builtin/reset.c:308
msgid "--patch is incompatible with --{hard,mixed,soft}"
msgstr ""
-#: builtin/reset.c:311
+#: builtin/reset.c:317
msgid "--mixed with paths is deprecated; use 'git reset -- <paths>' instead."
msgstr ""
-#: builtin/reset.c:313
+#: builtin/reset.c:319
#, c-format
msgid "Cannot do %s reset with paths."
msgstr ""
-#: builtin/reset.c:325
+#: builtin/reset.c:331
#, c-format
msgid "%s reset is not allowed in a bare repository"
msgstr ""
-#: builtin/reset.c:341
+#: builtin/reset.c:347
#, c-format
msgid "Could not reset index file to revision '%s'."
msgstr ""
#: git-am.sh:105
#, sh-format
msgid ""
-"When you have resolved this problem run \"$cmdline --resolved\".\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\"."
+"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 "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"
msgid "Falling back to patching base and 3-way merge..."
msgstr ""
-#: git-am.sh:275
+#: 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:362
+#: git-am.sh:361
#, sh-format
msgid "Patch format $patch_format is not supported."
msgstr ""
-#: git-am.sh:364
+#: git-am.sh:363
msgid "Patch format detection failed."
msgstr ""
-#: git-am.sh:418
-msgid "-d option is no longer supported. Do not use."
+#: 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:481
+#: git-am.sh:477
#, sh-format
msgid "previous rebase directory $dotest still exists but mbox given."
msgstr ""
-#: git-am.sh:486
+#: git-am.sh:482
msgid "Please make up your mind. --skip or --abort?"
msgstr ""
-#: git-am.sh:513
+#: git-am.sh:509
msgid "Resolve operation not in progress, we are not resuming."
msgstr ""
-#: git-am.sh:579
+#: git-am.sh:575
#, sh-format
msgid "Dirty index: cannot apply patches (dirty: $files)"
msgstr ""
-#: git-am.sh:671
+#: git-am.sh:679
#, sh-format
msgid ""
"Patch is empty. Was it split wrong?\n"
"To restore the original branch and stop patching run \"$cmdline --abort\"."
msgstr ""
-#: git-am.sh:708
+#: git-am.sh:706
msgid "Patch does not have a valid e-mail address."
msgstr ""
-#: git-am.sh:755
+#: git-am.sh:753
msgid "cannot be interactive without stdin connected to a terminal."
msgstr ""
-#: git-am.sh:759
+#: 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:766
+#: git-am.sh:764
msgid "Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all "
msgstr ""
-#: git-am.sh:802
+#: git-am.sh:800
#, sh-format
msgid "Applying: $FIRSTLINE"
msgstr ""
-#: git-am.sh:823
+#: 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:831
+#: 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:847
+#: git-am.sh:845
msgid "No changes -- Patch already applied."
msgstr ""
-#: git-am.sh:857
+#: git-am.sh:855
#, sh-format
msgid "Patch failed at $msgnum $FIRSTLINE"
msgstr ""
-#: git-am.sh:873
+#: git-am.sh:876
msgid "applying to an empty history"
msgstr ""
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 ""
msgid "(To restore them type \"git stash apply\")"
msgstr ""
-#: git-submodule.sh:56
+#: git-submodule.sh:88
#, sh-format
msgid "cannot strip one component off url '$remoteurl'"
msgstr ""
-#: git-submodule.sh:109
+#: git-submodule.sh:145
#, sh-format
msgid "No submodule mapping found in .gitmodules for path '$sm_path'"
msgstr ""
-#: git-submodule.sh:150
+#: git-submodule.sh:189
#, sh-format
msgid "Clone of '$url' into submodule path '$sm_path' failed"
msgstr ""
-#: git-submodule.sh:160
+#: git-submodule.sh:201
#, sh-format
msgid "Gitdir '$a' is part of the submodule path '$b' or vice versa"
msgstr ""
-#: git-submodule.sh:249
+#: git-submodule.sh:290
#, sh-format
msgid "repo URL: '$repo' must be absolute or begin with ./|../"
msgstr ""
-#: git-submodule.sh:266
+#: git-submodule.sh:307
#, sh-format
msgid "'$sm_path' already exists in the index"
msgstr ""
-#: git-submodule.sh:270
+#: git-submodule.sh:311
#, sh-format
msgid ""
"The following path is ignored by one of your .gitignore files:\n"
"Use -f if you really want to add it."
msgstr ""
-#: git-submodule.sh:281
+#: git-submodule.sh:322
#, sh-format
msgid "Adding existing repo at '$sm_path' to the index"
msgstr ""
-#: git-submodule.sh:283
+#: git-submodule.sh:324
#, sh-format
msgid "'$sm_path' already exists and is not a valid git repo"
msgstr ""
-#: git-submodule.sh:297
+#: git-submodule.sh:338
#, sh-format
msgid "Unable to checkout submodule '$sm_path'"
msgstr ""
-#: git-submodule.sh:302
+#: git-submodule.sh:343
#, sh-format
msgid "Failed to add submodule '$sm_path'"
msgstr ""
-#: git-submodule.sh:307
+#: git-submodule.sh:348
#, sh-format
msgid "Failed to register submodule '$sm_path'"
msgstr ""
-#: git-submodule.sh:349
+#: git-submodule.sh:390
#, sh-format
msgid "Entering '$prefix$sm_path'"
msgstr ""
-#: git-submodule.sh:363
+#: git-submodule.sh:404
#, sh-format
msgid "Stopping at '$sm_path'; script returned non-zero status."
msgstr ""
-#: git-submodule.sh:406
+#: git-submodule.sh:447
#, sh-format
msgid "No url found for submodule path '$sm_path' in .gitmodules"
msgstr ""
-#: git-submodule.sh:415
+#: git-submodule.sh:456
#, sh-format
msgid "Failed to register url for submodule path '$sm_path'"
msgstr ""
-#: git-submodule.sh:417
+#: git-submodule.sh:458
#, sh-format
msgid "Submodule '$name' ($url) registered for path '$sm_path'"
msgstr ""
-#: git-submodule.sh:425
+#: git-submodule.sh:466
#, sh-format
msgid "Failed to register update mode for submodule path '$sm_path'"
msgstr ""
-#: git-submodule.sh:524
+#: 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:537
+#: git-submodule.sh:578
#, sh-format
msgid "Unable to find current revision in submodule path '$sm_path'"
msgstr ""
-#: git-submodule.sh:556
+#: git-submodule.sh:597
#, sh-format
msgid "Unable to fetch in submodule path '$sm_path'"
msgstr ""
-#: git-submodule.sh:570
+#: git-submodule.sh:611
#, sh-format
msgid "Unable to rebase '$sha1' in submodule path '$sm_path'"
msgstr ""
-#: git-submodule.sh:571
+#: git-submodule.sh:612
#, sh-format
msgid "Submodule path '$sm_path': rebased into '$sha1'"
msgstr ""
-#: git-submodule.sh:576
+#: git-submodule.sh:617
#, sh-format
msgid "Unable to merge '$sha1' in submodule path '$sm_path'"
msgstr ""
-#: git-submodule.sh:577
+#: git-submodule.sh:618
#, sh-format
msgid "Submodule path '$sm_path': merged in '$sha1'"
msgstr ""
-#: git-submodule.sh:582
+#: git-submodule.sh:623
#, sh-format
msgid "Unable to checkout '$sha1' in submodule path '$sm_path'"
msgstr ""
-#: git-submodule.sh:583
+#: git-submodule.sh:624
#, sh-format
msgid "Submodule path '$sm_path': checked out '$sha1'"
msgstr ""
-#: git-submodule.sh:605 git-submodule.sh:928
+#: git-submodule.sh:646 git-submodule.sh:969
#, sh-format
msgid "Failed to recurse into submodule path '$sm_path'"
msgstr ""
-#: git-submodule.sh:713
-msgid "--cached cannot be used with --files"
+#: git-submodule.sh:754
+msgid "The --cached option cannot be used with the --files option"
msgstr ""
#. unexpected type
-#: git-submodule.sh:753
+#: git-submodule.sh:794
#, sh-format
msgid "unexpected mode $mod_dst"
msgstr ""
-#: git-submodule.sh:771
+#: git-submodule.sh:812
#, sh-format
msgid " Warn: $name doesn't contain commit $sha1_src"
msgstr ""
-#: git-submodule.sh:774
+#: git-submodule.sh:815
#, sh-format
msgid " Warn: $name doesn't contain commit $sha1_dst"
msgstr ""
-#: git-submodule.sh:777
+#: git-submodule.sh:818
#, sh-format
msgid " Warn: $name doesn't contain commits $sha1_src and $sha1_dst"
msgstr ""
-#: git-submodule.sh:802
+#: git-submodule.sh:843
msgid "blob"
msgstr ""
-#: git-submodule.sh:803
-msgid "submodule"
-msgstr ""
-
-#: git-submodule.sh:840
+#: git-submodule.sh:881
msgid "# Submodules changed but not updated:"
msgstr ""
-#: git-submodule.sh:842
+#: git-submodule.sh:883
msgid "# Submodule changes to be committed:"
msgstr ""
-#: git-submodule.sh:974
+#: git-submodule.sh:1027
#, sh-format
msgid "Synchronizing submodule url for '$name'"
msgstr ""