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-04-28 20:17+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:289 builtin/log.c:719
274 #: builtin/log.c:1335 builtin/log.c:1554 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 "HEAD does not point to a branch"
405 msgid "No such branch: '%s'"
410 msgid "No upstream configured for branch '%s'"
415 msgid "Upstream branch '%s' not stored as a remote-tracking branch"
419 msgid "Unmerged paths:"
422 #: wt-status.c:140 wt-status.c:157
424 msgid " (use \"git reset %s <file>...\" to unstage)"
427 #: wt-status.c:142 wt-status.c:159
428 msgid " (use \"git rm --cached <file>...\" to unstage)"
432 msgid " (use \"git add/rm <file>...\" as appropriate to mark resolution)"
436 msgid "Changes to be committed:"
440 msgid "Changes not staged for commit:"
444 msgid " (use \"git add <file>...\" to update what will be committed)"
448 msgid " (use \"git add/rm <file>...\" to update what will be committed)"
453 " (use \"git checkout -- <file>...\" to discard changes in working directory)"
457 msgid " (commit or discard the untracked or modified content in submodules)"
467 msgid " (use \"git %s <file>...\" to include in what will be committed)"
475 msgid "both deleted:"
483 msgid "deleted by them:"
487 msgid "added by them:"
491 msgid "deleted by us:"
499 msgid "both modified:"
503 msgid "new commits, "
507 msgid "modified content, "
511 msgid "untracked content, "
521 msgid "copied: %s -> %s"
536 msgid "renamed: %s -> %s"
541 msgid "typechange: %s"
556 msgid "bug: unhandled diff status %c"
564 msgid "Not currently on any branch."
568 msgid "Initial commit"
581 msgid "Untracked files not listed%s"
585 msgid " (use -u option to show untracked files)"
594 msgid "no changes added to commit%s\n"
598 msgid " (use \"git add\" and/or \"git commit -a\")"
603 msgid "nothing added to commit but untracked files present%s\n"
607 msgid " (use \"git add\" to track)"
610 #: wt-status.c:769 wt-status.c:772 wt-status.c:775
612 msgid "nothing to commit%s\n"
616 msgid " (create/copy files and use \"git add\" to track)"
620 msgid " (use -u to show untracked files)"
624 msgid " (working directory clean)"
628 msgid "HEAD (no branch)"
632 msgid "Initial commit on "
639 #: wt-status.c:908 wt-status.c:911
649 msgid "unexpected diff status %c"
652 #: builtin/add.c:67 builtin/commit.c:298
653 msgid "updating files failed"
658 msgid "remove '%s'\n"
663 msgid "Path '%s' is in submodule '%.*s'"
667 msgid "Unstaged changes after refreshing the index:"
670 #: builtin/add.c:195 builtin/add.c:456 builtin/rm.c:186
672 msgid "pathspec '%s' did not match any files"
677 msgid "'%s' is beyond a symbolic link"
681 msgid "Could not read the index"
686 msgid "Could not open '%s' for writing."
690 msgid "Could not write patch"
695 msgid "Could not stat '%s'"
699 msgid "Empty patch. Aborted."
704 msgid "Could not apply '%s'"
708 msgid "The following paths are ignored by one of your .gitignore files:\n"
713 msgid "Use -f if you really want to add them.\n"
717 msgid "no files added"
721 msgid "adding files failed"
725 msgid "-A and -u are mutually incompatible"
729 msgid "Option --ignore-missing can only be used together with --dry-run"
734 msgid "Nothing specified, nothing added.\n"
739 msgid "Maybe you wanted to say 'git add .'?\n"
742 #: builtin/add.c:420 builtin/clean.c:95 builtin/commit.c:358 builtin/mv.c:82
744 msgid "index file corrupt"
747 #: builtin/add.c:476 builtin/mv.c:229 builtin/rm.c:260
748 msgid "Unable to write new index file"
751 #: builtin/archive.c:17
753 msgid "could not create archive file '%s'"
756 #: builtin/archive.c:20
757 msgid "could not redirect output"
760 #: builtin/archive.c:37
761 msgid "git archive: Remote with no URL"
764 #: builtin/archive.c:58
765 msgid "git archive: expected ACK/NAK, got EOF"
768 #: builtin/archive.c:63
770 msgid "git archive: NACK %s"
773 #: builtin/archive.c:65
775 msgid "remote error: %s"
778 #: builtin/archive.c:66
779 msgid "git archive: protocol error"
782 #: builtin/archive.c:71
783 msgid "git archive: expected a flush"
786 #: builtin/branch.c:137
789 "deleting branch '%s' that has been merged to\n"
790 " '%s', but not yet merged to HEAD."
793 #: builtin/branch.c:141
796 "not deleting branch '%s' that is not yet merged to\n"
797 " '%s', even though it is merged to HEAD."
800 #. TRANSLATORS: This is "remote " in "remote branch '%s' not found"
801 #: builtin/branch.c:164
805 #: builtin/branch.c:172
806 msgid "cannot use -a with -d"
809 #: builtin/branch.c:178
810 msgid "Couldn't look up commit object for HEAD"
813 #: builtin/branch.c:183
815 msgid "Cannot delete the branch '%s' which you are currently on."
818 #: builtin/branch.c:193
820 msgid "%sbranch '%s' not found."
823 #: builtin/branch.c:201
825 msgid "Couldn't look up commit object for '%s'"
828 #: builtin/branch.c:207
831 "The branch '%s' is not fully merged.\n"
832 "If you are sure you want to delete it, run 'git branch -D %s'."
835 #: builtin/branch.c:215
837 msgid "Error deleting %sbranch '%s'"
840 #: builtin/branch.c:221
842 msgid "Deleted %sbranch %s (was %s).\n"
845 #: builtin/branch.c:226
846 msgid "Update of config-file failed"
849 #: builtin/branch.c:324
851 msgid "branch '%s' does not point at a commit"
854 #: builtin/branch.c:396
859 #: builtin/branch.c:398
864 #: builtin/branch.c:400
866 msgid "ahead %d, behind %d] "
869 #: builtin/branch.c:503
873 #: builtin/branch.c:568
874 msgid "some refs could not be read"
877 #: builtin/branch.c:581
878 msgid "cannot rename the current branch while not on any."
881 #: builtin/branch.c:591
883 msgid "Invalid branch name: '%s'"
886 #: builtin/branch.c:606
887 msgid "Branch rename failed"
890 #: builtin/branch.c:610
892 msgid "Renamed a misnamed branch '%s' away"
895 #: builtin/branch.c:614
897 msgid "Branch renamed to %s, but HEAD is not updated!"
900 #: builtin/branch.c:621
901 msgid "Branch is renamed, but update of config-file failed"
904 #: builtin/branch.c:636
906 msgid "malformed object name %s"
909 #: builtin/branch.c:660
911 msgid "could not write branch description template: %s\n"
914 #: builtin/branch.c:750
915 msgid "Failed to resolve HEAD as a valid ref."
918 #: builtin/branch.c:755 builtin/clone.c:558
919 msgid "HEAD not found below refs/heads!"
922 #: builtin/branch.c:813
923 msgid "-a and -r options to 'git branch' do not make sense with a branch name"
926 #: builtin/bundle.c:47
931 #: builtin/bundle.c:56
932 msgid "Need a repository to create a bundle."
935 #: builtin/bundle.c:60
936 msgid "Need a repository to unbundle."
939 #: builtin/checkout.c:113 builtin/checkout.c:146
941 msgid "path '%s' does not have our version"
944 #: builtin/checkout.c:115 builtin/checkout.c:148
946 msgid "path '%s' does not have their version"
949 #: builtin/checkout.c:131
951 msgid "path '%s' does not have all necessary versions"
954 #: builtin/checkout.c:175
956 msgid "path '%s' does not have necessary versions"
959 #: builtin/checkout.c:192
961 msgid "path '%s': cannot merge"
964 #: builtin/checkout.c:209
966 msgid "Unable to add merge result for '%s'"
969 #: builtin/checkout.c:212 builtin/reset.c:158
971 msgid "make_cache_entry failed for path '%s'"
974 #: builtin/checkout.c:234 builtin/checkout.c:392
975 msgid "corrupt index file"
978 #: builtin/checkout.c:264 builtin/checkout.c:271
980 msgid "path '%s' is unmerged"
983 #: builtin/checkout.c:302 builtin/checkout.c:498 builtin/clone.c:583
984 #: builtin/merge.c:812
985 msgid "unable to write new index file"
988 #: builtin/checkout.c:319 builtin/diff.c:302 builtin/merge.c:408
989 msgid "diff_setup_done failed"
992 #: builtin/checkout.c:414
993 msgid "you need to resolve your current index first"
996 #: builtin/checkout.c:533
998 msgid "Can not do reflog for '%s'\n"
1001 #: builtin/checkout.c:566
1002 msgid "HEAD is now at"
1005 #: builtin/checkout.c:573
1007 msgid "Reset branch '%s'\n"
1010 #: builtin/checkout.c:576
1012 msgid "Already on '%s'\n"
1015 #: builtin/checkout.c:580
1017 msgid "Switched to and reset branch '%s'\n"
1020 #: builtin/checkout.c:582
1022 msgid "Switched to a new branch '%s'\n"
1025 #: builtin/checkout.c:584
1027 msgid "Switched to branch '%s'\n"
1030 #: builtin/checkout.c:640
1032 msgid " ... and %d more.\n"
1035 #. The singular version
1036 #: builtin/checkout.c:646
1039 "Warning: you are leaving %d commit behind, not connected to\n"
1040 "any of your branches:\n"
1044 "Warning: you are leaving %d commits behind, not connected to\n"
1045 "any of your branches:\n"
1051 #: builtin/checkout.c:664
1054 "If you want to keep them by creating a new branch, this may be a good time\n"
1057 " git branch new_branch_name %s\n"
1061 #: builtin/checkout.c:693
1062 msgid "internal error in revision walk"
1065 #: builtin/checkout.c:697
1066 msgid "Previous HEAD position was"
1069 #: builtin/checkout.c:723
1070 msgid "You are on a branch yet to be born"
1074 #: builtin/checkout.c:854
1076 msgid "invalid reference: %s"
1079 #. case (1): want a tree
1080 #: builtin/checkout.c:893
1082 msgid "reference is not a tree: %s"
1085 #: builtin/checkout.c:973
1086 msgid "-B cannot be used with -b"
1089 #: builtin/checkout.c:982
1090 msgid "--patch is incompatible with all other options"
1093 #: builtin/checkout.c:985
1094 msgid "--detach cannot be used with -b/-B/--orphan"
1097 #: builtin/checkout.c:987
1098 msgid "--detach cannot be used with -t"
1101 #: builtin/checkout.c:993
1102 msgid "--track needs a branch name"
1105 #: builtin/checkout.c:1000
1106 msgid "Missing branch name; try -b"
1109 #: builtin/checkout.c:1006
1110 msgid "--orphan and -b|-B are mutually exclusive"
1113 #: builtin/checkout.c:1008
1114 msgid "--orphan cannot be used with -t"
1117 #: builtin/checkout.c:1018
1118 msgid "git checkout: -f and -m are incompatible"
1121 #: builtin/checkout.c:1052
1122 msgid "invalid path specification"
1125 #: builtin/checkout.c:1060
1128 "git checkout: updating paths is incompatible with switching branches.\n"
1129 "Did you intend to checkout '%s' which can not be resolved as commit?"
1132 #: builtin/checkout.c:1062
1133 msgid "git checkout: updating paths is incompatible with switching branches."
1136 #: builtin/checkout.c:1067
1137 msgid "git checkout: --detach does not take a path argument"
1140 #: builtin/checkout.c:1070
1142 "git checkout: --ours/--theirs, --force and --merge are incompatible when\n"
1143 "checking out of the index."
1146 #: builtin/checkout.c:1089
1147 msgid "Cannot switch branch to a non-commit."
1150 #: builtin/checkout.c:1092
1151 msgid "--ours/--theirs is incompatible with switching branches."
1154 #: builtin/clean.c:78
1155 msgid "-x and -X cannot be used together"
1158 #: builtin/clean.c:82
1160 "clean.requireForce set to true and neither -n nor -f given; refusing to clean"
1163 #: builtin/clean.c:85
1165 "clean.requireForce defaults to true and neither -n nor -f given; refusing to "
1169 #: builtin/clean.c:155 builtin/clean.c:176
1171 msgid "Would remove %s\n"
1174 #: builtin/clean.c:159 builtin/clean.c:179
1176 msgid "Removing %s\n"
1179 #: builtin/clean.c:162 builtin/clean.c:182
1181 msgid "failed to remove %s"
1184 #: builtin/clean.c:166
1186 msgid "Would not remove %s\n"
1189 #: builtin/clean.c:168
1191 msgid "Not removing %s\n"
1194 #: builtin/clone.c:243
1196 msgid "reference repository '%s' is not a local directory."
1199 #: builtin/clone.c:302
1201 msgid "failed to open '%s'"
1204 #: builtin/clone.c:306
1206 msgid "failed to create directory '%s'"
1209 #: builtin/clone.c:308 builtin/diff.c:75
1211 msgid "failed to stat '%s'"
1214 #: builtin/clone.c:310
1216 msgid "%s exists and is not a directory"
1219 #: builtin/clone.c:324
1221 msgid "failed to stat %s\n"
1224 #: builtin/clone.c:341
1226 msgid "failed to unlink '%s'"
1229 #: builtin/clone.c:346
1231 msgid "failed to create link '%s'"
1234 #: builtin/clone.c:350
1236 msgid "failed to copy file to '%s'"
1239 #: builtin/clone.c:373
1244 #: builtin/clone.c:440
1246 msgid "Could not find remote branch %s to clone."
1249 #: builtin/clone.c:549
1250 msgid "remote HEAD refers to nonexistent ref, unable to checkout.\n"
1253 #: builtin/clone.c:639
1254 msgid "Too many arguments."
1257 #: builtin/clone.c:643
1258 msgid "You must specify a repository to clone."
1261 #: builtin/clone.c:654
1263 msgid "--bare and --origin %s options are incompatible."
1266 #: builtin/clone.c:668
1268 msgid "repository '%s' does not exist"
1271 #: builtin/clone.c:673
1272 msgid "--depth is ignored in local clones; use file:// instead."
1275 #: builtin/clone.c:683
1277 msgid "destination path '%s' already exists and is not an empty directory."
1280 #: builtin/clone.c:693
1282 msgid "working tree '%s' already exists."
1285 #: builtin/clone.c:706 builtin/clone.c:720
1287 msgid "could not create leading directories of '%s'"
1290 #: builtin/clone.c:709
1292 msgid "could not create work tree dir '%s'."
1295 #: builtin/clone.c:728
1297 msgid "Cloning into bare repository '%s'...\n"
1300 #: builtin/clone.c:730
1302 msgid "Cloning into '%s'...\n"
1305 #: builtin/clone.c:786
1307 msgid "Don't know how to clone %s"
1310 #: builtin/clone.c:835
1312 msgid "Remote branch %s not found in upstream %s"
1315 #: builtin/clone.c:842
1316 msgid "You appear to have cloned an empty repository."
1319 #: builtin/commit.c:42
1321 "Your name and email address were configured automatically based\n"
1322 "on your username and hostname. Please check that they are accurate.\n"
1323 "You can suppress this message by setting them explicitly:\n"
1325 " git config --global user.name \"Your Name\"\n"
1326 " git config --global user.email you@example.com\n"
1328 "After doing this, you may fix the identity used for this commit with:\n"
1330 " git commit --amend --reset-author\n"
1333 #: builtin/commit.c:54
1335 "You asked to amend the most recent commit, but doing so would make\n"
1336 "it empty. You can repeat your command with --allow-empty, or you can\n"
1337 "remove the commit entirely with \"git reset HEAD^\".\n"
1340 #: builtin/commit.c:59
1342 "The previous cherry-pick is now empty, possibly due to conflict resolution.\n"
1343 "If you wish to commit it anyway, use:\n"
1345 " git commit --allow-empty\n"
1347 "Otherwise, please use 'git reset'\n"
1350 #: builtin/commit.c:205 builtin/reset.c:33
1354 #: builtin/commit.c:208
1358 #: builtin/commit.c:325
1359 msgid "failed to unpack HEAD tree object"
1362 #: builtin/commit.c:367
1363 msgid "unable to create temporary index"
1366 #: builtin/commit.c:373
1367 msgid "interactive add failed"
1370 #: builtin/commit.c:406 builtin/commit.c:427 builtin/commit.c:473
1371 msgid "unable to write new_index file"
1374 #: builtin/commit.c:457
1376 msgid "cannot do a partial commit during a %s."
1379 #: builtin/commit.c:466
1380 msgid "cannot read the index"
1383 #: builtin/commit.c:486
1384 msgid "unable to write temporary index file"
1387 #: builtin/commit.c:561 builtin/commit.c:567
1389 msgid "invalid commit: %s"
1392 #: builtin/commit.c:590
1393 msgid "malformed --author parameter"
1396 #: builtin/commit.c:651
1398 msgid "Malformed ident string: '%s'"
1401 #: builtin/commit.c:689 builtin/commit.c:722 builtin/commit.c:1033
1403 msgid "could not lookup commit %s"
1406 #: builtin/commit.c:701 builtin/shortlog.c:296
1408 msgid "(reading log message from standard input)\n"
1411 #: builtin/commit.c:703
1412 msgid "could not read log from standard input"
1415 #: builtin/commit.c:707
1417 msgid "could not read log file '%s'"
1420 #: builtin/commit.c:713
1421 msgid "commit has empty message"
1424 #: builtin/commit.c:729
1425 msgid "could not read MERGE_MSG"
1428 #: builtin/commit.c:733
1429 msgid "could not read SQUASH_MSG"
1432 #: builtin/commit.c:737
1434 msgid "could not read '%s'"
1437 #: builtin/commit.c:765
1439 msgid "could not open '%s'"
1442 #: builtin/commit.c:789
1443 msgid "could not write commit template"
1446 #: builtin/commit.c:799
1450 "It looks like you may be committing a %s.\n"
1451 "If this is not correct, please remove the file\n"
1456 #: builtin/commit.c:812
1457 msgid "Please enter the commit message for your changes."
1460 #: builtin/commit.c:815
1463 "with '#' will be ignored, and an empty message aborts the commit.\n"
1466 #: builtin/commit.c:820
1469 "with '#' will be kept; you may remove them yourself if you want to.\n"
1470 "An empty message aborts the commit.\n"
1473 #: builtin/commit.c:832
1475 msgid "%sAuthor: %s"
1478 #: builtin/commit.c:839
1480 msgid "%sCommitter: %s"
1483 #: builtin/commit.c:859
1484 msgid "Cannot read index"
1487 #: builtin/commit.c:896
1488 msgid "Error building trees"
1491 #: builtin/commit.c:911 builtin/tag.c:357
1493 msgid "Please supply the message using either -m or -F option.\n"
1496 #: builtin/commit.c:1008
1498 msgid "No existing author found with '%s'"
1501 #: builtin/commit.c:1023 builtin/commit.c:1217
1503 msgid "Invalid untracked files mode '%s'"
1506 #: builtin/commit.c:1063
1507 msgid "Using both --reset-author and --author does not make sense"
1510 #: builtin/commit.c:1074
1511 msgid "You have nothing to amend."
1514 #: builtin/commit.c:1076
1516 msgid "You are in the middle of a %s -- cannot amend."
1519 #: builtin/commit.c:1078
1520 msgid "Options --squash and --fixup cannot be used together"
1523 #: builtin/commit.c:1088
1524 msgid "Only one of -c/-C/-F/--fixup can be used."
1527 #: builtin/commit.c:1090
1528 msgid "Option -m cannot be combined with -c/-C/-F/--fixup."
1531 #: builtin/commit.c:1098
1532 msgid "--reset-author can be used only with -C, -c or --amend."
1535 #: builtin/commit.c:1115
1536 msgid "Only one of --include/--only/--all/--interactive/--patch can be used."
1539 #: builtin/commit.c:1117
1540 msgid "No paths with --include/--only does not make sense."
1543 #: builtin/commit.c:1119
1544 msgid "Clever... amending the last one with dirty index."
1547 #: builtin/commit.c:1121
1548 msgid "Explicit paths specified without -i nor -o; assuming --only paths..."
1551 #: builtin/commit.c:1131 builtin/tag.c:556
1553 msgid "Invalid cleanup mode %s"
1556 #: builtin/commit.c:1136
1557 msgid "Paths with -a does not make sense."
1560 #: builtin/commit.c:1315
1561 msgid "couldn't look up newly created commit"
1564 #: builtin/commit.c:1317
1565 msgid "could not parse newly created commit"
1568 #: builtin/commit.c:1358
1569 msgid "detached HEAD"
1572 #: builtin/commit.c:1360
1573 msgid " (root-commit)"
1576 #: builtin/commit.c:1450
1577 msgid "could not parse HEAD commit"
1580 #: builtin/commit.c:1487 builtin/merge.c:509
1582 msgid "could not open '%s' for reading"
1585 #: builtin/commit.c:1494
1587 msgid "Corrupt MERGE_HEAD file (%s)"
1590 #: builtin/commit.c:1501
1591 msgid "could not read MERGE_MODE"
1594 #: builtin/commit.c:1520
1596 msgid "could not read commit message: %s"
1599 #: builtin/commit.c:1534
1601 msgid "Aborting commit; you did not edit the message.\n"
1604 #: builtin/commit.c:1539
1606 msgid "Aborting commit due to empty commit message.\n"
1609 #: builtin/commit.c:1554 builtin/merge.c:936 builtin/merge.c:961
1610 msgid "failed to write commit object"
1613 #: builtin/commit.c:1575
1614 msgid "cannot lock HEAD ref"
1617 #: builtin/commit.c:1579
1618 msgid "cannot update HEAD ref"
1621 #: builtin/commit.c:1590
1623 "Repository has been updated, but unable to write\n"
1624 "new_index file. Check that disk is not full or quota is\n"
1625 "not exceeded, and then \"git reset HEAD\" to recover."
1628 #: builtin/describe.c:234
1630 msgid "annotated tag %s not available"
1633 #: builtin/describe.c:238
1635 msgid "annotated tag %s has no embedded name"
1638 #: builtin/describe.c:240
1640 msgid "tag '%s' is really '%s' here"
1643 #: builtin/describe.c:267
1645 msgid "Not a valid object name %s"
1648 #: builtin/describe.c:270
1650 msgid "%s is not a valid '%s' object"
1653 #: builtin/describe.c:287
1655 msgid "no tag exactly matches '%s'"
1658 #: builtin/describe.c:289
1660 msgid "searching to describe %s\n"
1663 #: builtin/describe.c:329
1665 msgid "finished search at %s\n"
1668 #: builtin/describe.c:353
1671 "No annotated tags can describe '%s'.\n"
1672 "However, there were unannotated tags: try --tags."
1675 #: builtin/describe.c:357
1678 "No tags can describe '%s'.\n"
1679 "Try --always, or create some tags."
1682 #: builtin/describe.c:378
1684 msgid "traversed %lu commits\n"
1687 #: builtin/describe.c:381
1690 "more than %i tags found; listed %i most recent\n"
1691 "gave up search at %s\n"
1694 #: builtin/describe.c:436
1695 msgid "--long is incompatible with --abbrev=0"
1698 #: builtin/describe.c:462
1699 msgid "No names found, cannot describe anything."
1702 #: builtin/describe.c:482
1703 msgid "--dirty is incompatible with committishes"
1706 #: builtin/diff.c:77
1708 msgid "'%s': not a regular file or symlink"
1711 #: builtin/diff.c:220
1713 msgid "invalid option: %s"
1716 #: builtin/diff.c:297
1717 msgid "Not a git repository"
1720 #: builtin/diff.c:347
1722 msgid "invalid object '%s' given."
1725 #: builtin/diff.c:352
1727 msgid "more than %d trees given: '%s'"
1730 #: builtin/diff.c:362
1732 msgid "more than two blobs given: '%s'"
1735 #: builtin/diff.c:370
1737 msgid "unhandled object '%s' given."
1740 #: builtin/fetch.c:200
1741 msgid "Couldn't find remote ref HEAD"
1744 #: builtin/fetch.c:253
1746 msgid "object %s not found"
1749 #: builtin/fetch.c:259
1750 msgid "[up to date]"
1753 #: builtin/fetch.c:273
1755 msgid "! %-*s %-*s -> %s (can't fetch in current branch)"
1758 #: builtin/fetch.c:274 builtin/fetch.c:360
1762 #: builtin/fetch.c:285
1763 msgid "[tag update]"
1766 #: builtin/fetch.c:287 builtin/fetch.c:322 builtin/fetch.c:340
1767 msgid " (unable to update local ref)"
1770 #: builtin/fetch.c:305
1774 #: builtin/fetch.c:308
1775 msgid "[new branch]"
1778 #: builtin/fetch.c:311
1782 #: builtin/fetch.c:356
1783 msgid "unable to update local ref"
1786 #: builtin/fetch.c:356
1787 msgid "forced update"
1790 #: builtin/fetch.c:362
1791 msgid "(non-fast-forward)"
1794 #: builtin/fetch.c:393 builtin/fetch.c:685
1796 msgid "cannot open %s: %s\n"
1799 #: builtin/fetch.c:402
1801 msgid "%s did not send all necessary objects\n"
1804 #: builtin/fetch.c:488
1809 #: builtin/fetch.c:499
1812 "some local refs could not be updated; try running\n"
1813 " 'git remote prune %s' to remove any old, conflicting branches"
1816 #: builtin/fetch.c:549
1818 msgid " (%s will become dangling)\n"
1821 #: builtin/fetch.c:550
1823 msgid " (%s has become dangling)\n"
1826 #: builtin/fetch.c:557
1830 #: builtin/fetch.c:558
1834 #: builtin/fetch.c:675
1836 msgid "Refusing to fetch into current branch %s of non-bare repository"
1839 #: builtin/fetch.c:709
1841 msgid "Don't know how to fetch from %s"
1844 #: builtin/fetch.c:786
1846 msgid "Option \"%s\" value \"%s\" is not valid for %s"
1849 #: builtin/fetch.c:789
1851 msgid "Option \"%s\" is ignored for %s\n"
1854 #: builtin/fetch.c:888
1856 msgid "Fetching %s\n"
1859 #: builtin/fetch.c:890
1861 msgid "Could not fetch %s"
1864 #: builtin/fetch.c:907
1866 "No remote repository specified. Please, specify either a URL or a\n"
1867 "remote name from which new revisions should be fetched."
1870 #: builtin/fetch.c:927
1871 msgid "You need to specify a tag name."
1874 #: builtin/fetch.c:979
1875 msgid "fetch --all does not take a repository argument"
1878 #: builtin/fetch.c:981
1879 msgid "fetch --all does not make sense with refspecs"
1882 #: builtin/fetch.c:992
1884 msgid "No such remote or remote group: %s"
1887 #: builtin/fetch.c:1000
1888 msgid "Fetching a group and specifying refspecs does not make sense"
1893 msgid "Invalid %s: '%s'"
1897 msgid "Too many options specified"
1902 msgid "insanely long object directory %.*s"
1907 msgid "Auto packing the repository for optimum performance.\n"
1913 "Auto packing the repository for optimum performance. You may also\n"
1914 "run \"git gc\" manually. See \"git help gc\" for more information.\n"
1919 "There are too many unreachable loose objects; run 'git prune' to remove them."
1922 #: builtin/grep.c:216
1924 msgid "grep: failed to create thread: %s"
1927 #: builtin/grep.c:402
1929 msgid "Failed to chdir: %s"
1932 #: builtin/grep.c:478 builtin/grep.c:512
1934 msgid "unable to read tree (%s)"
1937 #: builtin/grep.c:526
1939 msgid "unable to grep from object of type %s"
1942 #: builtin/grep.c:584
1944 msgid "switch `%c' expects a numerical value"
1947 #: builtin/grep.c:601
1949 msgid "cannot open '%s'"
1952 #: builtin/grep.c:888
1953 msgid "no pattern given."
1956 #: builtin/grep.c:902
1958 msgid "bad object %s"
1961 #: builtin/grep.c:943
1962 msgid "--open-files-in-pager only works on the worktree"
1965 #: builtin/grep.c:966
1966 msgid "--cached or --untracked cannot be used with --no-index."
1969 #: builtin/grep.c:971
1970 msgid "--no-index or --untracked cannot be used with revs."
1973 #: builtin/grep.c:974
1974 msgid "--[no-]exclude-standard cannot be used for tracked contents."
1977 #: builtin/grep.c:982
1978 msgid "both --cached and trees are given."
1981 #: builtin/init-db.c:35
1983 msgid "Could not make %s writable by group"
1986 #: builtin/init-db.c:62
1988 msgid "insanely long template name %s"
1991 #: builtin/init-db.c:67
1993 msgid "cannot stat '%s'"
1996 #: builtin/init-db.c:73
1998 msgid "cannot stat template '%s'"
2001 #: builtin/init-db.c:80
2003 msgid "cannot opendir '%s'"
2006 #: builtin/init-db.c:97
2008 msgid "cannot readlink '%s'"
2011 #: builtin/init-db.c:99
2013 msgid "insanely long symlink %s"
2016 #: builtin/init-db.c:102
2018 msgid "cannot symlink '%s' '%s'"
2021 #: builtin/init-db.c:106
2023 msgid "cannot copy '%s' to '%s'"
2026 #: builtin/init-db.c:110
2028 msgid "ignoring template %s"
2031 #: builtin/init-db.c:133
2033 msgid "insanely long template path %s"
2036 #: builtin/init-db.c:141
2038 msgid "templates not found %s"
2041 #: builtin/init-db.c:154
2043 msgid "not copying templates of a wrong format version %d from '%s'"
2046 #: builtin/init-db.c:192
2048 msgid "insane git directory %s"
2051 #: builtin/init-db.c:322 builtin/init-db.c:325
2053 msgid "%s already exists"
2056 #: builtin/init-db.c:354
2058 msgid "unable to handle file type %d"
2061 #: builtin/init-db.c:357
2063 msgid "unable to move %s to %s"
2066 #: builtin/init-db.c:362
2068 msgid "Could not create git link %s"
2072 #. * TRANSLATORS: The first '%s' is either "Reinitialized
2073 #. * existing" or "Initialized empty", the second " shared" or
2074 #. * "", and the last '%s%s' is the verbatim directory name.
2076 #: builtin/init-db.c:419
2078 msgid "%s%s Git repository in %s%s\n"
2081 #: builtin/init-db.c:420
2082 msgid "Reinitialized existing"
2085 #: builtin/init-db.c:420
2086 msgid "Initialized empty"
2089 #: builtin/init-db.c:421
2093 #: builtin/init-db.c:440
2094 msgid "cannot tell cwd"
2097 #: builtin/init-db.c:521 builtin/init-db.c:528
2099 msgid "cannot mkdir %s"
2102 #: builtin/init-db.c:532
2104 msgid "cannot chdir to %s"
2107 #: builtin/init-db.c:554
2110 "%s (or --work-tree=<directory>) not allowed without specifying %s (or --git-"
2114 #: builtin/init-db.c:578
2115 msgid "Cannot access current working directory"
2118 #: builtin/init-db.c:585
2120 msgid "Cannot access work tree '%s'"
2123 #: builtin/log.c:188
2125 msgid "Final output: %d %s\n"
2128 #: builtin/log.c:401 builtin/log.c:489
2130 msgid "Could not read object %s"
2133 #: builtin/log.c:513
2135 msgid "Unknown type: %d"
2138 #: builtin/log.c:602
2139 msgid "format.headers without value"
2142 #: builtin/log.c:675
2143 msgid "name of output directory is too long"
2146 #: builtin/log.c:686
2148 msgid "Cannot open patch file %s"
2151 #: builtin/log.c:700
2152 msgid "Need exactly one range."
2155 #: builtin/log.c:708
2156 msgid "Not a range."
2159 #: builtin/log.c:745
2160 msgid "Could not extract email from committer identity."
2163 #: builtin/log.c:791
2164 msgid "Cover letter needs email format"
2167 #: builtin/log.c:885
2169 msgid "insane in-reply-to: %s"
2172 #: builtin/log.c:958
2173 msgid "Two output directories?"
2176 #: builtin/log.c:1179
2178 msgid "bogus committer info %s"
2181 #: builtin/log.c:1224
2182 msgid "-n and -k are mutually exclusive."
2185 #: builtin/log.c:1226
2186 msgid "--subject-prefix and -k are mutually exclusive."
2189 #: builtin/log.c:1231 builtin/shortlog.c:284
2191 msgid "unrecognized argument: %s"
2194 #: builtin/log.c:1234
2195 msgid "--name-only does not make sense"
2198 #: builtin/log.c:1236
2199 msgid "--name-status does not make sense"
2202 #: builtin/log.c:1238
2203 msgid "--check does not make sense"
2206 #: builtin/log.c:1261
2207 msgid "standard output, or directory, which one?"
2210 #: builtin/log.c:1263
2212 msgid "Could not create directory '%s'"
2215 #: builtin/log.c:1416
2216 msgid "Failed to create output files"
2219 #: builtin/log.c:1520
2222 "Could not find a tracked remote branch, please specify <upstream> manually.\n"
2225 #: builtin/log.c:1536 builtin/log.c:1538 builtin/log.c:1550
2227 msgid "Unknown commit %s"
2230 #: builtin/merge.c:90
2231 msgid "switch `m' requires a value"
2234 #: builtin/merge.c:127
2236 msgid "Could not find merge strategy '%s'.\n"
2239 #: builtin/merge.c:128
2241 msgid "Available strategies are:"
2244 #: builtin/merge.c:133
2246 msgid "Available custom strategies are:"
2249 #: builtin/merge.c:240
2250 msgid "could not run stash."
2253 #: builtin/merge.c:245
2254 msgid "stash failed"
2257 #: builtin/merge.c:250
2259 msgid "not a valid object: %s"
2262 #: builtin/merge.c:269 builtin/merge.c:286
2263 msgid "read-tree failed"
2266 #: builtin/merge.c:316
2267 msgid " (nothing to squash)"
2270 #: builtin/merge.c:329
2272 msgid "Squash commit -- not updating HEAD\n"
2275 #: builtin/merge.c:361
2276 msgid "Writing SQUASH_MSG"
2279 #: builtin/merge.c:363
2280 msgid "Finishing SQUASH_MSG"
2283 #: builtin/merge.c:386
2285 msgid "No merge message -- not updating HEAD\n"
2288 #: builtin/merge.c:437
2290 msgid "'%s' does not point to a commit"
2293 #: builtin/merge.c:536
2295 msgid "Bad branch.%s.mergeoptions string: %s"
2298 #: builtin/merge.c:629
2299 msgid "git write-tree failed to write a tree"
2302 #: builtin/merge.c:679
2303 msgid "failed to read the cache"
2306 #: builtin/merge.c:697
2307 msgid "Unable to write index."
2310 #: builtin/merge.c:710
2311 msgid "Not handling anything other than two heads merge."
2314 #: builtin/merge.c:724
2316 msgid "Unknown option for merge-recursive: -X%s"
2319 #: builtin/merge.c:738
2321 msgid "unable to write %s"
2324 #: builtin/merge.c:877
2326 msgid "Could not read from '%s'"
2329 #: builtin/merge.c:886
2331 msgid "Not committing merge; use 'git commit' to complete the merge.\n"
2334 #: builtin/merge.c:892
2336 "Please enter a commit message to explain why this merge is necessary,\n"
2337 "especially if it merges an updated upstream into a topic branch.\n"
2339 "Lines starting with '#' will be ignored, and an empty message aborts\n"
2343 #: builtin/merge.c:916
2344 msgid "Empty commit message."
2347 #: builtin/merge.c:928
2349 msgid "Wonderful.\n"
2352 #: builtin/merge.c:993
2354 msgid "Automatic merge failed; fix conflicts and then commit the result.\n"
2357 #: builtin/merge.c:1009
2359 msgid "'%s' is not a commit"
2362 #: builtin/merge.c:1050
2363 msgid "No current branch."
2366 #: builtin/merge.c:1052
2367 msgid "No remote for the current branch."
2370 #: builtin/merge.c:1054
2371 msgid "No default upstream defined for the current branch."
2374 #: builtin/merge.c:1059
2376 msgid "No remote tracking branch for %s from %s"
2379 #: builtin/merge.c:1146 builtin/merge.c:1303
2381 msgid "%s - not something we can merge"
2384 #: builtin/merge.c:1214
2385 msgid "There is no merge to abort (MERGE_HEAD missing)."
2388 #: builtin/merge.c:1230 git-pull.sh:31
2390 "You have not concluded your merge (MERGE_HEAD exists).\n"
2391 "Please, commit your changes before you can merge."
2394 #: builtin/merge.c:1233 git-pull.sh:34
2395 msgid "You have not concluded your merge (MERGE_HEAD exists)."
2398 #: builtin/merge.c:1237
2400 "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n"
2401 "Please, commit your changes before you can merge."
2404 #: builtin/merge.c:1240
2405 msgid "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists)."
2408 #: builtin/merge.c:1249
2409 msgid "You cannot combine --squash with --no-ff."
2412 #: builtin/merge.c:1254
2413 msgid "You cannot combine --no-ff with --ff-only."
2416 #: builtin/merge.c:1261
2417 msgid "No commit specified and merge.defaultToUpstream not set."
2420 #: builtin/merge.c:1293
2421 msgid "Can merge only exactly one commit into empty head"
2424 #: builtin/merge.c:1296
2425 msgid "Squash commit into empty head not supported yet"
2428 #: builtin/merge.c:1298
2429 msgid "Non-fast-forward commit does not make sense into an empty head"
2432 #: builtin/merge.c:1413
2434 msgid "Updating %s..%s\n"
2437 #: builtin/merge.c:1451
2439 msgid "Trying really trivial in-index merge...\n"
2442 #: builtin/merge.c:1458
2447 #: builtin/merge.c:1490
2448 msgid "Not possible to fast-forward, aborting."
2451 #: builtin/merge.c:1513 builtin/merge.c:1592
2453 msgid "Rewinding the tree to pristine...\n"
2456 #: builtin/merge.c:1517
2458 msgid "Trying merge strategy %s...\n"
2461 #: builtin/merge.c:1583
2463 msgid "No merge strategy handled the merge.\n"
2466 #: builtin/merge.c:1585
2468 msgid "Merge with strategy %s failed.\n"
2471 #: builtin/merge.c:1594
2473 msgid "Using the %s to prepare resolving by hand.\n"
2476 #: builtin/merge.c:1606
2478 msgid "Automatic merge went well; stopped before committing as requested\n"
2483 msgid "Checking rename of '%s' to '%s'\n"
2491 msgid "can not move directory into itself"
2495 msgid "cannot move directory over file"
2500 msgid "Huh? %.*s is in index?"
2504 msgid "source directory is empty"
2508 msgid "not under version control"
2512 msgid "destination exists"
2517 msgid "overwriting '%s'"
2521 msgid "Cannot overwrite"
2525 msgid "multiple sources for the same target"
2530 msgid "%s, source=%s, destination=%s"
2535 msgid "Renaming %s to %s\n"
2540 msgid "renaming '%s' failed"
2543 #: builtin/notes.c:139
2545 msgid "unable to start 'show' for object '%s'"
2548 #: builtin/notes.c:145
2549 msgid "can't fdopen 'show' output fd"
2552 #: builtin/notes.c:155
2554 msgid "failed to close pipe to 'show' for object '%s'"
2557 #: builtin/notes.c:158
2559 msgid "failed to finish 'show' for object '%s'"
2562 #: builtin/notes.c:175 builtin/tag.c:343
2564 msgid "could not create file '%s'"
2567 #: builtin/notes.c:189
2568 msgid "Please supply the note contents using either -m or -F option"
2571 #: builtin/notes.c:210 builtin/notes.c:973
2573 msgid "Removing note for object %s\n"
2576 #: builtin/notes.c:215
2577 msgid "unable to write note object"
2580 #: builtin/notes.c:217
2582 msgid "The note contents has been left in %s"
2585 #: builtin/notes.c:251 builtin/tag.c:521
2587 msgid "cannot read '%s'"
2590 #: builtin/notes.c:253 builtin/tag.c:524
2592 msgid "could not open or read '%s'"
2595 #: builtin/notes.c:272 builtin/notes.c:445 builtin/notes.c:447
2596 #: builtin/notes.c:507 builtin/notes.c:561 builtin/notes.c:644
2597 #: builtin/notes.c:649 builtin/notes.c:724 builtin/notes.c:766
2598 #: builtin/notes.c:968 builtin/reset.c:293 builtin/tag.c:537
2600 msgid "Failed to resolve '%s' as a valid ref."
2603 #: builtin/notes.c:275
2605 msgid "Failed to read object '%s'."
2608 #: builtin/notes.c:299
2609 msgid "Cannot commit uninitialized/unreferenced notes tree"
2612 #: builtin/notes.c:340
2614 msgid "Bad notes.rewriteMode value: '%s'"
2617 #: builtin/notes.c:350
2619 msgid "Refusing to rewrite notes in %s (outside of refs/notes/)"
2622 #. TRANSLATORS: The first %s is the name of the
2623 #. environment variable, the second %s is its value
2624 #: builtin/notes.c:377
2626 msgid "Bad %s value: '%s'"
2629 #: builtin/notes.c:441
2631 msgid "Malformed input line: '%s'."
2634 #: builtin/notes.c:456
2636 msgid "Failed to copy notes from '%s' to '%s'"
2639 #: builtin/notes.c:500 builtin/notes.c:554 builtin/notes.c:627
2640 #: builtin/notes.c:639 builtin/notes.c:712 builtin/notes.c:759
2641 #: builtin/notes.c:1033
2642 msgid "too many parameters"
2645 #: builtin/notes.c:513 builtin/notes.c:772
2647 msgid "No note found for object %s."
2650 #: builtin/notes.c:580
2653 "Cannot add notes. Found existing notes for object %s. Use '-f' to overwrite "
2657 #: builtin/notes.c:585 builtin/notes.c:662
2659 msgid "Overwriting existing notes for object %s\n"
2662 #: builtin/notes.c:635
2663 msgid "too few parameters"
2666 #: builtin/notes.c:656
2669 "Cannot copy notes. Found existing notes for object %s. Use '-f' to overwrite "
2673 #: builtin/notes.c:668
2675 msgid "Missing notes on source object %s. Cannot copy."
2678 #: builtin/notes.c:717
2681 "The -m/-F/-c/-C options have been deprecated for the 'edit' subcommand.\n"
2682 "Please use 'git notes add -f -m/-F/-c/-C' instead.\n"
2685 #: builtin/notes.c:971
2687 msgid "Object %s has no note\n"
2690 #: builtin/notes.c:1103
2692 msgid "Unknown subcommand: %s"
2695 #: builtin/pack-objects.c:2310
2697 msgid "unsupported index version %s"
2700 #: builtin/pack-objects.c:2314
2702 msgid "bad index version '%s'"
2705 #: builtin/pack-objects.c:2322
2707 msgid "option %s does not accept negative form"
2710 #: builtin/pack-objects.c:2326
2712 msgid "unable to parse value '%s' for option %s"
2715 #: builtin/push.c:45
2716 msgid "tag shorthand without <tag>"
2719 #: builtin/push.c:64
2720 msgid "--delete only accepts plain target ref names"
2723 #: builtin/push.c:84
2726 "You are not currently on a branch.\n"
2727 "To push the history leading to the current (detached HEAD)\n"
2730 " git push %s HEAD:<name-of-remote-branch>\n"
2733 #: builtin/push.c:91
2736 "The current branch %s has no upstream branch.\n"
2737 "To push the current branch and set the remote as upstream, use\n"
2739 " git push --set-upstream %s %s\n"
2742 #: builtin/push.c:99
2744 msgid "The current branch %s has multiple upstream branches, refusing to push."
2747 #: builtin/push.c:102
2750 "You are pushing to remote '%s', which is not the upstream of\n"
2751 "your current branch '%s', without telling me what to push\n"
2752 "to update which remote branch."
2755 #: builtin/push.c:131
2757 "You didn't specify any refspecs to push, and push.default is \"nothing\"."
2760 #: builtin/push.c:138
2762 "Updates were rejected because the tip of your current branch is behind\n"
2763 "its remote counterpart. Merge the remote changes (e.g. 'git pull')\n"
2764 "before pushing again.\n"
2765 "See the 'Note about fast-forwards' in 'git push --help' for details."
2768 #: builtin/push.c:144
2770 "Updates were rejected because a pushed branch tip is behind its remote\n"
2771 "counterpart. If you did not intend to push that branch, you may want to\n"
2772 "specify branches to push or set the 'push.default' configuration\n"
2773 "variable to 'current' or 'upstream' to push only the current branch."
2776 #: builtin/push.c:150
2778 "Updates were rejected because a pushed branch tip is behind its remote\n"
2779 "counterpart. Check out this branch and merge the remote changes\n"
2780 "(e.g. 'git pull') before pushing again.\n"
2781 "See the 'Note about fast-forwards' in 'git push --help' for details."
2784 #: builtin/push.c:190
2786 msgid "Pushing to %s\n"
2789 #: builtin/push.c:194
2791 msgid "failed to push some refs to '%s'"
2794 #: builtin/push.c:226
2796 msgid "bad repository '%s'"
2799 #: builtin/push.c:227
2801 "No configured push destination.\n"
2802 "Either specify the URL from the command-line or configure a remote "
2803 "repository using\n"
2805 " git remote add <name> <url>\n"
2807 "and then push using the remote name\n"
2809 " git push <name>\n"
2812 #: builtin/push.c:242
2813 msgid "--all and --tags are incompatible"
2816 #: builtin/push.c:243
2817 msgid "--all can't be combined with refspecs"
2820 #: builtin/push.c:248
2821 msgid "--mirror and --tags are incompatible"
2824 #: builtin/push.c:249
2825 msgid "--mirror can't be combined with refspecs"
2828 #: builtin/push.c:254
2829 msgid "--all and --mirror are incompatible"
2832 #: builtin/push.c:342
2833 msgid "--delete is incompatible with --all, --mirror and --tags"
2836 #: builtin/push.c:344
2837 msgid "--delete doesn't make sense without any refs"
2840 #: builtin/reset.c:33
2844 #: builtin/reset.c:33
2848 #: builtin/reset.c:33
2852 #: builtin/reset.c:33
2856 #: builtin/reset.c:77
2857 msgid "You do not have a valid HEAD."
2860 #: builtin/reset.c:79
2861 msgid "Failed to find tree of HEAD."
2864 #: builtin/reset.c:85
2866 msgid "Failed to find tree of %s."
2869 #: builtin/reset.c:96
2870 msgid "Could not write new index file."
2873 #: builtin/reset.c:106
2875 msgid "HEAD is now at %s"
2878 #: builtin/reset.c:130
2879 msgid "Could not read index"
2882 #: builtin/reset.c:133
2883 msgid "Unstaged changes after reset:"
2886 #: builtin/reset.c:223
2888 msgid "Cannot do a %s reset in the middle of a merge."
2891 #: builtin/reset.c:297
2893 msgid "Could not parse object '%s'."
2896 #: builtin/reset.c:302
2897 msgid "--patch is incompatible with --{hard,mixed,soft}"
2900 #: builtin/reset.c:311
2901 msgid "--mixed with paths is deprecated; use 'git reset -- <paths>' instead."
2904 #: builtin/reset.c:313
2906 msgid "Cannot do %s reset with paths."
2909 #: builtin/reset.c:325
2911 msgid "%s reset is not allowed in a bare repository"
2914 #: builtin/reset.c:341
2916 msgid "Could not reset index file to revision '%s'."
2919 #: builtin/revert.c:70 builtin/revert.c:92
2921 msgid "%s: %s cannot be used with %s"
2924 #: builtin/revert.c:127
2925 msgid "program error"
2928 #: builtin/revert.c:213
2929 msgid "revert failed"
2932 #: builtin/revert.c:228
2933 msgid "cherry-pick failed"
2939 "'%s' has staged content different from both the file and the HEAD\n"
2940 "(use -f to force removal)"
2946 "'%s' has changes staged in the index\n"
2947 "(use --cached to keep the file, or -f to force removal)"
2953 "'%s' has local modifications\n"
2954 "(use --cached to keep the file, or -f to force removal)"
2959 msgid "not removing '%s' recursively without -r"
2964 msgid "git rm: unable to remove %s"
2967 #: builtin/shortlog.c:157
2969 msgid "Missing author: %s"
2974 msgid "malformed object at '%s'"
2977 #: builtin/tag.c:205
2979 msgid "tag name too long: %.*s..."
2982 #: builtin/tag.c:210
2984 msgid "tag '%s' not found."
2987 #: builtin/tag.c:225
2989 msgid "Deleted tag '%s' (was %s)\n"
2992 #: builtin/tag.c:237
2994 msgid "could not verify the tag '%s'"
2997 #: builtin/tag.c:247
3001 "# Write a tag message\n"
3002 "# Lines starting with '#' will be ignored.\n"
3006 #: builtin/tag.c:254
3010 "# Write a tag message\n"
3011 "# Lines starting with '#' will be kept; you may remove them yourself if you "
3016 #: builtin/tag.c:294
3017 msgid "unable to sign the tag"
3020 #: builtin/tag.c:296
3021 msgid "unable to write tag file"
3024 #: builtin/tag.c:321
3025 msgid "bad object type."
3028 #: builtin/tag.c:334
3029 msgid "tag header too big."
3032 #: builtin/tag.c:366
3033 msgid "no tag message?"
3036 #: builtin/tag.c:372
3038 msgid "The tag message has been left in %s\n"
3041 #: builtin/tag.c:421
3042 msgid "switch 'points-at' requires an object"
3045 #: builtin/tag.c:423
3047 msgid "malformed object name '%s'"
3050 #: builtin/tag.c:502
3051 msgid "-n option is only allowed with -l."
3054 #: builtin/tag.c:504
3055 msgid "--contains option is only allowed with -l."
3058 #: builtin/tag.c:506
3059 msgid "--points-at option is only allowed with -l."
3062 #: builtin/tag.c:514
3063 msgid "only one -F or -m option is allowed."
3066 #: builtin/tag.c:534
3067 msgid "too many params"
3070 #: builtin/tag.c:540
3072 msgid "'%s' is not a valid tag name."
3075 #: builtin/tag.c:545
3077 msgid "tag '%s' already exists"
3080 #: builtin/tag.c:563
3082 msgid "%s: cannot lock the ref"
3085 #: builtin/tag.c:565
3087 msgid "%s: cannot update the ref"
3090 #: builtin/tag.c:567
3092 msgid "Updated tag '%s' (was %s)\n"
3096 msgid "You need to set your committer info first"
3100 msgid "Repository lacks necessary blobs to fall back on 3-way merge."
3105 "Did you hand edit your patch?\n"
3106 "It does not apply to blobs recorded in its index."
3110 msgid "Falling back to patching base and 3-way merge..."
3114 msgid "Only one StGIT patch series can be applied at once"
3119 msgid "Patch format $patch_format is not supported."
3123 msgid "Patch format detection failed."
3127 msgid "-d option is no longer supported. Do not use."
3132 msgid "previous rebase directory $dotest still exists but mbox given."
3136 msgid "Please make up your mind. --skip or --abort?"
3140 msgid "Resolve operation not in progress, we are not resuming."
3145 msgid "Dirty index: cannot apply patches (dirty: $files)"
3149 msgid "cannot be interactive without stdin connected to a terminal."
3152 #. TRANSLATORS: Make sure to include [y], [n], [e], [v] and [a]
3153 #. in your translation. The program will only accept English
3154 #. input at this point.
3156 msgid "Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all "
3161 msgid "Applying: $FIRSTLINE"
3165 msgid "No changes -- Patch already applied."
3169 msgid "applying to an empty history"
3172 #. TRANSLATORS: Make sure to include [Y] and [n] in your
3173 #. translation. The program will only accept English input
3176 msgid "Do you want me to do it for you [Y/n]? "
3181 msgid "unrecognised option: '$arg'"
3186 msgid "'$arg' does not appear to be a valid revision"
3189 #: git-bisect.sh:117
3190 msgid "Bad HEAD - I need a HEAD"
3193 #: git-bisect.sh:130
3196 "Checking out '$start_head' failed. Try 'git bisect reset <validbranch>'."
3199 #: git-bisect.sh:140
3200 msgid "won't bisect on seeked tree"
3203 #: git-bisect.sh:144
3204 msgid "Bad HEAD - strange symbolic ref"
3207 #: git-bisect.sh:189
3209 msgid "Bad bisect_write argument: $state"
3212 #: git-bisect.sh:218
3214 msgid "Bad rev input: $arg"
3217 #: git-bisect.sh:232
3218 msgid "Please call 'bisect_state' with at least one argument."
3221 #: git-bisect.sh:244
3223 msgid "Bad rev input: $rev"
3226 #: git-bisect.sh:250
3227 msgid "'git bisect bad' can take only one argument."
3230 #. TRANSLATORS: Make sure to include [Y] and [n] in your
3231 #. translation. The program will only accept English input
3233 #: git-bisect.sh:279
3234 msgid "Are you sure [Y/n]? "
3237 #: git-bisect.sh:354
3239 msgid "'$invalid' is not a valid commit"
3242 #: git-bisect.sh:363
3245 "Could not check out original HEAD '$branch'.\n"
3246 "Try 'git bisect reset <commit>'."
3249 #: git-bisect.sh:390
3250 msgid "No logfile given"
3253 #: git-bisect.sh:391
3255 msgid "cannot read $file for replaying"
3258 #: git-bisect.sh:408
3259 msgid "?? what are you talking about?"
3262 #: git-bisect.sh:474
3263 msgid "We are not bisecting."
3268 "Pull is not possible because you have unmerged files.\n"
3269 "Please, fix them up in the work tree, and then use 'git add/rm <file>'\n"
3270 "as appropriate to mark resolution, or use 'git commit -a'."
3274 msgid "Pull is not possible because you have unmerged files."
3278 msgid "updating an unborn branch with changes added to the index"
3282 msgid "Cannot merge multiple branches into empty head"
3286 msgid "Cannot rebase onto multiple branches"
3290 msgid "git stash clear with parameters is unimplemented"
3294 msgid "You do not have the initial commit yet"
3298 msgid "Cannot save the current index state"
3301 #: git-stash.sh:123 git-stash.sh:136
3302 msgid "Cannot save the current worktree state"
3306 msgid "No changes selected"
3310 msgid "Cannot remove temporary index (can't happen)"
3314 msgid "Cannot record working tree state"
3318 msgid "No local changes to save"
3322 msgid "Cannot initialize stash"
3326 msgid "Cannot save the current status"
3330 msgid "Cannot remove worktree changes"
3334 msgid "No stash found."
3339 msgid "Too many revisions specified: $REV"
3344 msgid "$reference is not valid reference"
3349 msgid "'$args' is not a stash-like commit"
3354 msgid "'$args' is not a stash reference"
3358 msgid "unable to refresh index"
3362 msgid "Cannot apply a stash in the middle of a merge"
3366 msgid "Conflicts in index. Try without --index."
3370 msgid "Could not save index tree"
3374 msgid "Cannot unstage modified files"
3379 msgid "Dropped ${REV} ($s)"
3384 msgid "${REV}: Could not drop stash entry"
3388 msgid "No branch name specified"
3392 msgid "(To restore them type \"git stash apply\")"
3395 #: git-submodule.sh:56
3397 msgid "cannot strip one component off url '$remoteurl'"
3400 #: git-submodule.sh:109
3402 msgid "No submodule mapping found in .gitmodules for path '$sm_path'"
3405 #: git-submodule.sh:150
3407 msgid "Clone of '$url' into submodule path '$sm_path' failed"
3410 #: git-submodule.sh:160
3412 msgid "Gitdir '$a' is part of the submodule path '$b' or vice versa"
3415 #: git-submodule.sh:249
3417 msgid "repo URL: '$repo' must be absolute or begin with ./|../"
3420 #: git-submodule.sh:266
3422 msgid "'$sm_path' already exists in the index"
3425 #: git-submodule.sh:283
3427 msgid "'$sm_path' already exists and is not a valid git repo"
3430 #: git-submodule.sh:297
3432 msgid "Unable to checkout submodule '$sm_path'"
3435 #: git-submodule.sh:302
3437 msgid "Failed to add submodule '$sm_path'"
3440 #: git-submodule.sh:307
3442 msgid "Failed to register submodule '$sm_path'"
3445 #: git-submodule.sh:349
3447 msgid "Entering '$prefix$sm_path'"
3450 #: git-submodule.sh:363
3452 msgid "Stopping at '$sm_path'; script returned non-zero status."
3455 #: git-submodule.sh:405
3457 msgid "No url found for submodule path '$sm_path' in .gitmodules"
3460 #: git-submodule.sh:414
3462 msgid "Failed to register url for submodule path '$sm_path'"
3465 #: git-submodule.sh:422
3467 msgid "Failed to register update mode for submodule path '$sm_path'"
3470 #: git-submodule.sh:424
3472 msgid "Submodule '$name' ($url) registered for path '$sm_path'"
3475 #: git-submodule.sh:523
3478 "Submodule path '$sm_path' not initialized\n"
3479 "Maybe you want to use 'update --init'?"
3482 #: git-submodule.sh:536
3484 msgid "Unable to find current revision in submodule path '$sm_path'"
3487 #: git-submodule.sh:555
3489 msgid "Unable to fetch in submodule path '$sm_path'"
3492 #: git-submodule.sh:569
3494 msgid "Unable to rebase '$sha1' in submodule path '$sm_path'"
3497 #: git-submodule.sh:570
3499 msgid "Submodule path '$sm_path': rebased into '$sha1'"
3502 #: git-submodule.sh:575
3504 msgid "Unable to merge '$sha1' in submodule path '$sm_path'"
3507 #: git-submodule.sh:576
3509 msgid "Submodule path '$sm_path': merged in '$sha1'"
3512 #: git-submodule.sh:581
3514 msgid "Unable to checkout '$sha1' in submodule path '$sm_path'"
3517 #: git-submodule.sh:582
3519 msgid "Submodule path '$sm_path': checked out '$sha1'"
3522 #: git-submodule.sh:604 git-submodule.sh:927
3524 msgid "Failed to recurse into submodule path '$sm_path'"
3527 #: git-submodule.sh:712
3531 #: git-submodule.sh:770
3533 msgid " Warn: $name doesn't contain commit $sha1_src"
3536 #: git-submodule.sh:773
3538 msgid " Warn: $name doesn't contain commit $sha1_dst"
3541 #: git-submodule.sh:776
3543 msgid " Warn: $name doesn't contain commits $sha1_src and $sha1_dst"
3546 #: git-submodule.sh:801
3550 #: git-submodule.sh:802
3554 #: git-submodule.sh:973
3556 msgid "Synchronizing submodule url for '$name'"