development/git
development/git
1
0
Fork 0
mirror of https://github.com/git/git synced 2024-11-05 18:59:29 +00:00
Code Issues Projects Releases Packages Wiki Activity

i18n: git-reset basic messages

Browse source 
Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Ævar Arnfjörð Bjarmason 2011-02-22 23:42:06 +00:00 committed by Junio C Hamano
parent b9b537f7dc
commit b50a64e818
1 changed files with 13 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
builtin/reset.c
View file

@ -92,20 +92,20 @@ static int reset_index_file(const unsigned char *sha1, int reset_type, int quiet
if (reset_type == KEEP) { if (reset_type == KEEP) {
unsigned char head_sha1[20]; unsigned char head_sha1[20];
if (get_sha1("HEAD", head_sha1)) if (get_sha1("HEAD", head_sha1))
return error("You do not have a valid HEAD."); return error(_("You do not have a valid HEAD."));
if (!fill_tree_descriptor(desc, head_sha1)) if (!fill_tree_descriptor(desc, head_sha1))
return error("Failed to find tree of HEAD."); return error(_("Failed to find tree of HEAD."));
nr++; nr++;
opts.fn = twoway_merge; opts.fn = twoway_merge;
} }
if (!fill_tree_descriptor(desc + nr - 1, sha1)) if (!fill_tree_descriptor(desc + nr - 1, sha1))
return error("Failed to find tree of %s.", sha1_to_hex(sha1)); return error(_("Failed to find tree of %s."), sha1_to_hex(sha1));
if (unpack_trees(nr, desc, &opts)) if (unpack_trees(nr, desc, &opts))
return -1; return -1;
if (write_cache(newfd, active_cache, active_nr) || if (write_cache(newfd, active_cache, active_nr) ||
commit_locked_index(lock)) commit_locked_index(lock))
return error("Could not write new index file."); return error(_("Could not write new index file."));
return 0; return 0;
} }
@ -115,7 +115,7 @@ static void print_new_head_line(struct commit *commit)
const char *hex, *body; const char *hex, *body;
hex = find_unique_abbrev(commit->object.sha1, DEFAULT_ABBREV); hex = find_unique_abbrev(commit->object.sha1, DEFAULT_ABBREV);
printf("HEAD is now at %s", hex); printf(_("HEAD is now at %s"), hex);
body = strstr(commit->buffer, "\n\n"); body = strstr(commit->buffer, "\n\n");
if (body) { if (body) {
const char *eol; const char *eol;
@ -139,7 +139,7 @@ static int update_index_refresh(int fd, struct lock_file *index_lock, int flags)
} }
if (read_cache() < 0) if (read_cache() < 0)
return error("Could not read index"); return error(_("Could not read index"));
result = refresh_index(&the_index, (flags), NULL, NULL, result = refresh_index(&the_index, (flags), NULL, NULL,
"Unstaged changes after reset:") ? 1 : 0; "Unstaged changes after reset:") ? 1 : 0;
@ -167,7 +167,7 @@ static void update_index_from_diff(struct diff_queue_struct *q,
ce = make_cache_entry(one->mode, one->sha1, one->path, ce = make_cache_entry(one->mode, one->sha1, one->path,
0, 0); 0, 0);
if (!ce) if (!ce)
die("make_cache_entry failed for path '%s'", die(_("make_cache_entry failed for path '%s'"),
one->path); one->path);
add_cache_entry(ce, ADD_CACHE_OK_TO_ADD | add_cache_entry(ce, ADD_CACHE_OK_TO_ADD |
ADD_CACHE_OK_TO_REPLACE); ADD_CACHE_OK_TO_REPLACE);
@ -222,7 +222,7 @@ static void prepend_reflog_action(const char *action, char *buf, size_t size)
if (!rla) if (!rla)
rla = sep = ""; rla = sep = "";
if (snprintf(buf, size, "%s%s%s", rla, sep, action) >= size) if (snprintf(buf, size, "%s%s%s", rla, sep, action) >= size)
warning("Reflog action message too long: %.*s...", 50, buf); warning(_("Reflog action message too long: %.*s..."), 50, buf);
} }
static void die_if_unmerged_cache(int reset_type) static void die_if_unmerged_cache(int reset_type)
@ -300,16 +300,16 @@ int cmd_reset(int argc, const char **argv, const char *prefix)
} }
if (get_sha1(rev, sha1)) if (get_sha1(rev, sha1))
die("Failed to resolve '%s' as a valid ref.", rev); die(_("Failed to resolve '%s' as a valid ref."), rev);
commit = lookup_commit_reference(sha1); commit = lookup_commit_reference(sha1);
if (!commit) if (!commit)
die("Could not parse object '%s'.", rev); die(_("Could not parse object '%s'."), rev);
hashcpy(sha1, commit->object.sha1); hashcpy(sha1, commit->object.sha1);
if (patch_mode) { if (patch_mode) {
if (reset_type != NONE) if (reset_type != NONE)
die("--patch is incompatible with --{hard,mixed,soft}"); die(_("--patch is incompatible with --{hard,mixed,soft}"));
return interactive_reset(rev, argv + i, prefix); return interactive_reset(rev, argv + i, prefix);
} }
@ -318,7 +318,7 @@ int cmd_reset(int argc, const char **argv, const char *prefix)
* affecting the working tree nor HEAD. */ * affecting the working tree nor HEAD. */
if (i < argc) { if (i < argc) {
if (reset_type == MIXED) if (reset_type == MIXED)
warning("--mixed with paths is deprecated; use 'git reset -- <paths>' instead."); warning(_("--mixed with paths is deprecated; use 'git reset -- <paths>' instead."));
else if (reset_type != NONE) else if (reset_type != NONE)
die("Cannot do %s reset with paths.", die("Cannot do %s reset with paths.",
reset_type_names[reset_type]); reset_type_names[reset_type]);
@ -348,7 +348,7 @@ int cmd_reset(int argc, const char **argv, const char *prefix)
if (reset_type == KEEP) if (reset_type == KEEP)
err = err || reset_index_file(sha1, MIXED, quiet); err = err || reset_index_file(sha1, MIXED, quiet);
if (err) if (err)
die("Could not reset index file to revision '%s'.", rev); die(_("Could not reset index file to revision '%s'."), rev);
} }
/* Any resets update HEAD to the head being switched to, /* Any resets update HEAD to the head being switched to,