1 # SOME DESCRIPTIVE TITLE.
2 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
3 # This file is distributed under the same license as the PACKAGE package.
4 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
9 "Project-Id-Version: PACKAGE VERSION\n"
10 "Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n"
11 "POT-Creation-Date: 2012-05-15 06:31+0800\n"
12 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
13 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
14 "Language-Team: LANGUAGE <LL@li.org>\n"
17 "Content-Type: text/plain; charset=CHARSET\n"
18 "Content-Transfer-Encoding: 8bit\n"
19 "Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
27 #. * Message used both when 'git commit' fails and when
28 #. * other commands doing a merge do.
32 "Fix them up in the work tree,\n"
33 "and then use 'git add/rm <file>' as\n"
34 "appropriate to mark resolution and make a commit,\n"
35 "or use 'git commit -a'."
40 msgid "could not parse %s"
45 msgid "%s %s is not a commit!"
48 #: compat/obstack.c:406 compat/obstack.c:408
49 msgid "memory exhausted"
53 msgid "Could not run 'git rev-list'"
58 msgid "failed write to rev-list: %s"
63 msgid "failed to close rev-list's stdin: %s"
68 msgid " Failed to parse dirstat cut-off percentage '%.*s'\n"
73 msgid " Unknown dirstat parameter '%.*s'\n"
79 "Found errors in 'diff.dirstat' config variable:\n"
84 msgid " 0 files changed\n"
89 msgid " %d file changed"
90 msgid_plural " %d files changed"
96 msgid ", %d insertion(+)"
97 msgid_plural ", %d insertions(+)"
103 msgid ", %d deletion(-)"
104 msgid_plural ", %d deletions(-)"
111 "Failed to parse --dirstat/-X option parameter:\n"
115 #: gpg-interface.c:59
116 msgid "could not run gpg."
119 #: gpg-interface.c:71
120 msgid "gpg did not accept the data"
123 #: gpg-interface.c:82
124 msgid "gpg failed to sign the data"
129 msgid "'%s': unable to read %s"
139 msgid "'%s': short read %s"
145 "'%s' appears to be a git command, but we were not\n"
146 "able to execute it. Maybe git-%s is broken?"
151 msgid "Your branch is ahead of '%s' by %d commit.\n"
152 msgid_plural "Your branch is ahead of '%s' by %d commits.\n"
158 msgid "Your branch is behind '%s' by %d commit, and can be fast-forwarded.\n"
160 "Your branch is behind '%s' by %d commits, and can be fast-forwarded.\n"
167 "Your branch and '%s' have diverged,\n"
168 "and have %d and %d different commit each, respectively.\n"
170 "Your branch and '%s' have diverged,\n"
171 "and have %d and %d different commits each, respectively.\n"
175 #: sequencer.c:120 builtin/merge.c:865 builtin/merge.c:978
176 #: builtin/merge.c:1088 builtin/merge.c:1098
178 msgid "Could not open '%s' for writing"
181 #: sequencer.c:122 builtin/merge.c:333 builtin/merge.c:868
182 #: builtin/merge.c:1090 builtin/merge.c:1103
184 msgid "Could not write to '%s'"
189 "after resolving the conflicts, mark the corrected paths\n"
190 "with 'git add <paths>' or 'git rm <paths>'"
195 "after resolving the conflicts, mark the corrected paths\n"
196 "with 'git add <paths>' or 'git rm <paths>'\n"
197 "and commit the result with 'git commit'"
200 #: sequencer.c:159 sequencer.c:685 sequencer.c:768
202 msgid "Could not write to %s"
207 msgid "Error wrapping up %s"
211 msgid "Your local changes would be overwritten by cherry-pick."
215 msgid "Your local changes would be overwritten by revert."
219 msgid "Commit your changes or stash them to proceed."
222 #. TRANSLATORS: %s will be "revert" or "cherry-pick"
225 msgid "%s: Unable to write new index file"
229 msgid "Your index file is unmerged."
233 msgid "You do not have a valid HEAD"
238 msgid "Commit %s is a merge but no -m option was given."
243 msgid "Commit %s does not have parent %d"
248 msgid "Mainline was specified but commit %s is not a merge."
251 #. TRANSLATORS: The first %s will be "revert" or
252 #. "cherry-pick", the second %s a SHA1
255 msgid "%s: cannot parse parent commit %s"
260 msgid "Cannot get commit message for %s"
265 msgid "could not revert %s... %s"
270 msgid "could not apply %s... %s"
273 #: sequencer.c:450 sequencer.c:909 builtin/log.c:288 builtin/log.c:713
274 #: builtin/log.c:1329 builtin/log.c:1548 builtin/merge.c:347
275 #: builtin/shortlog.c:181
276 msgid "revision walk setup failed"
280 msgid "empty commit set passed"
285 msgid "git %s: failed to read the index"
290 msgid "git %s: failed to refresh the index"
295 msgid "Cannot %s during a %s"
300 msgid "Could not parse line %d."
304 msgid "No commits parsed."
309 msgid "Could not open %s"
314 msgid "Could not read %s."
319 msgid "Unusable instruction sheet: %s"
324 msgid "Invalid key: %s"
329 msgid "Invalid value for %s: %s"
334 msgid "Malformed options sheet: %s"
338 msgid "a cherry-pick or revert is already in progress"
342 msgid "try \"git cherry-pick (--continue | --quit | --abort)\""
347 msgid "Could not create sequencer directory %s"
350 #: sequencer.c:687 sequencer.c:772
352 msgid "Error wrapping up %s."
355 #: sequencer.c:706 sequencer.c:840
356 msgid "no cherry-pick or revert in progress"
360 msgid "cannot resolve HEAD"
364 msgid "cannot abort from a branch yet to be born"
369 msgid "cannot open %s: %s"
374 msgid "cannot read %s: %s"
378 msgid "unexpected end of file"
383 msgid "stored pre-cherry-pick HEAD file '%s' is corrupt"
388 msgid "Could not format %s."
392 msgid "Can't revert as initial commit"
396 msgid "Can't cherry-pick into empty head"
400 msgid "Unmerged paths:"
403 #: wt-status.c:140 wt-status.c:157
405 msgid " (use \"git reset %s <file>...\" to unstage)"
408 #: wt-status.c:142 wt-status.c:159
409 msgid " (use \"git rm --cached <file>...\" to unstage)"
413 msgid " (use \"git add/rm <file>...\" as appropriate to mark resolution)"
417 msgid "Changes to be committed:"
421 msgid "Changes not staged for commit:"
425 msgid " (use \"git add <file>...\" to update what will be committed)"
429 msgid " (use \"git add/rm <file>...\" to update what will be committed)"
434 " (use \"git checkout -- <file>...\" to discard changes in working directory)"
438 msgid " (commit or discard the untracked or modified content in submodules)"
448 msgid " (use \"git %s <file>...\" to include in what will be committed)"
456 msgid "both deleted:"
464 msgid "deleted by them:"
468 msgid "added by them:"
472 msgid "deleted by us:"
480 msgid "both modified:"
484 msgid "new commits, "
488 msgid "modified content, "
492 msgid "untracked content, "
502 msgid "copied: %s -> %s"
517 msgid "renamed: %s -> %s"
522 msgid "typechange: %s"
537 msgid "bug: unhandled diff status %c"
545 msgid "Not currently on any branch."
549 msgid "Initial commit"
562 msgid "Untracked files not listed%s"
566 msgid " (use -u option to show untracked files)"
575 msgid "no changes added to commit%s\n"
579 msgid " (use \"git add\" and/or \"git commit -a\")"
584 msgid "nothing added to commit but untracked files present%s\n"
588 msgid " (use \"git add\" to track)"
591 #: wt-status.c:769 wt-status.c:772 wt-status.c:775
593 msgid "nothing to commit%s\n"
597 msgid " (create/copy files and use \"git add\" to track)"
601 msgid " (use -u to show untracked files)"
605 msgid " (working directory clean)"
609 msgid "HEAD (no branch)"
613 msgid "Initial commit on "
620 #: wt-status.c:908 wt-status.c:911
630 msgid "unexpected diff status %c"
633 #: builtin/add.c:67 builtin/commit.c:298
634 msgid "updating files failed"
639 msgid "remove '%s'\n"
644 msgid "Path '%s' is in submodule '%.*s'"
648 msgid "Unstaged changes after refreshing the index:"
651 #: builtin/add.c:195 builtin/add.c:456 builtin/rm.c:186
653 msgid "pathspec '%s' did not match any files"
658 msgid "'%s' is beyond a symbolic link"
662 msgid "Could not read the index"
667 msgid "Could not open '%s' for writing."
671 msgid "Could not write patch"
676 msgid "Could not stat '%s'"
680 msgid "Empty patch. Aborted."
685 msgid "Could not apply '%s'"
689 msgid "The following paths are ignored by one of your .gitignore files:\n"
694 msgid "Use -f if you really want to add them.\n"
698 msgid "no files added"
702 msgid "adding files failed"
706 msgid "-A and -u are mutually incompatible"
710 msgid "Option --ignore-missing can only be used together with --dry-run"
715 msgid "Nothing specified, nothing added.\n"
720 msgid "Maybe you wanted to say 'git add .'?\n"
723 #: builtin/add.c:420 builtin/clean.c:95 builtin/commit.c:358 builtin/mv.c:82
725 msgid "index file corrupt"
728 #: builtin/add.c:476 builtin/mv.c:229 builtin/rm.c:260
729 msgid "Unable to write new index file"
732 #: builtin/archive.c:17
734 msgid "could not create archive file '%s'"
737 #: builtin/archive.c:20
738 msgid "could not redirect output"
741 #: builtin/archive.c:37
742 msgid "git archive: Remote with no URL"
745 #: builtin/archive.c:58
746 msgid "git archive: expected ACK/NAK, got EOF"
749 #: builtin/archive.c:63
751 msgid "git archive: NACK %s"
754 #: builtin/archive.c:65
756 msgid "remote error: %s"
759 #: builtin/archive.c:66
760 msgid "git archive: protocol error"
763 #: builtin/archive.c:71
764 msgid "git archive: expected a flush"
767 #: builtin/branch.c:137
770 "deleting branch '%s' that has been merged to\n"
771 " '%s', but not yet merged to HEAD."
774 #: builtin/branch.c:141
777 "not deleting branch '%s' that is not yet merged to\n"
778 " '%s', even though it is merged to HEAD."
781 #. TRANSLATORS: This is "remote " in "remote branch '%s' not found"
782 #: builtin/branch.c:163
786 #: builtin/branch.c:171
787 msgid "cannot use -a with -d"
790 #: builtin/branch.c:177
791 msgid "Couldn't look up commit object for HEAD"
794 #: builtin/branch.c:182
796 msgid "Cannot delete the branch '%s' which you are currently on."
799 #: builtin/branch.c:192
801 msgid "%sbranch '%s' not found."
804 #: builtin/branch.c:200
806 msgid "Couldn't look up commit object for '%s'"
809 #: builtin/branch.c:206
812 "The branch '%s' is not fully merged.\n"
813 "If you are sure you want to delete it, run 'git branch -D %s'."
816 #: builtin/branch.c:214
818 msgid "Error deleting %sbranch '%s'"
821 #: builtin/branch.c:219
823 msgid "Deleted %sbranch %s (was %s).\n"
826 #: builtin/branch.c:224
827 msgid "Update of config-file failed"
830 #: builtin/branch.c:322
832 msgid "branch '%s' does not point at a commit"
835 #: builtin/branch.c:394
840 #: builtin/branch.c:396
845 #: builtin/branch.c:398
847 msgid "ahead %d, behind %d] "
850 #: builtin/branch.c:501
854 #: builtin/branch.c:566
855 msgid "some refs could not be read"
858 #: builtin/branch.c:579
859 msgid "cannot rename the current branch while not on any."
862 #: builtin/branch.c:589
864 msgid "Invalid branch name: '%s'"
867 #: builtin/branch.c:604
868 msgid "Branch rename failed"
871 #: builtin/branch.c:608
873 msgid "Renamed a misnamed branch '%s' away"
876 #: builtin/branch.c:612
878 msgid "Branch renamed to %s, but HEAD is not updated!"
881 #: builtin/branch.c:619
882 msgid "Branch is renamed, but update of config-file failed"
885 #: builtin/branch.c:634
887 msgid "malformed object name %s"
890 #: builtin/branch.c:658
892 msgid "could not write branch description template: %s\n"
895 #: builtin/branch.c:746
896 msgid "Failed to resolve HEAD as a valid ref."
899 #: builtin/branch.c:751 builtin/clone.c:558
900 msgid "HEAD not found below refs/heads!"
903 #: builtin/branch.c:809
904 msgid "-a and -r options to 'git branch' do not make sense with a branch name"
907 #: builtin/bundle.c:47
912 #: builtin/bundle.c:56
913 msgid "Need a repository to create a bundle."
916 #: builtin/bundle.c:60
917 msgid "Need a repository to unbundle."
920 #: builtin/checkout.c:113 builtin/checkout.c:146
922 msgid "path '%s' does not have our version"
925 #: builtin/checkout.c:115 builtin/checkout.c:148
927 msgid "path '%s' does not have their version"
930 #: builtin/checkout.c:131
932 msgid "path '%s' does not have all necessary versions"
935 #: builtin/checkout.c:175
937 msgid "path '%s' does not have necessary versions"
940 #: builtin/checkout.c:192
942 msgid "path '%s': cannot merge"
945 #: builtin/checkout.c:209
947 msgid "Unable to add merge result for '%s'"
950 #: builtin/checkout.c:212 builtin/reset.c:158
952 msgid "make_cache_entry failed for path '%s'"
955 #: builtin/checkout.c:234 builtin/checkout.c:392
956 msgid "corrupt index file"
959 #: builtin/checkout.c:264 builtin/checkout.c:271
961 msgid "path '%s' is unmerged"
964 #: builtin/checkout.c:302 builtin/checkout.c:498 builtin/clone.c:583
965 #: builtin/merge.c:812
966 msgid "unable to write new index file"
969 #: builtin/checkout.c:319 builtin/diff.c:302 builtin/merge.c:408
970 msgid "diff_setup_done failed"
973 #: builtin/checkout.c:414
974 msgid "you need to resolve your current index first"
977 #: builtin/checkout.c:533
979 msgid "Can not do reflog for '%s'\n"
982 #: builtin/checkout.c:565
983 msgid "HEAD is now at"
986 #: builtin/checkout.c:572
988 msgid "Reset branch '%s'\n"
991 #: builtin/checkout.c:575
993 msgid "Already on '%s'\n"
996 #: builtin/checkout.c:579
998 msgid "Switched to and reset branch '%s'\n"
1001 #: builtin/checkout.c:581
1003 msgid "Switched to a new branch '%s'\n"
1006 #: builtin/checkout.c:583
1008 msgid "Switched to branch '%s'\n"
1011 #: builtin/checkout.c:639
1013 msgid " ... and %d more.\n"
1016 #. The singular version
1017 #: builtin/checkout.c:645
1020 "Warning: you are leaving %d commit behind, not connected to\n"
1021 "any of your branches:\n"
1025 "Warning: you are leaving %d commits behind, not connected to\n"
1026 "any of your branches:\n"
1032 #: builtin/checkout.c:663
1035 "If you want to keep them by creating a new branch, this may be a good time\n"
1038 " git branch new_branch_name %s\n"
1042 #: builtin/checkout.c:693
1043 msgid "internal error in revision walk"
1046 #: builtin/checkout.c:697
1047 msgid "Previous HEAD position was"
1050 #: builtin/checkout.c:723
1051 msgid "You are on a branch yet to be born"
1055 #: builtin/checkout.c:854
1057 msgid "invalid reference: %s"
1060 #. case (1): want a tree
1061 #: builtin/checkout.c:893
1063 msgid "reference is not a tree: %s"
1066 #: builtin/checkout.c:973
1067 msgid "-B cannot be used with -b"
1070 #: builtin/checkout.c:982
1071 msgid "--patch is incompatible with all other options"
1074 #: builtin/checkout.c:985
1075 msgid "--detach cannot be used with -b/-B/--orphan"
1078 #: builtin/checkout.c:987
1079 msgid "--detach cannot be used with -t"
1082 #: builtin/checkout.c:993
1083 msgid "--track needs a branch name"
1086 #: builtin/checkout.c:1000
1087 msgid "Missing branch name; try -b"
1090 #: builtin/checkout.c:1006
1091 msgid "--orphan and -b|-B are mutually exclusive"
1094 #: builtin/checkout.c:1008
1095 msgid "--orphan cannot be used with -t"
1098 #: builtin/checkout.c:1018
1099 msgid "git checkout: -f and -m are incompatible"
1102 #: builtin/checkout.c:1052
1103 msgid "invalid path specification"
1106 #: builtin/checkout.c:1060
1109 "git checkout: updating paths is incompatible with switching branches.\n"
1110 "Did you intend to checkout '%s' which can not be resolved as commit?"
1113 #: builtin/checkout.c:1062
1114 msgid "git checkout: updating paths is incompatible with switching branches."
1117 #: builtin/checkout.c:1067
1118 msgid "git checkout: --detach does not take a path argument"
1121 #: builtin/checkout.c:1070
1123 "git checkout: --ours/--theirs, --force and --merge are incompatible when\n"
1124 "checking out of the index."
1127 #: builtin/checkout.c:1089
1128 msgid "Cannot switch branch to a non-commit."
1131 #: builtin/checkout.c:1092
1132 msgid "--ours/--theirs is incompatible with switching branches."
1135 #: builtin/clean.c:78
1136 msgid "-x and -X cannot be used together"
1139 #: builtin/clean.c:82
1141 "clean.requireForce set to true and neither -n nor -f given; refusing to clean"
1144 #: builtin/clean.c:85
1146 "clean.requireForce defaults to true and neither -n nor -f given; refusing to "
1150 #: builtin/clean.c:155 builtin/clean.c:176
1152 msgid "Would remove %s\n"
1155 #: builtin/clean.c:159 builtin/clean.c:179
1157 msgid "Removing %s\n"
1160 #: builtin/clean.c:162 builtin/clean.c:182
1162 msgid "failed to remove %s"
1165 #: builtin/clean.c:166
1167 msgid "Would not remove %s\n"
1170 #: builtin/clean.c:168
1172 msgid "Not removing %s\n"
1175 #: builtin/clone.c:243
1177 msgid "reference repository '%s' is not a local directory."
1180 #: builtin/clone.c:302
1182 msgid "failed to open '%s'"
1185 #: builtin/clone.c:306
1187 msgid "failed to create directory '%s'"
1190 #: builtin/clone.c:308 builtin/diff.c:75
1192 msgid "failed to stat '%s'"
1195 #: builtin/clone.c:310
1197 msgid "%s exists and is not a directory"
1200 #: builtin/clone.c:324
1202 msgid "failed to stat %s\n"
1205 #: builtin/clone.c:341
1207 msgid "failed to unlink '%s'"
1210 #: builtin/clone.c:346
1212 msgid "failed to create link '%s'"
1215 #: builtin/clone.c:350
1217 msgid "failed to copy file to '%s'"
1220 #: builtin/clone.c:373
1225 #: builtin/clone.c:440
1227 msgid "Could not find remote branch %s to clone."
1230 #: builtin/clone.c:549
1231 msgid "remote HEAD refers to nonexistent ref, unable to checkout.\n"
1234 #: builtin/clone.c:639
1235 msgid "Too many arguments."
1238 #: builtin/clone.c:643
1239 msgid "You must specify a repository to clone."
1242 #: builtin/clone.c:654
1244 msgid "--bare and --origin %s options are incompatible."
1247 #: builtin/clone.c:668
1249 msgid "repository '%s' does not exist"
1252 #: builtin/clone.c:673
1253 msgid "--depth is ignored in local clones; use file:// instead."
1256 #: builtin/clone.c:683
1258 msgid "destination path '%s' already exists and is not an empty directory."
1261 #: builtin/clone.c:693
1263 msgid "working tree '%s' already exists."
1266 #: builtin/clone.c:706 builtin/clone.c:720
1268 msgid "could not create leading directories of '%s'"
1271 #: builtin/clone.c:709
1273 msgid "could not create work tree dir '%s'."
1276 #: builtin/clone.c:728
1278 msgid "Cloning into bare repository '%s'...\n"
1281 #: builtin/clone.c:730
1283 msgid "Cloning into '%s'...\n"
1286 #: builtin/clone.c:786
1288 msgid "Don't know how to clone %s"
1291 #: builtin/clone.c:835
1293 msgid "Remote branch %s not found in upstream %s"
1296 #: builtin/clone.c:842
1297 msgid "You appear to have cloned an empty repository."
1300 #: builtin/commit.c:42
1302 "Your name and email address were configured automatically based\n"
1303 "on your username and hostname. Please check that they are accurate.\n"
1304 "You can suppress this message by setting them explicitly:\n"
1306 " git config --global user.name \"Your Name\"\n"
1307 " git config --global user.email you@example.com\n"
1309 "After doing this, you may fix the identity used for this commit with:\n"
1311 " git commit --amend --reset-author\n"
1314 #: builtin/commit.c:54
1316 "You asked to amend the most recent commit, but doing so would make\n"
1317 "it empty. You can repeat your command with --allow-empty, or you can\n"
1318 "remove the commit entirely with \"git reset HEAD^\".\n"
1321 #: builtin/commit.c:59
1323 "The previous cherry-pick is now empty, possibly due to conflict resolution.\n"
1324 "If you wish to commit it anyway, use:\n"
1326 " git commit --allow-empty\n"
1328 "Otherwise, please use 'git reset'\n"
1331 #: builtin/commit.c:205 builtin/reset.c:33
1335 #: builtin/commit.c:208
1339 #: builtin/commit.c:325
1340 msgid "failed to unpack HEAD tree object"
1343 #: builtin/commit.c:367
1344 msgid "unable to create temporary index"
1347 #: builtin/commit.c:373
1348 msgid "interactive add failed"
1351 #: builtin/commit.c:406 builtin/commit.c:427 builtin/commit.c:473
1352 msgid "unable to write new_index file"
1355 #: builtin/commit.c:457
1357 msgid "cannot do a partial commit during a %s."
1360 #: builtin/commit.c:466
1361 msgid "cannot read the index"
1364 #: builtin/commit.c:486
1365 msgid "unable to write temporary index file"
1368 #: builtin/commit.c:561 builtin/commit.c:567
1370 msgid "invalid commit: %s"
1373 #: builtin/commit.c:590
1374 msgid "malformed --author parameter"
1377 #: builtin/commit.c:651
1379 msgid "Malformed ident string: '%s'"
1382 #: builtin/commit.c:689 builtin/commit.c:722 builtin/commit.c:1033
1384 msgid "could not lookup commit %s"
1387 #: builtin/commit.c:701 builtin/shortlog.c:296
1389 msgid "(reading log message from standard input)\n"
1392 #: builtin/commit.c:703
1393 msgid "could not read log from standard input"
1396 #: builtin/commit.c:707
1398 msgid "could not read log file '%s'"
1401 #: builtin/commit.c:713
1402 msgid "commit has empty message"
1405 #: builtin/commit.c:729
1406 msgid "could not read MERGE_MSG"
1409 #: builtin/commit.c:733
1410 msgid "could not read SQUASH_MSG"
1413 #: builtin/commit.c:737
1415 msgid "could not read '%s'"
1418 #: builtin/commit.c:765
1420 msgid "could not open '%s'"
1423 #: builtin/commit.c:789
1424 msgid "could not write commit template"
1427 #: builtin/commit.c:799
1431 "It looks like you may be committing a %s.\n"
1432 "If this is not correct, please remove the file\n"
1437 #: builtin/commit.c:812
1438 msgid "Please enter the commit message for your changes."
1441 #: builtin/commit.c:815
1444 "with '#' will be ignored, and an empty message aborts the commit.\n"
1447 #: builtin/commit.c:820
1450 "with '#' will be kept; you may remove them yourself if you want to.\n"
1451 "An empty message aborts the commit.\n"
1454 #: builtin/commit.c:832
1456 msgid "%sAuthor: %s"
1459 #: builtin/commit.c:839
1461 msgid "%sCommitter: %s"
1464 #: builtin/commit.c:859
1465 msgid "Cannot read index"
1468 #: builtin/commit.c:896
1469 msgid "Error building trees"
1472 #: builtin/commit.c:911 builtin/tag.c:357
1474 msgid "Please supply the message using either -m or -F option.\n"
1477 #: builtin/commit.c:1008
1479 msgid "No existing author found with '%s'"
1482 #: builtin/commit.c:1023 builtin/commit.c:1217
1484 msgid "Invalid untracked files mode '%s'"
1487 #: builtin/commit.c:1063
1488 msgid "Using both --reset-author and --author does not make sense"
1491 #: builtin/commit.c:1074
1492 msgid "You have nothing to amend."
1495 #: builtin/commit.c:1076
1497 msgid "You are in the middle of a %s -- cannot amend."
1500 #: builtin/commit.c:1078
1501 msgid "Options --squash and --fixup cannot be used together"
1504 #: builtin/commit.c:1088
1505 msgid "Only one of -c/-C/-F/--fixup can be used."
1508 #: builtin/commit.c:1090
1509 msgid "Option -m cannot be combined with -c/-C/-F/--fixup."
1512 #: builtin/commit.c:1098
1513 msgid "--reset-author can be used only with -C, -c or --amend."
1516 #: builtin/commit.c:1115
1517 msgid "Only one of --include/--only/--all/--interactive/--patch can be used."
1520 #: builtin/commit.c:1117
1521 msgid "No paths with --include/--only does not make sense."
1524 #: builtin/commit.c:1119
1525 msgid "Clever... amending the last one with dirty index."
1528 #: builtin/commit.c:1121
1529 msgid "Explicit paths specified without -i nor -o; assuming --only paths..."
1532 #: builtin/commit.c:1131 builtin/tag.c:556
1534 msgid "Invalid cleanup mode %s"
1537 #: builtin/commit.c:1136
1538 msgid "Paths with -a does not make sense."
1541 #: builtin/commit.c:1315
1542 msgid "couldn't look up newly created commit"
1545 #: builtin/commit.c:1317
1546 msgid "could not parse newly created commit"
1549 #: builtin/commit.c:1358
1550 msgid "detached HEAD"
1553 #: builtin/commit.c:1360
1554 msgid " (root-commit)"
1557 #: builtin/commit.c:1450
1558 msgid "could not parse HEAD commit"
1561 #: builtin/commit.c:1487 builtin/merge.c:509
1563 msgid "could not open '%s' for reading"
1566 #: builtin/commit.c:1494
1568 msgid "Corrupt MERGE_HEAD file (%s)"
1571 #: builtin/commit.c:1501
1572 msgid "could not read MERGE_MODE"
1575 #: builtin/commit.c:1520
1577 msgid "could not read commit message: %s"
1580 #: builtin/commit.c:1534
1582 msgid "Aborting commit; you did not edit the message.\n"
1585 #: builtin/commit.c:1539
1587 msgid "Aborting commit due to empty commit message.\n"
1590 #: builtin/commit.c:1554 builtin/merge.c:936 builtin/merge.c:961
1591 msgid "failed to write commit object"
1594 #: builtin/commit.c:1575
1595 msgid "cannot lock HEAD ref"
1598 #: builtin/commit.c:1579
1599 msgid "cannot update HEAD ref"
1602 #: builtin/commit.c:1590
1604 "Repository has been updated, but unable to write\n"
1605 "new_index file. Check that disk is not full or quota is\n"
1606 "not exceeded, and then \"git reset HEAD\" to recover."
1609 #: builtin/describe.c:234
1611 msgid "annotated tag %s not available"
1614 #: builtin/describe.c:238
1616 msgid "annotated tag %s has no embedded name"
1619 #: builtin/describe.c:240
1621 msgid "tag '%s' is really '%s' here"
1624 #: builtin/describe.c:267
1626 msgid "Not a valid object name %s"
1629 #: builtin/describe.c:270
1631 msgid "%s is not a valid '%s' object"
1634 #: builtin/describe.c:287
1636 msgid "no tag exactly matches '%s'"
1639 #: builtin/describe.c:289
1641 msgid "searching to describe %s\n"
1644 #: builtin/describe.c:329
1646 msgid "finished search at %s\n"
1649 #: builtin/describe.c:353
1652 "No annotated tags can describe '%s'.\n"
1653 "However, there were unannotated tags: try --tags."
1656 #: builtin/describe.c:357
1659 "No tags can describe '%s'.\n"
1660 "Try --always, or create some tags."
1663 #: builtin/describe.c:378
1665 msgid "traversed %lu commits\n"
1668 #: builtin/describe.c:381
1671 "more than %i tags found; listed %i most recent\n"
1672 "gave up search at %s\n"
1675 #: builtin/describe.c:436
1676 msgid "--long is incompatible with --abbrev=0"
1679 #: builtin/describe.c:462
1680 msgid "No names found, cannot describe anything."
1683 #: builtin/describe.c:482
1684 msgid "--dirty is incompatible with committishes"
1687 #: builtin/diff.c:77
1689 msgid "'%s': not a regular file or symlink"
1692 #: builtin/diff.c:220
1694 msgid "invalid option: %s"
1697 #: builtin/diff.c:297
1698 msgid "Not a git repository"
1701 #: builtin/diff.c:347
1703 msgid "invalid object '%s' given."
1706 #: builtin/diff.c:352
1708 msgid "more than %d trees given: '%s'"
1711 #: builtin/diff.c:362
1713 msgid "more than two blobs given: '%s'"
1716 #: builtin/diff.c:370
1718 msgid "unhandled object '%s' given."
1721 #: builtin/fetch.c:200
1722 msgid "Couldn't find remote ref HEAD"
1725 #: builtin/fetch.c:253
1727 msgid "object %s not found"
1730 #: builtin/fetch.c:259
1731 msgid "[up to date]"
1734 #: builtin/fetch.c:273
1736 msgid "! %-*s %-*s -> %s (can't fetch in current branch)"
1739 #: builtin/fetch.c:274 builtin/fetch.c:360
1743 #: builtin/fetch.c:285
1744 msgid "[tag update]"
1747 #: builtin/fetch.c:287 builtin/fetch.c:322 builtin/fetch.c:340
1748 msgid " (unable to update local ref)"
1751 #: builtin/fetch.c:305
1755 #: builtin/fetch.c:308
1756 msgid "[new branch]"
1759 #: builtin/fetch.c:311
1763 #: builtin/fetch.c:356
1764 msgid "unable to update local ref"
1767 #: builtin/fetch.c:356
1768 msgid "forced update"
1771 #: builtin/fetch.c:362
1772 msgid "(non-fast-forward)"
1775 #: builtin/fetch.c:393 builtin/fetch.c:685
1777 msgid "cannot open %s: %s\n"
1780 #: builtin/fetch.c:402
1782 msgid "%s did not send all necessary objects\n"
1785 #: builtin/fetch.c:488
1790 #: builtin/fetch.c:499
1793 "some local refs could not be updated; try running\n"
1794 " 'git remote prune %s' to remove any old, conflicting branches"
1797 #: builtin/fetch.c:549
1799 msgid " (%s will become dangling)\n"
1802 #: builtin/fetch.c:550
1804 msgid " (%s has become dangling)\n"
1807 #: builtin/fetch.c:557
1811 #: builtin/fetch.c:558
1815 #: builtin/fetch.c:675
1817 msgid "Refusing to fetch into current branch %s of non-bare repository"
1820 #: builtin/fetch.c:709
1822 msgid "Don't know how to fetch from %s"
1825 #: builtin/fetch.c:786
1827 msgid "Option \"%s\" value \"%s\" is not valid for %s"
1830 #: builtin/fetch.c:789
1832 msgid "Option \"%s\" is ignored for %s\n"
1835 #: builtin/fetch.c:888
1837 msgid "Fetching %s\n"
1840 #: builtin/fetch.c:890
1842 msgid "Could not fetch %s"
1845 #: builtin/fetch.c:907
1847 "No remote repository specified. Please, specify either a URL or a\n"
1848 "remote name from which new revisions should be fetched."
1851 #: builtin/fetch.c:927
1852 msgid "You need to specify a tag name."
1855 #: builtin/fetch.c:979
1856 msgid "fetch --all does not take a repository argument"
1859 #: builtin/fetch.c:981
1860 msgid "fetch --all does not make sense with refspecs"
1863 #: builtin/fetch.c:992
1865 msgid "No such remote or remote group: %s"
1868 #: builtin/fetch.c:1000
1869 msgid "Fetching a group and specifying refspecs does not make sense"
1874 msgid "Invalid %s: '%s'"
1879 msgid "insanely long object directory %.*s"
1884 msgid "Auto packing the repository for optimum performance.\n"
1890 "Auto packing the repository for optimum performance. You may also\n"
1891 "run \"git gc\" manually. See \"git help gc\" for more information.\n"
1896 "There are too many unreachable loose objects; run 'git prune' to remove them."
1899 #: builtin/grep.c:216
1901 msgid "grep: failed to create thread: %s"
1904 #: builtin/grep.c:402
1906 msgid "Failed to chdir: %s"
1909 #: builtin/grep.c:478 builtin/grep.c:512
1911 msgid "unable to read tree (%s)"
1914 #: builtin/grep.c:526
1916 msgid "unable to grep from object of type %s"
1919 #: builtin/grep.c:584
1921 msgid "switch `%c' expects a numerical value"
1924 #: builtin/grep.c:601
1926 msgid "cannot open '%s'"
1929 #: builtin/grep.c:888
1930 msgid "no pattern given."
1933 #: builtin/grep.c:902
1935 msgid "bad object %s"
1938 #: builtin/grep.c:943
1939 msgid "--open-files-in-pager only works on the worktree"
1942 #: builtin/grep.c:966
1943 msgid "--cached or --untracked cannot be used with --no-index."
1946 #: builtin/grep.c:971
1947 msgid "--no-index or --untracked cannot be used with revs."
1950 #: builtin/grep.c:974
1951 msgid "--[no-]exclude-standard cannot be used for tracked contents."
1954 #: builtin/grep.c:982
1955 msgid "both --cached and trees are given."
1958 #: builtin/init-db.c:35
1960 msgid "Could not make %s writable by group"
1963 #: builtin/init-db.c:62
1965 msgid "insanely long template name %s"
1968 #: builtin/init-db.c:67
1970 msgid "cannot stat '%s'"
1973 #: builtin/init-db.c:73
1975 msgid "cannot stat template '%s'"
1978 #: builtin/init-db.c:80
1980 msgid "cannot opendir '%s'"
1983 #: builtin/init-db.c:97
1985 msgid "cannot readlink '%s'"
1988 #: builtin/init-db.c:99
1990 msgid "insanely long symlink %s"
1993 #: builtin/init-db.c:102
1995 msgid "cannot symlink '%s' '%s'"
1998 #: builtin/init-db.c:106
2000 msgid "cannot copy '%s' to '%s'"
2003 #: builtin/init-db.c:110
2005 msgid "ignoring template %s"
2008 #: builtin/init-db.c:133
2010 msgid "insanely long template path %s"
2013 #: builtin/init-db.c:141
2015 msgid "templates not found %s"
2018 #: builtin/init-db.c:154
2020 msgid "not copying templates of a wrong format version %d from '%s'"
2023 #: builtin/init-db.c:192
2025 msgid "insane git directory %s"
2028 #: builtin/init-db.c:322 builtin/init-db.c:325
2030 msgid "%s already exists"
2033 #: builtin/init-db.c:354
2035 msgid "unable to handle file type %d"
2038 #: builtin/init-db.c:357
2040 msgid "unable to move %s to %s"
2043 #: builtin/init-db.c:362
2045 msgid "Could not create git link %s"
2049 #. * TRANSLATORS: The first '%s' is either "Reinitialized
2050 #. * existing" or "Initialized empty", the second " shared" or
2051 #. * "", and the last '%s%s' is the verbatim directory name.
2053 #: builtin/init-db.c:419
2055 msgid "%s%s Git repository in %s%s\n"
2058 #: builtin/init-db.c:420
2059 msgid "Reinitialized existing"
2062 #: builtin/init-db.c:420
2063 msgid "Initialized empty"
2066 #: builtin/init-db.c:421
2070 #: builtin/init-db.c:440
2071 msgid "cannot tell cwd"
2074 #: builtin/init-db.c:521 builtin/init-db.c:528
2076 msgid "cannot mkdir %s"
2079 #: builtin/init-db.c:532
2081 msgid "cannot chdir to %s"
2084 #: builtin/init-db.c:554
2087 "%s (or --work-tree=<directory>) not allowed without specifying %s (or --git-"
2091 #: builtin/init-db.c:578
2092 msgid "Cannot access current working directory"
2095 #: builtin/init-db.c:585
2097 msgid "Cannot access work tree '%s'"
2100 #: builtin/log.c:187
2102 msgid "Final output: %d %s\n"
2105 #: builtin/log.c:395 builtin/log.c:483
2107 msgid "Could not read object %s"
2110 #: builtin/log.c:507
2112 msgid "Unknown type: %d"
2115 #: builtin/log.c:596
2116 msgid "format.headers without value"
2119 #: builtin/log.c:669
2120 msgid "name of output directory is too long"
2123 #: builtin/log.c:680
2125 msgid "Cannot open patch file %s"
2128 #: builtin/log.c:694
2129 msgid "Need exactly one range."
2132 #: builtin/log.c:702
2133 msgid "Not a range."
2136 #: builtin/log.c:739
2137 msgid "Could not extract email from committer identity."
2140 #: builtin/log.c:785
2141 msgid "Cover letter needs email format"
2144 #: builtin/log.c:879
2146 msgid "insane in-reply-to: %s"
2149 #: builtin/log.c:952
2150 msgid "Two output directories?"
2153 #: builtin/log.c:1173
2155 msgid "bogus committer info %s"
2158 #: builtin/log.c:1218
2159 msgid "-n and -k are mutually exclusive."
2162 #: builtin/log.c:1220
2163 msgid "--subject-prefix and -k are mutually exclusive."
2166 #: builtin/log.c:1225 builtin/shortlog.c:284
2168 msgid "unrecognized argument: %s"
2171 #: builtin/log.c:1228
2172 msgid "--name-only does not make sense"
2175 #: builtin/log.c:1230
2176 msgid "--name-status does not make sense"
2179 #: builtin/log.c:1232
2180 msgid "--check does not make sense"
2183 #: builtin/log.c:1255
2184 msgid "standard output, or directory, which one?"
2187 #: builtin/log.c:1257
2189 msgid "Could not create directory '%s'"
2192 #: builtin/log.c:1410
2193 msgid "Failed to create output files"
2196 #: builtin/log.c:1514
2199 "Could not find a tracked remote branch, please specify <upstream> manually.\n"
2202 #: builtin/log.c:1530 builtin/log.c:1532 builtin/log.c:1544
2204 msgid "Unknown commit %s"
2207 #: builtin/merge.c:90
2208 msgid "switch `m' requires a value"
2211 #: builtin/merge.c:127
2213 msgid "Could not find merge strategy '%s'.\n"
2216 #: builtin/merge.c:128
2218 msgid "Available strategies are:"
2221 #: builtin/merge.c:133
2223 msgid "Available custom strategies are:"
2226 #: builtin/merge.c:240
2227 msgid "could not run stash."
2230 #: builtin/merge.c:245
2231 msgid "stash failed"
2234 #: builtin/merge.c:250
2236 msgid "not a valid object: %s"
2239 #: builtin/merge.c:269 builtin/merge.c:286
2240 msgid "read-tree failed"
2243 #: builtin/merge.c:316
2244 msgid " (nothing to squash)"
2247 #: builtin/merge.c:329
2249 msgid "Squash commit -- not updating HEAD\n"
2252 #: builtin/merge.c:361
2253 msgid "Writing SQUASH_MSG"
2256 #: builtin/merge.c:363
2257 msgid "Finishing SQUASH_MSG"
2260 #: builtin/merge.c:386
2262 msgid "No merge message -- not updating HEAD\n"
2265 #: builtin/merge.c:437
2267 msgid "'%s' does not point to a commit"
2270 #: builtin/merge.c:536
2272 msgid "Bad branch.%s.mergeoptions string: %s"
2275 #: builtin/merge.c:629
2276 msgid "git write-tree failed to write a tree"
2279 #: builtin/merge.c:679
2280 msgid "failed to read the cache"
2283 #: builtin/merge.c:697
2284 msgid "Unable to write index."
2287 #: builtin/merge.c:710
2288 msgid "Not handling anything other than two heads merge."
2291 #: builtin/merge.c:724
2293 msgid "Unknown option for merge-recursive: -X%s"
2296 #: builtin/merge.c:738
2298 msgid "unable to write %s"
2301 #: builtin/merge.c:877
2303 msgid "Could not read from '%s'"
2306 #: builtin/merge.c:886
2308 msgid "Not committing merge; use 'git commit' to complete the merge.\n"
2311 #: builtin/merge.c:892
2313 "Please enter a commit message to explain why this merge is necessary,\n"
2314 "especially if it merges an updated upstream into a topic branch.\n"
2316 "Lines starting with '#' will be ignored, and an empty message aborts\n"
2320 #: builtin/merge.c:916
2321 msgid "Empty commit message."
2324 #: builtin/merge.c:928
2326 msgid "Wonderful.\n"
2329 #: builtin/merge.c:993
2331 msgid "Automatic merge failed; fix conflicts and then commit the result.\n"
2334 #: builtin/merge.c:1009
2336 msgid "'%s' is not a commit"
2339 #: builtin/merge.c:1050
2340 msgid "No current branch."
2343 #: builtin/merge.c:1052
2344 msgid "No remote for the current branch."
2347 #: builtin/merge.c:1054
2348 msgid "No default upstream defined for the current branch."
2351 #: builtin/merge.c:1059
2353 msgid "No remote tracking branch for %s from %s"
2356 #: builtin/merge.c:1146 builtin/merge.c:1303
2358 msgid "%s - not something we can merge"
2361 #: builtin/merge.c:1214
2362 msgid "There is no merge to abort (MERGE_HEAD missing)."
2365 #: builtin/merge.c:1230 git-pull.sh:31
2367 "You have not concluded your merge (MERGE_HEAD exists).\n"
2368 "Please, commit your changes before you can merge."
2371 #: builtin/merge.c:1233 git-pull.sh:34
2372 msgid "You have not concluded your merge (MERGE_HEAD exists)."
2375 #: builtin/merge.c:1237
2377 "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n"
2378 "Please, commit your changes before you can merge."
2381 #: builtin/merge.c:1240
2382 msgid "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists)."
2385 #: builtin/merge.c:1249
2386 msgid "You cannot combine --squash with --no-ff."
2389 #: builtin/merge.c:1254
2390 msgid "You cannot combine --no-ff with --ff-only."
2393 #: builtin/merge.c:1261
2394 msgid "No commit specified and merge.defaultToUpstream not set."
2397 #: builtin/merge.c:1293
2398 msgid "Can merge only exactly one commit into empty head"
2401 #: builtin/merge.c:1296
2402 msgid "Squash commit into empty head not supported yet"
2405 #: builtin/merge.c:1298
2406 msgid "Non-fast-forward commit does not make sense into an empty head"
2409 #: builtin/merge.c:1413
2411 msgid "Updating %s..%s\n"
2414 #: builtin/merge.c:1451
2416 msgid "Trying really trivial in-index merge...\n"
2419 #: builtin/merge.c:1458
2424 #: builtin/merge.c:1490
2425 msgid "Not possible to fast-forward, aborting."
2428 #: builtin/merge.c:1513 builtin/merge.c:1592
2430 msgid "Rewinding the tree to pristine...\n"
2433 #: builtin/merge.c:1517
2435 msgid "Trying merge strategy %s...\n"
2438 #: builtin/merge.c:1583
2440 msgid "No merge strategy handled the merge.\n"
2443 #: builtin/merge.c:1585
2445 msgid "Merge with strategy %s failed.\n"
2448 #: builtin/merge.c:1594
2450 msgid "Using the %s to prepare resolving by hand.\n"
2453 #: builtin/merge.c:1606
2455 msgid "Automatic merge went well; stopped before committing as requested\n"
2460 msgid "Checking rename of '%s' to '%s'\n"
2468 msgid "can not move directory into itself"
2472 msgid "cannot move directory over file"
2477 msgid "Huh? %.*s is in index?"
2481 msgid "source directory is empty"
2485 msgid "not under version control"
2489 msgid "destination exists"
2494 msgid "overwriting '%s'"
2498 msgid "Cannot overwrite"
2502 msgid "multiple sources for the same target"
2507 msgid "%s, source=%s, destination=%s"
2512 msgid "Renaming %s to %s\n"
2517 msgid "renaming '%s' failed"
2520 #: builtin/notes.c:139
2522 msgid "unable to start 'show' for object '%s'"
2525 #: builtin/notes.c:145
2526 msgid "can't fdopen 'show' output fd"
2529 #: builtin/notes.c:155
2531 msgid "failed to close pipe to 'show' for object '%s'"
2534 #: builtin/notes.c:158
2536 msgid "failed to finish 'show' for object '%s'"
2539 #: builtin/notes.c:175 builtin/tag.c:343
2541 msgid "could not create file '%s'"
2544 #: builtin/notes.c:189
2545 msgid "Please supply the note contents using either -m or -F option"
2548 #: builtin/notes.c:210 builtin/notes.c:973
2550 msgid "Removing note for object %s\n"
2553 #: builtin/notes.c:215
2554 msgid "unable to write note object"
2557 #: builtin/notes.c:217
2559 msgid "The note contents has been left in %s"
2562 #: builtin/notes.c:251 builtin/tag.c:521
2564 msgid "cannot read '%s'"
2567 #: builtin/notes.c:253 builtin/tag.c:524
2569 msgid "could not open or read '%s'"
2572 #: builtin/notes.c:272 builtin/notes.c:445 builtin/notes.c:447
2573 #: builtin/notes.c:507 builtin/notes.c:561 builtin/notes.c:644
2574 #: builtin/notes.c:649 builtin/notes.c:724 builtin/notes.c:766
2575 #: builtin/notes.c:968 builtin/reset.c:293 builtin/tag.c:537
2577 msgid "Failed to resolve '%s' as a valid ref."
2580 #: builtin/notes.c:275
2582 msgid "Failed to read object '%s'."
2585 #: builtin/notes.c:299
2586 msgid "Cannot commit uninitialized/unreferenced notes tree"
2589 #: builtin/notes.c:340
2591 msgid "Bad notes.rewriteMode value: '%s'"
2594 #: builtin/notes.c:350
2596 msgid "Refusing to rewrite notes in %s (outside of refs/notes/)"
2599 #. TRANSLATORS: The first %s is the name of the
2600 #. environment variable, the second %s is its value
2601 #: builtin/notes.c:377
2603 msgid "Bad %s value: '%s'"
2606 #: builtin/notes.c:441
2608 msgid "Malformed input line: '%s'."
2611 #: builtin/notes.c:456
2613 msgid "Failed to copy notes from '%s' to '%s'"
2616 #: builtin/notes.c:500 builtin/notes.c:554 builtin/notes.c:627
2617 #: builtin/notes.c:639 builtin/notes.c:712 builtin/notes.c:759
2618 #: builtin/notes.c:1033
2619 msgid "too many parameters"
2622 #: builtin/notes.c:513 builtin/notes.c:772
2624 msgid "No note found for object %s."
2627 #: builtin/notes.c:580
2630 "Cannot add notes. Found existing notes for object %s. Use '-f' to overwrite "
2634 #: builtin/notes.c:585 builtin/notes.c:662
2636 msgid "Overwriting existing notes for object %s\n"
2639 #: builtin/notes.c:635
2640 msgid "too few parameters"
2643 #: builtin/notes.c:656
2646 "Cannot copy notes. Found existing notes for object %s. Use '-f' to overwrite "
2650 #: builtin/notes.c:668
2652 msgid "Missing notes on source object %s. Cannot copy."
2655 #: builtin/notes.c:717
2658 "The -m/-F/-c/-C options have been deprecated for the 'edit' subcommand.\n"
2659 "Please use 'git notes add -f -m/-F/-c/-C' instead.\n"
2662 #: builtin/notes.c:971
2664 msgid "Object %s has no note\n"
2667 #: builtin/notes.c:1103
2669 msgid "Unknown subcommand: %s"
2672 #: builtin/pack-objects.c:2315
2674 msgid "unsupported index version %s"
2677 #: builtin/pack-objects.c:2319
2679 msgid "bad index version '%s'"
2682 #: builtin/pack-objects.c:2342
2684 msgid "option %s does not accept negative form"
2687 #: builtin/pack-objects.c:2346
2689 msgid "unable to parse value '%s' for option %s"
2692 #: builtin/push.c:45
2693 msgid "tag shorthand without <tag>"
2696 #: builtin/push.c:64
2697 msgid "--delete only accepts plain target ref names"
2700 #: builtin/push.c:84
2703 "You are not currently on a branch.\n"
2704 "To push the history leading to the current (detached HEAD)\n"
2707 " git push %s HEAD:<name-of-remote-branch>\n"
2710 #: builtin/push.c:91
2713 "The current branch %s has no upstream branch.\n"
2714 "To push the current branch and set the remote as upstream, use\n"
2716 " git push --set-upstream %s %s\n"
2719 #: builtin/push.c:99
2721 msgid "The current branch %s has multiple upstream branches, refusing to push."
2724 #: builtin/push.c:102
2727 "You are pushing to remote '%s', which is not the upstream of\n"
2728 "your current branch '%s', without telling me what to push\n"
2729 "to update which remote branch."
2732 #: builtin/push.c:131
2734 "You didn't specify any refspecs to push, and push.default is \"nothing\"."
2737 #: builtin/push.c:138
2739 "Updates were rejected because the tip of your current branch is behind\n"
2740 "its remote counterpart. Merge the remote changes (e.g. 'git pull')\n"
2741 "before pushing again.\n"
2742 "See the 'Note about fast-forwards' in 'git push --help' for details."
2745 #: builtin/push.c:144
2747 "Updates were rejected because a pushed branch tip is behind its remote\n"
2748 "counterpart. If you did not intend to push that branch, you may want to\n"
2749 "specify branches to push or set the 'push.default' configuration\n"
2750 "variable to 'current' or 'upstream' to push only the current branch."
2753 #: builtin/push.c:150
2755 "Updates were rejected because a pushed branch tip is behind its remote\n"
2756 "counterpart. Check out this branch and merge the remote changes\n"
2757 "(e.g. 'git pull') before pushing again.\n"
2758 "See the 'Note about fast-forwards' in 'git push --help' for details."
2761 #: builtin/push.c:190
2763 msgid "Pushing to %s\n"
2766 #: builtin/push.c:194
2768 msgid "failed to push some refs to '%s'"
2771 #: builtin/push.c:226
2773 msgid "bad repository '%s'"
2776 #: builtin/push.c:227
2778 "No configured push destination.\n"
2779 "Either specify the URL from the command-line or configure a remote "
2780 "repository using\n"
2782 " git remote add <name> <url>\n"
2784 "and then push using the remote name\n"
2786 " git push <name>\n"
2789 #: builtin/push.c:242
2790 msgid "--all and --tags are incompatible"
2793 #: builtin/push.c:243
2794 msgid "--all can't be combined with refspecs"
2797 #: builtin/push.c:248
2798 msgid "--mirror and --tags are incompatible"
2801 #: builtin/push.c:249
2802 msgid "--mirror can't be combined with refspecs"
2805 #: builtin/push.c:254
2806 msgid "--all and --mirror are incompatible"
2809 #: builtin/push.c:334
2810 msgid "--delete is incompatible with --all, --mirror and --tags"
2813 #: builtin/push.c:336
2814 msgid "--delete doesn't make sense without any refs"
2817 #: builtin/reset.c:33
2821 #: builtin/reset.c:33
2825 #: builtin/reset.c:33
2829 #: builtin/reset.c:33
2833 #: builtin/reset.c:77
2834 msgid "You do not have a valid HEAD."
2837 #: builtin/reset.c:79
2838 msgid "Failed to find tree of HEAD."
2841 #: builtin/reset.c:85
2843 msgid "Failed to find tree of %s."
2846 #: builtin/reset.c:96
2847 msgid "Could not write new index file."
2850 #: builtin/reset.c:106
2852 msgid "HEAD is now at %s"
2855 #: builtin/reset.c:130
2856 msgid "Could not read index"
2859 #: builtin/reset.c:133
2860 msgid "Unstaged changes after reset:"
2863 #: builtin/reset.c:223
2865 msgid "Cannot do a %s reset in the middle of a merge."
2868 #: builtin/reset.c:297
2870 msgid "Could not parse object '%s'."
2873 #: builtin/reset.c:302
2874 msgid "--patch is incompatible with --{hard,mixed,soft}"
2877 #: builtin/reset.c:311
2878 msgid "--mixed with paths is deprecated; use 'git reset -- <paths>' instead."
2881 #: builtin/reset.c:313
2883 msgid "Cannot do %s reset with paths."
2886 #: builtin/reset.c:325
2888 msgid "%s reset is not allowed in a bare repository"
2891 #: builtin/reset.c:341
2893 msgid "Could not reset index file to revision '%s'."
2896 #: builtin/revert.c:70 builtin/revert.c:92
2898 msgid "%s: %s cannot be used with %s"
2901 #: builtin/revert.c:127
2902 msgid "program error"
2905 #: builtin/revert.c:213
2906 msgid "revert failed"
2909 #: builtin/revert.c:228
2910 msgid "cherry-pick failed"
2916 "'%s' has staged content different from both the file and the HEAD\n"
2917 "(use -f to force removal)"
2923 "'%s' has changes staged in the index\n"
2924 "(use --cached to keep the file, or -f to force removal)"
2930 "'%s' has local modifications\n"
2931 "(use --cached to keep the file, or -f to force removal)"
2936 msgid "not removing '%s' recursively without -r"
2941 msgid "git rm: unable to remove %s"
2944 #: builtin/shortlog.c:157
2946 msgid "Missing author: %s"
2951 msgid "malformed object at '%s'"
2954 #: builtin/tag.c:205
2956 msgid "tag name too long: %.*s..."
2959 #: builtin/tag.c:210
2961 msgid "tag '%s' not found."
2964 #: builtin/tag.c:225
2966 msgid "Deleted tag '%s' (was %s)\n"
2969 #: builtin/tag.c:237
2971 msgid "could not verify the tag '%s'"
2974 #: builtin/tag.c:247
2978 "# Write a tag message\n"
2979 "# Lines starting with '#' will be ignored.\n"
2983 #: builtin/tag.c:254
2987 "# Write a tag message\n"
2988 "# Lines starting with '#' will be kept; you may remove them yourself if you "
2993 #: builtin/tag.c:294
2994 msgid "unable to sign the tag"
2997 #: builtin/tag.c:296
2998 msgid "unable to write tag file"
3001 #: builtin/tag.c:321
3002 msgid "bad object type."
3005 #: builtin/tag.c:334
3006 msgid "tag header too big."
3009 #: builtin/tag.c:366
3010 msgid "no tag message?"
3013 #: builtin/tag.c:372
3015 msgid "The tag message has been left in %s\n"
3018 #: builtin/tag.c:421
3019 msgid "switch 'points-at' requires an object"
3022 #: builtin/tag.c:423
3024 msgid "malformed object name '%s'"
3027 #: builtin/tag.c:502
3028 msgid "-n option is only allowed with -l."
3031 #: builtin/tag.c:504
3032 msgid "--contains option is only allowed with -l."
3035 #: builtin/tag.c:506
3036 msgid "--points-at option is only allowed with -l."
3039 #: builtin/tag.c:514
3040 msgid "only one -F or -m option is allowed."
3043 #: builtin/tag.c:534
3044 msgid "too many params"
3047 #: builtin/tag.c:540
3049 msgid "'%s' is not a valid tag name."
3052 #: builtin/tag.c:545
3054 msgid "tag '%s' already exists"
3057 #: builtin/tag.c:563
3059 msgid "%s: cannot lock the ref"
3062 #: builtin/tag.c:565
3064 msgid "%s: cannot update the ref"
3067 #: builtin/tag.c:567
3069 msgid "Updated tag '%s' (was %s)\n"
3073 msgid "You need to set your committer info first"
3077 msgid "Repository lacks necessary blobs to fall back on 3-way merge."
3082 "Did you hand edit your patch?\n"
3083 "It does not apply to blobs recorded in its index."
3087 msgid "Falling back to patching base and 3-way merge..."
3091 msgid "Only one StGIT patch series can be applied at once"
3096 msgid "Patch format $patch_format is not supported."
3100 msgid "Patch format detection failed."
3104 msgid "-d option is no longer supported. Do not use."
3109 msgid "previous rebase directory $dotest still exists but mbox given."
3113 msgid "Please make up your mind. --skip or --abort?"
3117 msgid "Resolve operation not in progress, we are not resuming."
3122 msgid "Dirty index: cannot apply patches (dirty: $files)"
3126 msgid "cannot be interactive without stdin connected to a terminal."
3129 #. TRANSLATORS: Make sure to include [y], [n], [e], [v] and [a]
3130 #. in your translation. The program will only accept English
3131 #. input at this point.
3133 msgid "Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all "
3138 msgid "Applying: $FIRSTLINE"
3142 msgid "No changes -- Patch already applied."
3146 msgid "applying to an empty history"
3149 #. TRANSLATORS: Make sure to include [Y] and [n] in your
3150 #. translation. The program will only accept English input
3153 msgid "Do you want me to do it for you [Y/n]? "
3158 msgid "unrecognised option: '$arg'"
3163 msgid "'$arg' does not appear to be a valid revision"
3166 #: git-bisect.sh:117
3167 msgid "Bad HEAD - I need a HEAD"
3170 #: git-bisect.sh:130
3173 "Checking out '$start_head' failed. Try 'git bisect reset <validbranch>'."
3176 #: git-bisect.sh:140
3177 msgid "won't bisect on seeked tree"
3180 #: git-bisect.sh:144
3181 msgid "Bad HEAD - strange symbolic ref"
3184 #: git-bisect.sh:189
3186 msgid "Bad bisect_write argument: $state"
3189 #: git-bisect.sh:218
3191 msgid "Bad rev input: $arg"
3194 #: git-bisect.sh:232
3195 msgid "Please call 'bisect_state' with at least one argument."
3198 #: git-bisect.sh:244
3200 msgid "Bad rev input: $rev"
3203 #: git-bisect.sh:250
3204 msgid "'git bisect bad' can take only one argument."
3207 #. TRANSLATORS: Make sure to include [Y] and [n] in your
3208 #. translation. The program will only accept English input
3210 #: git-bisect.sh:279
3211 msgid "Are you sure [Y/n]? "
3214 #: git-bisect.sh:354
3216 msgid "'$invalid' is not a valid commit"
3219 #: git-bisect.sh:363
3222 "Could not check out original HEAD '$branch'.\n"
3223 "Try 'git bisect reset <commit>'."
3226 #: git-bisect.sh:390
3227 msgid "No logfile given"
3230 #: git-bisect.sh:391
3232 msgid "cannot read $file for replaying"
3235 #: git-bisect.sh:408
3236 msgid "?? what are you talking about?"
3239 #: git-bisect.sh:474
3240 msgid "We are not bisecting."
3245 "Pull is not possible because you have unmerged files.\n"
3246 "Please, fix them up in the work tree, and then use 'git add/rm <file>'\n"
3247 "as appropriate to mark resolution, or use 'git commit -a'."
3251 msgid "Pull is not possible because you have unmerged files."
3255 msgid "updating an unborn branch with changes added to the index"
3259 msgid "Cannot merge multiple branches into empty head"
3263 msgid "Cannot rebase onto multiple branches"
3267 msgid "git stash clear with parameters is unimplemented"
3271 msgid "You do not have the initial commit yet"
3275 msgid "Cannot save the current index state"
3278 #: git-stash.sh:123 git-stash.sh:136
3279 msgid "Cannot save the current worktree state"
3283 msgid "No changes selected"
3287 msgid "Cannot remove temporary index (can't happen)"
3291 msgid "Cannot record working tree state"
3295 msgid "No local changes to save"
3299 msgid "Cannot initialize stash"
3303 msgid "Cannot save the current status"
3307 msgid "Cannot remove worktree changes"
3311 msgid "No stash found."
3316 msgid "Too many revisions specified: $REV"
3321 msgid "$reference is not valid reference"
3326 msgid "'$args' is not a stash-like commit"
3331 msgid "'$args' is not a stash reference"
3335 msgid "unable to refresh index"
3339 msgid "Cannot apply a stash in the middle of a merge"
3343 msgid "Conflicts in index. Try without --index."
3347 msgid "Could not save index tree"
3351 msgid "Cannot unstage modified files"
3356 msgid "Dropped ${REV} ($s)"
3361 msgid "${REV}: Could not drop stash entry"
3365 msgid "No branch name specified"
3369 msgid "(To restore them type \"git stash apply\")"
3372 #: git-submodule.sh:56
3374 msgid "cannot strip one component off url '$remoteurl'"
3377 #: git-submodule.sh:108
3379 msgid "No submodule mapping found in .gitmodules for path '$path'"
3382 #: git-submodule.sh:149
3384 msgid "Clone of '$url' into submodule path '$path' failed"
3387 #: git-submodule.sh:159
3389 msgid "Gitdir '$a' is part of the submodule path '$b' or vice versa"
3392 #: git-submodule.sh:248
3394 msgid "repo URL: '$repo' must be absolute or begin with ./|../"
3397 #: git-submodule.sh:265
3399 msgid "'$path' already exists in the index"
3402 #: git-submodule.sh:282
3404 msgid "'$path' already exists and is not a valid git repo"
3407 #: git-submodule.sh:296
3409 msgid "Unable to checkout submodule '$path'"
3412 #: git-submodule.sh:301
3414 msgid "Failed to add submodule '$path'"
3417 #: git-submodule.sh:306
3419 msgid "Failed to register submodule '$path'"
3422 #: git-submodule.sh:348
3424 msgid "Entering '$prefix$path'"
3427 #: git-submodule.sh:360
3429 msgid "Stopping at '$path'; script returned non-zero status."
3432 #: git-submodule.sh:402
3434 msgid "No url found for submodule path '$path' in .gitmodules"
3437 #: git-submodule.sh:411
3439 msgid "Failed to register url for submodule path '$path'"
3442 #: git-submodule.sh:419
3444 msgid "Failed to register update mode for submodule path '$path'"
3447 #: git-submodule.sh:421
3449 msgid "Submodule '$name' ($url) registered for path '$path'"
3452 #: git-submodule.sh:520
3455 "Submodule path '$path' not initialized\n"
3456 "Maybe you want to use 'update --init'?"
3459 #: git-submodule.sh:533
3461 msgid "Unable to find current revision in submodule path '$path'"
3464 #: git-submodule.sh:552
3466 msgid "Unable to fetch in submodule path '$path'"
3469 #: git-submodule.sh:566
3471 msgid "Unable to rebase '$sha1' in submodule path '$path'"
3474 #: git-submodule.sh:567
3476 msgid "Submodule path '$path': rebased into '$sha1'"
3479 #: git-submodule.sh:572
3481 msgid "Unable to merge '$sha1' in submodule path '$path'"
3484 #: git-submodule.sh:573
3486 msgid "Submodule path '$path': merged in '$sha1'"
3489 #: git-submodule.sh:578
3491 msgid "Unable to checkout '$sha1' in submodule path '$path'"
3494 #: git-submodule.sh:579
3496 msgid "Submodule path '$path': checked out '$sha1'"
3499 #: git-submodule.sh:601 git-submodule.sh:924
3501 msgid "Failed to recurse into submodule path '$path'"
3504 #: git-submodule.sh:709
3508 #: git-submodule.sh:767
3510 msgid " Warn: $name doesn't contain commit $sha1_src"
3513 #: git-submodule.sh:770
3515 msgid " Warn: $name doesn't contain commit $sha1_dst"
3518 #: git-submodule.sh:773
3520 msgid " Warn: $name doesn't contain commits $sha1_src and $sha1_dst"
3523 #: git-submodule.sh:798
3527 #: git-submodule.sh:799
3531 #: git-submodule.sh:970
3533 msgid "Synchronizing submodule url for '$name'"