development/git
development/git
1
0
Fork 0
mirror of https://github.com/git/git synced 2024-08-27 19:49:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

i18n: git-add basic messages

Browse source 
Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Ævar Arnfjörð Bjarmason 2011-02-22 23:41:29 +00:00 committed by Junio C Hamano
parent 5cde59895f
commit 990ac4be0a
1 changed files with 18 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

36
builtin/add.c
View file

@ -38,7 +38,7 @@ static void update_callback(struct diff_queue_struct *q,
const char *path = p->one->path; const char *path = p->one->path;
switch (p->status) { switch (p->status) {
default: default:
die("unexpected diff status %c", p->status); die(_("unexpected diff status %c"), p->status);
case DIFF_STATUS_UNMERGED: case DIFF_STATUS_UNMERGED:
/* /*
* ADD_CACHE_IGNORE_REMOVAL is unset if "git * ADD_CACHE_IGNORE_REMOVAL is unset if "git
@ -64,7 +64,7 @@ static void update_callback(struct diff_queue_struct *q,
case DIFF_STATUS_TYPE_CHANGED: case DIFF_STATUS_TYPE_CHANGED:
if (add_file_to_index(&the_index, path, data->flags)) { if (add_file_to_index(&the_index, path, data->flags)) {
if (!(data->flags & ADD_CACHE_IGNORE_ERRORS)) if (!(data->flags & ADD_CACHE_IGNORE_ERRORS))
die("updating files failed"); die(_("updating files failed"));
data->add_errors++; data->add_errors++;
} }
break; break;
@ -172,7 +172,7 @@ static void treat_gitlinks(const char **pathspec)
/* strip trailing slash */ /* strip trailing slash */
pathspec[j] = xstrndup(ce->name, len); pathspec[j] = xstrndup(ce->name, len);
else else
die ("Path '%s' is in submodule '%.*s'", die (_("Path '%s' is in submodule '%.*s'"),
pathspec[j], len, ce->name); pathspec[j], len, ce->name);
} }
} }
@ -191,7 +191,7 @@ static void refresh(int verbose, const char **pathspec)
pathspec, seen, "Unstaged changes after refreshing the index:"); pathspec, seen, "Unstaged changes after refreshing the index:");
for (i = 0; i < specs; i++) { for (i = 0; i < specs; i++) {
if (!seen[i]) if (!seen[i])
die("pathspec '%s' did not match any files", pathspec[i]); die(_("pathspec '%s' did not match any files"), pathspec[i]);
} }
free(seen); free(seen);
} }
@ -205,7 +205,7 @@ static const char **validate_pathspec(int argc, const char **argv, const char *p
for (p = pathspec; *p; p++) { for (p = pathspec; *p; p++) {
if (has_symlink_leading_path(*p, strlen(*p))) { if (has_symlink_leading_path(*p, strlen(*p))) {
int len = prefix ? strlen(prefix) : 0; int len = prefix ? strlen(prefix) : 0;
die("'%s' is beyond a symbolic link", *p + len); die(_("'%s' is beyond a symbolic link"), *p + len);
} }
} }
} }
@ -272,7 +272,7 @@ static int edit_patch(int argc, const char **argv, const char *prefix)
git_config(git_diff_basic_config, NULL); /* no "diff" UI options */ git_config(git_diff_basic_config, NULL); /* no "diff" UI options */
if (read_cache() < 0) if (read_cache() < 0)
die ("Could not read the index"); die (_("Could not read the index"));
init_revisions(&rev, prefix); init_revisions(&rev, prefix);
rev.diffopt.context = 7; rev.diffopt.context = 7;
@ -281,24 +281,24 @@ static int edit_patch(int argc, const char **argv, const char *prefix)
rev.diffopt.output_format = DIFF_FORMAT_PATCH; rev.diffopt.output_format = DIFF_FORMAT_PATCH;
out = open(file, O_CREAT | O_WRONLY, 0644); out = open(file, O_CREAT | O_WRONLY, 0644);
if (out < 0) if (out < 0)
die ("Could not open '%s' for writing.", file); die (_("Could not open '%s' for writing."), file);
rev.diffopt.file = xfdopen(out, "w"); rev.diffopt.file = xfdopen(out, "w");
rev.diffopt.close_file = 1; rev.diffopt.close_file = 1;
if (run_diff_files(&rev, 0)) if (run_diff_files(&rev, 0))
die ("Could not write patch"); die (_("Could not write patch"));
launch_editor(file, NULL, NULL); launch_editor(file, NULL, NULL);
if (stat(file, &st)) if (stat(file, &st))
die_errno("Could not stat '%s'", file); die_errno(_("Could not stat '%s'"), file);
if (!st.st_size) if (!st.st_size)
die("Empty patch. Aborted."); die(_("Empty patch. Aborted."));
memset(&child, 0, sizeof(child)); memset(&child, 0, sizeof(child));
child.git_cmd = 1; child.git_cmd = 1;
child.argv = apply_argv; child.argv = apply_argv;
if (run_command(&child)) if (run_command(&child))
die ("Could not apply '%s'", file); die (_("Could not apply '%s'"), file);
unlink(file); unlink(file);
return 0; return 0;
@ -354,7 +354,7 @@ static int add_files(struct dir_struct *dir, int flags)
for (i = 0; i < dir->nr; i++) for (i = 0; i < dir->nr; i++)
if (add_file_to_cache(dir->entries[i]->name, flags)) { if (add_file_to_cache(dir->entries[i]->name, flags)) {
if (!ignore_add_errors) if (!ignore_add_errors)
die("adding files failed"); die(_("adding files failed"));
exit_status = 1; exit_status = 1;
} }
return exit_status; return exit_status;
@ -386,9 +386,9 @@ int cmd_add(int argc, const char **argv, const char *prefix)
argv++; argv++;
if (addremove && take_worktree_changes) if (addremove && take_worktree_changes)
die("-A and -u are mutually incompatible"); die(_("-A and -u are mutually incompatible"));
if (!show_only && ignore_missing) if (!show_only && ignore_missing)
die("Option --ignore-missing can only be used together with --dry-run"); die(_("Option --ignore-missing can only be used together with --dry-run"));
if ((addremove || take_worktree_changes) && !argc) { if ((addremove || take_worktree_changes) && !argc) {
static const char *here[2] = { ".", NULL }; static const char *here[2] = { ".", NULL };
argc = 1; argc = 1;
@ -408,14 +408,14 @@ int cmd_add(int argc, const char **argv, const char *prefix)
? ADD_CACHE_IGNORE_REMOVAL : 0)); ? ADD_CACHE_IGNORE_REMOVAL : 0));
if (require_pathspec && argc == 0) { if (require_pathspec && argc == 0) {
fprintf(stderr, "Nothing specified, nothing added.\n"); fprintf(stderr, _("Nothing specified, nothing added.\n"));
fprintf(stderr, "Maybe you wanted to say 'git add .'?\n"); fprintf(stderr, _("Maybe you wanted to say 'git add .'?\n"));
return 0; return 0;
} }
pathspec = validate_pathspec(argc, argv, prefix); pathspec = validate_pathspec(argc, argv, prefix);
if (read_cache() < 0) if (read_cache() < 0)
die("index file corrupt"); die(_("index file corrupt"));
treat_gitlinks(pathspec); treat_gitlinks(pathspec);
if (add_new_files) { if (add_new_files) {
@ -467,7 +467,7 @@ int cmd_add(int argc, const char **argv, const char *prefix)
if (active_cache_changed) { if (active_cache_changed) {
if (write_cache(newfd, active_cache, active_nr) || if (write_cache(newfd, active_cache, active_nr) ||
commit_locked_index(&lock_file)) commit_locked_index(&lock_file))
die("Unable to write new index file"); die(_("Unable to write new index file"));
} }
return exit_status; return exit_status;