diff options
| author | Junio C Hamano <gitster@pobox.com> | 2011-04-15 13:25:50 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-04-15 13:27:04 -0700 |
| commit | ed44fd045a8a4bcf7f30a47e4fc6aba761faaf78 (patch) | |
| tree | ccc8afe7eb85ec89347047f8e3fb5ff7f4c2f6a6 /builtin/bundle.c | |
| parent | e0d48279d5a96bc02edac72c1d28fc38aed37c15 (diff) | |
| parent | 4d8b32a2e1758236c4c1b714f179892e3bce982c (diff) | |
| download | git-ed44fd045a8a4bcf7f30a47e4fc6aba761faaf78.tar.gz git-ed44fd045a8a4bcf7f30a47e4fc6aba761faaf78.tar.xz | |
Merge v1.7.5-rc2 into jn/format-patch-doc
This is to sync with the recent updates in Documentation/SubmittingPatches
and Documentation/format-patch.txt
Diffstat (limited to 'builtin/bundle.c')
| -rw-r--r-- | builtin/bundle.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/builtin/bundle.c b/builtin/bundle.c index 9b87fb9ac..81046a9cb 100644 --- a/builtin/bundle.c +++ b/builtin/bundle.c @@ -44,7 +44,7 @@ int cmd_bundle(int argc, const char **argv, const char *prefix) close(bundle_fd); if (verify_bundle(&header, 1)) return 1; - fprintf(stderr, "%s is okay\n", bundle_file); + fprintf(stderr, _("%s is okay\n"), bundle_file); return 0; } if (!strcmp(cmd, "list-heads")) { @@ -53,11 +53,11 @@ int cmd_bundle(int argc, const char **argv, const char *prefix) } if (!strcmp(cmd, "create")) { if (!startup_info->have_repository) - die("Need a repository to create a bundle."); + die(_("Need a repository to create a bundle.")); return !!create_bundle(&header, bundle_file, argc, argv); } else if (!strcmp(cmd, "unbundle")) { if (!startup_info->have_repository) - die("Need a repository to unbundle."); + die(_("Need a repository to unbundle.")); return !!unbundle(&header, bundle_fd) || list_bundle_refs(&header, argc, argv); } else |