msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n"
-"POT-Creation-Date: 2012-02-28 09:17+0800\n"
+"POT-Creation-Date: 2012-04-28 20:33+0800\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
msgid "failed to close rev-list's stdin: %s"
msgstr ""
-#: diff.c:104
+#: diff.c:105
#, c-format
msgid " Failed to parse dirstat cut-off percentage '%.*s'\n"
msgstr ""
-#: diff.c:109
+#: diff.c:110
#, c-format
msgid " Unknown dirstat parameter '%.*s'\n"
msgstr ""
-#: diff.c:205
+#: diff.c:210
#, c-format
msgid ""
"Found errors in 'diff.dirstat' config variable:\n"
"%s"
msgstr ""
-#: diff.c:1331
+#: diff.c:1400
msgid " 0 files changed\n"
msgstr ""
-#: diff.c:1335
+#: diff.c:1404
#, c-format
msgid " %d file changed"
msgid_plural " %d files changed"
msgstr[0] ""
msgstr[1] ""
-#: diff.c:1352
+#: diff.c:1421
#, c-format
msgid ", %d insertion(+)"
msgid_plural ", %d insertions(+)"
msgstr[0] ""
msgstr[1] ""
-#: diff.c:1363
+#: diff.c:1432
#, c-format
msgid ", %d deletion(-)"
msgid_plural ", %d deletions(-)"
msgstr[0] ""
msgstr[1] ""
-#: diff.c:3364
+#: diff.c:3435
#, c-format
msgid ""
"Failed to parse --dirstat/-X option parameter:\n"
msgid "gpg failed to sign the data"
msgstr ""
-#: grep.c:1285
+#: grep.c:1280
#, c-format
msgid "'%s': unable to read %s"
msgstr ""
-#: grep.c:1302
+#: grep.c:1297
#, c-format
msgid "'%s': %s"
msgstr ""
-#: grep.c:1313
+#: grep.c:1308
#, c-format
msgid "'%s': short read %s"
msgstr ""
msgstr[0] ""
msgstr[1] ""
-#: sequencer.c:120 builtin/merge.c:862 builtin/merge.c:983
-#: builtin/merge.c:1093 builtin/merge.c:1103
+#: sequencer.c:120 builtin/merge.c:864 builtin/merge.c:985
+#: builtin/merge.c:1095 builtin/merge.c:1105
#, c-format
msgid "Could not open '%s' for writing"
msgstr ""
-#: sequencer.c:122 builtin/merge.c:334 builtin/merge.c:865
-#: builtin/merge.c:1095 builtin/merge.c:1108
+#: sequencer.c:122 builtin/merge.c:334 builtin/merge.c:867
+#: builtin/merge.c:1097 builtin/merge.c:1110
#, c-format
msgid "Could not write to '%s'"
msgstr ""
-#: sequencer.c:142
+#: sequencer.c:143
+msgid ""
+"after resolving the conflicts, mark the corrected paths\n"
+"with 'git add <paths>' or 'git rm <paths>'"
+msgstr ""
+
+#: sequencer.c:146
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:154 sequencer.c:680 sequencer.c:763
+#: sequencer.c:159 sequencer.c:685 sequencer.c:768
#, c-format
msgid "Could not write to %s"
msgstr ""
-#: sequencer.c:157
+#: sequencer.c:162
#, c-format
msgid "Error wrapping up %s"
msgstr ""
-#: sequencer.c:172
+#: sequencer.c:177
msgid "Your local changes would be overwritten by cherry-pick."
msgstr ""
-#: sequencer.c:174
+#: sequencer.c:179
msgid "Your local changes would be overwritten by revert."
msgstr ""
-#: sequencer.c:177
+#: sequencer.c:182
msgid "Commit your changes or stash them to proceed."
msgstr ""
#. TRANSLATORS: %s will be "revert" or "cherry-pick"
-#: sequencer.c:227
+#: sequencer.c:232
#, c-format
msgid "%s: Unable to write new index file"
msgstr ""
-#: sequencer.c:293
+#: sequencer.c:298
msgid "Your index file is unmerged."
msgstr ""
-#: sequencer.c:296
+#: sequencer.c:301
msgid "You do not have a valid HEAD"
msgstr ""
-#: sequencer.c:311
+#: sequencer.c:316
#, c-format
msgid "Commit %s is a merge but no -m option was given."
msgstr ""
-#: sequencer.c:319
+#: sequencer.c:324
#, c-format
msgid "Commit %s does not have parent %d"
msgstr ""
-#: sequencer.c:323
+#: sequencer.c:328
#, 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:334
+#: sequencer.c:339
#, c-format
msgid "%s: cannot parse parent commit %s"
msgstr ""
-#: sequencer.c:338
+#: sequencer.c:343
#, c-format
msgid "Cannot get commit message for %s"
msgstr ""
-#: sequencer.c:422
+#: sequencer.c:427
#, c-format
msgid "could not revert %s... %s"
msgstr ""
-#: sequencer.c:423
+#: sequencer.c:428
#, c-format
msgid "could not apply %s... %s"
msgstr ""
-#: sequencer.c:445 sequencer.c:904 builtin/log.c:286 builtin/log.c:709
-#: builtin/log.c:1325 builtin/log.c:1544 builtin/merge.c:348
+#: sequencer.c:450 sequencer.c:909 builtin/log.c:288 builtin/log.c:713
+#: builtin/log.c:1329 builtin/log.c:1548 builtin/merge.c:348
#: builtin/shortlog.c:181
msgid "revision walk setup failed"
msgstr ""
-#: sequencer.c:448
+#: sequencer.c:453
msgid "empty commit set passed"
msgstr ""
-#: sequencer.c:456
+#: sequencer.c:461
#, c-format
msgid "git %s: failed to read the index"
msgstr ""
-#: sequencer.c:461
+#: sequencer.c:466
#, c-format
msgid "git %s: failed to refresh the index"
msgstr ""
-#: sequencer.c:546
+#: sequencer.c:551
#, c-format
msgid "Cannot %s during a %s"
msgstr ""
-#: sequencer.c:568
+#: sequencer.c:573
#, c-format
msgid "Could not parse line %d."
msgstr ""
-#: sequencer.c:573
+#: sequencer.c:578
msgid "No commits parsed."
msgstr ""
-#: sequencer.c:586
+#: sequencer.c:591
#, c-format
msgid "Could not open %s"
msgstr ""
-#: sequencer.c:590
+#: sequencer.c:595
#, c-format
msgid "Could not read %s."
msgstr ""
-#: sequencer.c:597
+#: sequencer.c:602
#, c-format
msgid "Unusable instruction sheet: %s"
msgstr ""
-#: sequencer.c:625
+#: sequencer.c:630
#, c-format
msgid "Invalid key: %s"
msgstr ""
-#: sequencer.c:628
+#: sequencer.c:633
#, c-format
msgid "Invalid value for %s: %s"
msgstr ""
-#: sequencer.c:640
+#: sequencer.c:645
#, c-format
msgid "Malformed options sheet: %s"
msgstr ""
-#: sequencer.c:661
+#: sequencer.c:666
msgid "a cherry-pick or revert is already in progress"
msgstr ""
-#: sequencer.c:662
+#: sequencer.c:667
msgid "try \"git cherry-pick (--continue | --quit | --abort)\""
msgstr ""
-#: sequencer.c:666
+#: sequencer.c:671
#, c-format
msgid "Could not create sequencer directory %s"
msgstr ""
-#: sequencer.c:682 sequencer.c:767
+#: sequencer.c:687 sequencer.c:772
#, c-format
msgid "Error wrapping up %s."
msgstr ""
-#: sequencer.c:701 sequencer.c:835
+#: sequencer.c:706 sequencer.c:840
msgid "no cherry-pick or revert in progress"
msgstr ""
-#: sequencer.c:703
+#: sequencer.c:708
msgid "cannot resolve HEAD"
msgstr ""
-#: sequencer.c:705
+#: sequencer.c:710
msgid "cannot abort from a branch yet to be born"
msgstr ""
-#: sequencer.c:727
+#: sequencer.c:732
#, c-format
msgid "cannot open %s: %s"
msgstr ""
-#: sequencer.c:730
+#: sequencer.c:735
#, c-format
msgid "cannot read %s: %s"
msgstr ""
-#: sequencer.c:731
+#: sequencer.c:736
msgid "unexpected end of file"
msgstr ""
-#: sequencer.c:737
+#: sequencer.c:742
#, c-format
msgid "stored pre-cherry-pick HEAD file '%s' is corrupt"
msgstr ""
-#: sequencer.c:760
+#: sequencer.c:765
#, c-format
msgid "Could not format %s."
msgstr ""
-#: sequencer.c:922
+#: sequencer.c:927
msgid "Can't revert as initial commit"
msgstr ""
-#: sequencer.c:923
+#: sequencer.c:928
msgid "Can't cherry-pick into empty head"
msgstr ""
msgid "(no branch)"
msgstr ""
-#: builtin/branch.c:562
+#: builtin/branch.c:566
msgid "some refs could not be read"
msgstr ""
-#: builtin/branch.c:575
+#: builtin/branch.c:579
msgid "cannot rename the current branch while not on any."
msgstr ""
-#: builtin/branch.c:585
+#: builtin/branch.c:589
#, c-format
msgid "Invalid branch name: '%s'"
msgstr ""
-#: builtin/branch.c:600
+#: builtin/branch.c:604
msgid "Branch rename failed"
msgstr ""
-#: builtin/branch.c:604
+#: builtin/branch.c:608
#, c-format
msgid "Renamed a misnamed branch '%s' away"
msgstr ""
-#: builtin/branch.c:608
+#: builtin/branch.c:612
#, c-format
msgid "Branch renamed to %s, but HEAD is not updated!"
msgstr ""
-#: builtin/branch.c:615
+#: builtin/branch.c:619
msgid "Branch is renamed, but update of config-file failed"
msgstr ""
-#: builtin/branch.c:630
+#: builtin/branch.c:634
#, c-format
msgid "malformed object name %s"
msgstr ""
-#: builtin/branch.c:654
+#: builtin/branch.c:658
#, c-format
msgid "could not write branch description template: %s\n"
msgstr ""
-#: builtin/branch.c:742
+#: builtin/branch.c:746
msgid "Failed to resolve HEAD as a valid ref."
msgstr ""
-#: builtin/branch.c:747 builtin/clone.c:558
+#: builtin/branch.c:751 builtin/clone.c:558
msgid "HEAD not found below refs/heads!"
msgstr ""
-#: builtin/branch.c:805
+#: builtin/branch.c:809
msgid "-a and -r options to 'git branch' do not make sense with a branch name"
msgstr ""
msgstr ""
#: builtin/checkout.c:302 builtin/checkout.c:498 builtin/clone.c:583
-#: builtin/merge.c:809
+#: builtin/merge.c:811
msgid "unable to write new index file"
msgstr ""
-#: builtin/checkout.c:319 builtin/diff.c:298 builtin/merge.c:406
+#: builtin/checkout.c:319 builtin/diff.c:302 builtin/merge.c:408
msgid "diff_setup_done failed"
msgstr ""
msgid "unable to write temporary index file"
msgstr ""
-#: builtin/commit.c:550 builtin/commit.c:556
+#: builtin/commit.c:561 builtin/commit.c:567
#, c-format
msgid "invalid commit: %s"
msgstr ""
-#: builtin/commit.c:579
+#: builtin/commit.c:590
msgid "malformed --author parameter"
msgstr ""
-#: builtin/commit.c:635
+#: builtin/commit.c:651
#, c-format
msgid "Malformed ident string: '%s'"
msgstr ""
-#: builtin/commit.c:670 builtin/commit.c:703 builtin/commit.c:1000
+#: builtin/commit.c:689 builtin/commit.c:722 builtin/commit.c:1033
#, c-format
msgid "could not lookup commit %s"
msgstr ""
-#: builtin/commit.c:682 builtin/shortlog.c:296
+#: builtin/commit.c:701 builtin/shortlog.c:296
#, c-format
msgid "(reading log message from standard input)\n"
msgstr ""
-#: builtin/commit.c:684
+#: builtin/commit.c:703
msgid "could not read log from standard input"
msgstr ""
-#: builtin/commit.c:688
+#: builtin/commit.c:707
#, c-format
msgid "could not read log file '%s'"
msgstr ""
-#: builtin/commit.c:694
+#: builtin/commit.c:713
msgid "commit has empty message"
msgstr ""
-#: builtin/commit.c:710
+#: builtin/commit.c:729
msgid "could not read MERGE_MSG"
msgstr ""
-#: builtin/commit.c:714
+#: builtin/commit.c:733
msgid "could not read SQUASH_MSG"
msgstr ""
-#: builtin/commit.c:718
+#: builtin/commit.c:737
#, c-format
msgid "could not read '%s'"
msgstr ""
-#: builtin/commit.c:746
+#: builtin/commit.c:765
#, c-format
msgid "could not open '%s'"
msgstr ""
-#: builtin/commit.c:770
+#: builtin/commit.c:789
msgid "could not write commit template"
msgstr ""
-#: builtin/commit.c:783
+#: builtin/commit.c:799
#, c-format
msgid ""
"\n"
"and try again.\n"
msgstr ""
-#: builtin/commit.c:796
+#: builtin/commit.c:812
msgid "Please enter the commit message for your changes."
msgstr ""
-#: builtin/commit.c:799
+#: builtin/commit.c:815
msgid ""
" Lines starting\n"
"with '#' will be ignored, and an empty message aborts the commit.\n"
msgstr ""
-#: builtin/commit.c:804
+#: builtin/commit.c:820
msgid ""
" 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:816
+#: builtin/commit.c:832
#, c-format
msgid "%sAuthor: %s"
msgstr ""
-#: builtin/commit.c:823
+#: builtin/commit.c:839
#, c-format
msgid "%sCommitter: %s"
msgstr ""
-#: builtin/commit.c:843
+#: builtin/commit.c:859
msgid "Cannot read index"
msgstr ""
-#: builtin/commit.c:880
+#: builtin/commit.c:896
msgid "Error building trees"
msgstr ""
-#: builtin/commit.c:895 builtin/tag.c:357
+#: builtin/commit.c:911 builtin/tag.c:357
#, c-format
msgid "Please supply the message using either -m or -F option.\n"
msgstr ""
-#: builtin/commit.c:975
+#: builtin/commit.c:1008
#, c-format
msgid "No existing author found with '%s'"
msgstr ""
-#: builtin/commit.c:990 builtin/commit.c:1182
+#: builtin/commit.c:1023 builtin/commit.c:1217
#, c-format
msgid "Invalid untracked files mode '%s'"
msgstr ""
-#: builtin/commit.c:1030
+#: builtin/commit.c:1063
msgid "Using both --reset-author and --author does not make sense"
msgstr ""
-#: builtin/commit.c:1041
+#: builtin/commit.c:1074
msgid "You have nothing to amend."
msgstr ""
-#: builtin/commit.c:1043
+#: builtin/commit.c:1076
#, c-format
msgid "You are in the middle of a %s -- cannot amend."
msgstr ""
-#: builtin/commit.c:1045
+#: builtin/commit.c:1078
msgid "Options --squash and --fixup cannot be used together"
msgstr ""
-#: builtin/commit.c:1055
+#: builtin/commit.c:1088
msgid "Only one of -c/-C/-F/--fixup can be used."
msgstr ""
-#: builtin/commit.c:1057
+#: builtin/commit.c:1090
msgid "Option -m cannot be combined with -c/-C/-F/--fixup."
msgstr ""
-#: builtin/commit.c:1063
+#: builtin/commit.c:1098
msgid "--reset-author can be used only with -C, -c or --amend."
msgstr ""
-#: builtin/commit.c:1080
+#: builtin/commit.c:1115
msgid "Only one of --include/--only/--all/--interactive/--patch can be used."
msgstr ""
-#: builtin/commit.c:1082
+#: builtin/commit.c:1117
msgid "No paths with --include/--only does not make sense."
msgstr ""
-#: builtin/commit.c:1084
+#: builtin/commit.c:1119
msgid "Clever... amending the last one with dirty index."
msgstr ""
-#: builtin/commit.c:1086
+#: builtin/commit.c:1121
msgid "Explicit paths specified without -i nor -o; assuming --only paths..."
msgstr ""
-#: builtin/commit.c:1096 builtin/tag.c:556
+#: builtin/commit.c:1131 builtin/tag.c:556
#, c-format
msgid "Invalid cleanup mode %s"
msgstr ""
-#: builtin/commit.c:1101
+#: builtin/commit.c:1136
msgid "Paths with -a does not make sense."
msgstr ""
-#: builtin/commit.c:1280
+#: builtin/commit.c:1315
msgid "couldn't look up newly created commit"
msgstr ""
-#: builtin/commit.c:1282
+#: builtin/commit.c:1317
msgid "could not parse newly created commit"
msgstr ""
-#: builtin/commit.c:1323
+#: builtin/commit.c:1358
msgid "detached HEAD"
msgstr ""
-#: builtin/commit.c:1325
+#: builtin/commit.c:1360
msgid " (root-commit)"
msgstr ""
-#: builtin/commit.c:1415
+#: builtin/commit.c:1450
msgid "could not parse HEAD commit"
msgstr ""
-#: builtin/commit.c:1452 builtin/merge.c:507
+#: builtin/commit.c:1487 builtin/merge.c:509
#, c-format
msgid "could not open '%s' for reading"
msgstr ""
-#: builtin/commit.c:1459
+#: builtin/commit.c:1494
#, c-format
msgid "Corrupt MERGE_HEAD file (%s)"
msgstr ""
-#: builtin/commit.c:1466
+#: builtin/commit.c:1501
msgid "could not read MERGE_MODE"
msgstr ""
-#: builtin/commit.c:1485
+#: builtin/commit.c:1520
#, c-format
msgid "could not read commit message: %s"
msgstr ""
-#: builtin/commit.c:1499
+#: 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:1514 builtin/merge.c:933 builtin/merge.c:966
+#: builtin/commit.c:1554 builtin/merge.c:935 builtin/merge.c:968
msgid "failed to write commit object"
msgstr ""
-#: builtin/commit.c:1535
+#: builtin/commit.c:1575
msgid "cannot lock HEAD ref"
msgstr ""
-#: builtin/commit.c:1539
+#: builtin/commit.c:1579
msgid "cannot update HEAD ref"
msgstr ""
-#: builtin/commit.c:1550
+#: 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 "invalid option: %s"
msgstr ""
-#: builtin/diff.c:293
+#: builtin/diff.c:297
msgid "Not a git repository"
msgstr ""
-#: builtin/diff.c:343
+#: builtin/diff.c:347
#, c-format
msgid "invalid object '%s' given."
msgstr ""
-#: builtin/diff.c:348
+#: builtin/diff.c:352
#, c-format
msgid "more than %d trees given: '%s'"
msgstr ""
-#: builtin/diff.c:358
+#: builtin/diff.c:362
#, c-format
msgid "more than two blobs given: '%s'"
msgstr ""
-#: builtin/diff.c:366
+#: builtin/diff.c:370
#, c-format
msgid "unhandled object '%s' given."
msgstr ""
msgid "cannot open '%s'"
msgstr ""
-#: builtin/grep.c:889
+#: builtin/grep.c:888
msgid "no pattern given."
msgstr ""
-#: builtin/grep.c:903
+#: builtin/grep.c:902
#, c-format
msgid "bad object %s"
msgstr ""
-#: builtin/grep.c:944
+#: builtin/grep.c:943
msgid "--open-files-in-pager only works on the worktree"
msgstr ""
-#: builtin/grep.c:967
+#: builtin/grep.c:966
msgid "--cached or --untracked cannot be used with --no-index."
msgstr ""
-#: builtin/grep.c:972
+#: builtin/grep.c:971
msgid "--no-index or --untracked cannot be used with revs."
msgstr ""
-#: builtin/grep.c:975
+#: builtin/grep.c:974
msgid "--[no-]exclude-standard cannot be used for tracked contents."
msgstr ""
-#: builtin/grep.c:983
+#: builtin/grep.c:982
msgid "both --cached and trees are given."
msgstr ""
msgid "Cannot access work tree '%s'"
msgstr ""
-#: builtin/log.c:185
+#: builtin/log.c:187
#, c-format
msgid "Final output: %d %s\n"
msgstr ""
-#: builtin/log.c:393 builtin/log.c:479
+#: builtin/log.c:395 builtin/log.c:483
#, c-format
msgid "Could not read object %s"
msgstr ""
-#: builtin/log.c:503
+#: builtin/log.c:507
#, c-format
msgid "Unknown type: %d"
msgstr ""
-#: builtin/log.c:592
+#: builtin/log.c:596
msgid "format.headers without value"
msgstr ""
-#: builtin/log.c:665
+#: builtin/log.c:669
msgid "name of output directory is too long"
msgstr ""
-#: builtin/log.c:676
+#: builtin/log.c:680
#, c-format
msgid "Cannot open patch file %s"
msgstr ""
-#: builtin/log.c:690
+#: builtin/log.c:694
msgid "Need exactly one range."
msgstr ""
-#: builtin/log.c:698
+#: builtin/log.c:702
msgid "Not a range."
msgstr ""
-#: builtin/log.c:735
+#: builtin/log.c:739
msgid "Could not extract email from committer identity."
msgstr ""
-#: builtin/log.c:781
+#: builtin/log.c:785
msgid "Cover letter needs email format"
msgstr ""
-#: builtin/log.c:875
+#: builtin/log.c:879
#, c-format
msgid "insane in-reply-to: %s"
msgstr ""
-#: builtin/log.c:948
+#: builtin/log.c:952
msgid "Two output directories?"
msgstr ""
-#: builtin/log.c:1169
+#: builtin/log.c:1173
#, c-format
msgid "bogus committer info %s"
msgstr ""
-#: builtin/log.c:1214
+#: builtin/log.c:1218
msgid "-n and -k are mutually exclusive."
msgstr ""
-#: builtin/log.c:1216
+#: builtin/log.c:1220
msgid "--subject-prefix and -k are mutually exclusive."
msgstr ""
-#: builtin/log.c:1221 builtin/shortlog.c:284
+#: builtin/log.c:1225 builtin/shortlog.c:284
#, c-format
msgid "unrecognized argument: %s"
msgstr ""
-#: builtin/log.c:1224
+#: builtin/log.c:1228
msgid "--name-only does not make sense"
msgstr ""
-#: builtin/log.c:1226
+#: builtin/log.c:1230
msgid "--name-status does not make sense"
msgstr ""
-#: builtin/log.c:1228
+#: builtin/log.c:1232
msgid "--check does not make sense"
msgstr ""
-#: builtin/log.c:1251
+#: builtin/log.c:1255
msgid "standard output, or directory, which one?"
msgstr ""
-#: builtin/log.c:1253
+#: builtin/log.c:1257
#, c-format
msgid "Could not create directory '%s'"
msgstr ""
-#: builtin/log.c:1406
+#: builtin/log.c:1410
msgid "Failed to create output files"
msgstr ""
-#: builtin/log.c:1510
+#: builtin/log.c:1514
#, c-format
msgid ""
"Could not find a tracked remote branch, please specify <upstream> manually.\n"
msgstr ""
-#: builtin/log.c:1526 builtin/log.c:1528 builtin/log.c:1540
+#: builtin/log.c:1530 builtin/log.c:1532 builtin/log.c:1544
#, c-format
msgid "Unknown commit %s"
msgstr ""
msgid "No merge message -- not updating HEAD\n"
msgstr ""
-#: builtin/merge.c:435
+#: builtin/merge.c:437
#, c-format
msgid "'%s' does not point to a commit"
msgstr ""
-#: builtin/merge.c:534
+#: builtin/merge.c:536
#, c-format
msgid "Bad branch.%s.mergeoptions string: %s"
msgstr ""
-#: builtin/merge.c:627
+#: builtin/merge.c:629
msgid "git write-tree failed to write a tree"
msgstr ""
-#: builtin/merge.c:677
+#: builtin/merge.c:679
msgid "failed to read the cache"
msgstr ""
-#: builtin/merge.c:694
+#: builtin/merge.c:696
msgid "Unable to write index."
msgstr ""
-#: builtin/merge.c:707
+#: builtin/merge.c:709
msgid "Not handling anything other than two heads merge."
msgstr ""
-#: builtin/merge.c:721
+#: builtin/merge.c:723
#, c-format
msgid "Unknown option for merge-recursive: -X%s"
msgstr ""
-#: builtin/merge.c:735
+#: builtin/merge.c:737
#, c-format
msgid "unable to write %s"
msgstr ""
-#: builtin/merge.c:874
+#: builtin/merge.c:876
#, c-format
msgid "Could not read from '%s'"
msgstr ""
-#: builtin/merge.c:883
+#: builtin/merge.c:885
#, c-format
msgid "Not committing merge; use 'git commit' to complete the merge.\n"
msgstr ""
-#: builtin/merge.c:889
+#: builtin/merge.c:891
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"
"the commit.\n"
msgstr ""
-#: builtin/merge.c:913
+#: builtin/merge.c:915
msgid "Empty commit message."
msgstr ""
-#: builtin/merge.c:925
+#: builtin/merge.c:927
#, c-format
msgid "Wonderful.\n"
msgstr ""
-#: builtin/merge.c:998
+#: builtin/merge.c:1000
#, c-format
msgid "Automatic merge failed; fix conflicts and then commit the result.\n"
msgstr ""
-#: builtin/merge.c:1014
+#: builtin/merge.c:1016
#, c-format
msgid "'%s' is not a commit"
msgstr ""
-#: builtin/merge.c:1055
+#: builtin/merge.c:1057
msgid "No current branch."
msgstr ""
-#: builtin/merge.c:1057
+#: builtin/merge.c:1059
msgid "No remote for the current branch."
msgstr ""
-#: builtin/merge.c:1059
+#: builtin/merge.c:1061
msgid "No default upstream defined for the current branch."
msgstr ""
-#: builtin/merge.c:1064
+#: builtin/merge.c:1066
#, c-format
msgid "No remote tracking branch for %s from %s"
msgstr ""
-#: builtin/merge.c:1186
+#: builtin/merge.c:1188
msgid "There is no merge to abort (MERGE_HEAD missing)."
msgstr ""
-#: builtin/merge.c:1202 git-pull.sh:31
+#: builtin/merge.c:1204 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:1205 git-pull.sh:34
+#: builtin/merge.c:1207 git-pull.sh:34
msgid "You have not concluded your merge (MERGE_HEAD exists)."
msgstr ""
-#: builtin/merge.c:1209
+#: builtin/merge.c:1211
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:1212
+#: builtin/merge.c:1214
msgid "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists)."
msgstr ""
-#: builtin/merge.c:1221
+#: builtin/merge.c:1223
msgid "You cannot combine --squash with --no-ff."
msgstr ""
-#: builtin/merge.c:1226
+#: builtin/merge.c:1228
msgid "You cannot combine --no-ff with --ff-only."
msgstr ""
-#: builtin/merge.c:1233
+#: builtin/merge.c:1235
msgid "No commit specified and merge.defaultToUpstream not set."
msgstr ""
-#: builtin/merge.c:1264
+#: builtin/merge.c:1266
msgid "Can merge only exactly one commit into empty head"
msgstr ""
-#: builtin/merge.c:1267
+#: builtin/merge.c:1269
msgid "Squash commit into empty head not supported yet"
msgstr ""
-#: builtin/merge.c:1269
+#: builtin/merge.c:1271
msgid "Non-fast-forward commit does not make sense into an empty head"
msgstr ""
-#: builtin/merge.c:1273 builtin/merge.c:1317
+#: builtin/merge.c:1275 builtin/merge.c:1319
#, c-format
msgid "%s - not something we can merge"
msgstr ""
-#: builtin/merge.c:1383
+#: builtin/merge.c:1382
#, c-format
msgid "Updating %s..%s\n"
msgstr ""
-#: builtin/merge.c:1421
+#: builtin/merge.c:1420
#, c-format
msgid "Trying really trivial in-index merge...\n"
msgstr ""
-#: builtin/merge.c:1428
+#: builtin/merge.c:1427
#, c-format
msgid "Nope.\n"
msgstr ""
-#: builtin/merge.c:1460
+#: builtin/merge.c:1459
msgid "Not possible to fast-forward, aborting."
msgstr ""
-#: builtin/merge.c:1483 builtin/merge.c:1560
+#: builtin/merge.c:1482 builtin/merge.c:1559
#, c-format
msgid "Rewinding the tree to pristine...\n"
msgstr ""
-#: builtin/merge.c:1487
+#: builtin/merge.c:1486
#, c-format
msgid "Trying merge strategy %s...\n"
msgstr ""
-#: builtin/merge.c:1551
+#: builtin/merge.c:1550
#, c-format
msgid "No merge strategy handled the merge.\n"
msgstr ""
-#: builtin/merge.c:1553
+#: builtin/merge.c:1552
#, c-format
msgid "Merge with strategy %s failed.\n"
msgstr ""
-#: builtin/merge.c:1562
+#: builtin/merge.c:1561
#, c-format
msgid "Using the %s to prepare resolving by hand.\n"
msgstr ""
-#: builtin/merge.c:1573
+#: builtin/merge.c:1572
#, c-format
msgid "Automatic merge went well; stopped before committing as requested\n"
msgstr ""
msgid "--delete only accepts plain target ref names"
msgstr ""
-#: builtin/push.c:73
+#: builtin/push.c:83
#, c-format
msgid ""
"You are not currently on a branch.\n"
" git push %s HEAD:<name-of-remote-branch>\n"
msgstr ""
-#: builtin/push.c:80
+#: builtin/push.c:90
#, c-format
msgid ""
"The current branch %s has no upstream branch.\n"
" git push --set-upstream %s %s\n"
msgstr ""
-#: builtin/push.c:88
+#: builtin/push.c:98
#, c-format
msgid "The current branch %s has multiple upstream branches, refusing to push."
msgstr ""
-#: builtin/push.c:111
+#: builtin/push.c:101
+#, 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:127
msgid ""
"You didn't specify any refspecs to push, and push.default is \"nothing\"."
msgstr ""
-#: builtin/push.c:131
+#: builtin/push.c:147
#, c-format
msgid "Pushing to %s\n"
msgstr ""
-#: builtin/push.c:135
+#: builtin/push.c:151
#, c-format
msgid "failed to push some refs to '%s'"
msgstr ""
-#: builtin/push.c:143
+#: builtin/push.c:159
#, c-format
msgid ""
"To prevent you from losing history, non-fast-forward updates were rejected\n"
"'Note about fast-forwards' section of 'git push --help' for details.\n"
msgstr ""
-#: builtin/push.c:160
+#: builtin/push.c:176
#, c-format
msgid "bad repository '%s'"
msgstr ""
-#: builtin/push.c:161
+#: builtin/push.c:177
msgid ""
"No configured push destination.\n"
"Either specify the URL from the command-line or configure a remote "
" git push <name>\n"
msgstr ""
-#: builtin/push.c:176
+#: builtin/push.c:192
msgid "--all and --tags are incompatible"
msgstr ""
-#: builtin/push.c:177
+#: builtin/push.c:193
msgid "--all can't be combined with refspecs"
msgstr ""
-#: builtin/push.c:182
+#: builtin/push.c:198
msgid "--mirror and --tags are incompatible"
msgstr ""
-#: builtin/push.c:183
+#: builtin/push.c:199
msgid "--mirror can't be combined with refspecs"
msgstr ""
-#: builtin/push.c:188
+#: builtin/push.c:204
msgid "--all and --mirror are incompatible"
msgstr ""
-#: builtin/push.c:274
+#: builtin/push.c:284
msgid "--delete is incompatible with --all, --mirror and --tags"
msgstr ""
-#: builtin/push.c:276
+#: builtin/push.c:286
msgid "--delete doesn't make sense without any refs"
msgstr ""
msgid "You need to set your committer info first"
msgstr ""
-#: git-am.sh:135
+#: git-am.sh:136
msgid "Repository lacks necessary blobs to fall back on 3-way merge."
msgstr ""
-#: git-am.sh:144
+#: git-am.sh:147
msgid ""
"Did you hand edit your patch?\n"
"It does not apply to blobs recorded in its index."
msgstr ""
-#: git-am.sh:153
+#: git-am.sh:156
msgid "Falling back to patching base and 3-way merge..."
msgstr ""
-#: git-am.sh:265
+#: git-am.sh:268
msgid "Only one StGIT patch series can be applied at once"
msgstr ""
-#: git-am.sh:352
+#: git-am.sh:355
#, sh-format
msgid "Patch format $patch_format is not supported."
msgstr ""
-#: git-am.sh:354
+#: git-am.sh:357
msgid "Patch format detection failed."
msgstr ""
-#: git-am.sh:406
+#: git-am.sh:411
msgid "-d option is no longer supported. Do not use."
msgstr ""
-#: git-am.sh:469
+#: git-am.sh:474
#, sh-format
msgid "previous rebase directory $dotest still exists but mbox given."
msgstr ""
-#: git-am.sh:474
+#: git-am.sh:479
msgid "Please make up your mind. --skip or --abort?"
msgstr ""
-#: git-am.sh:501
+#: git-am.sh:506
msgid "Resolve operation not in progress, we are not resuming."
msgstr ""
-#: git-am.sh:567
+#: git-am.sh:572
#, sh-format
msgid "Dirty index: cannot apply patches (dirty: $files)"
msgstr ""
-#: git-am.sh:743
+#: git-am.sh:748
msgid "cannot be interactive without stdin connected to a terminal."
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:754
+#: git-am.sh:759
msgid "Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all "
msgstr ""
-#: git-am.sh:790
+#: git-am.sh:795
#, sh-format
msgid "Applying: $FIRSTLINE"
msgstr ""
-#: git-am.sh:835
+#: git-am.sh:840
msgid "No changes -- Patch already applied."
msgstr ""
-#: git-am.sh:861
+#: git-am.sh:866
msgid "applying to an empty history"
msgstr ""
msgid "No submodule mapping found in .gitmodules for path '$path'"
msgstr ""
-#: git-submodule.sh:173
+#: git-submodule.sh:149
#, sh-format
msgid "Clone of '$url' into submodule path '$path' failed"
msgstr ""
+#: git-submodule.sh:159
+#, sh-format
+msgid "Gitdir '$a' is part of the submodule path '$b' or vice versa"
+msgstr ""
+
#: git-submodule.sh:247
#, sh-format
msgid "repo URL: '$repo' must be absolute or begin with ./|../"