mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

i18n: git-rm basic messages

Browse Source 
Make the basic git-mv messages translatable, but skip things like "rm
'%s'\n" and "git rm '%s'\n" for now.

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:05 +00:00
committed by Junio C Hamano
parent a7d5629fe0
commit b9b537f7dc
1 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
builtin/rm.c
View File

@ -106,19 +106,19 @@ static int check_local_mod(unsigned char *head, int index_only)
*/ */
if (local_changes && staged_changes) { if (local_changes && staged_changes) {
if (!index_only || !(ce->ce_flags & CE_INTENT_TO_ADD)) if (!index_only || !(ce->ce_flags & CE_INTENT_TO_ADD))
errs = error("'%s' has staged content different " errs = error(_("'%s' has staged content different "
"from both the file and the HEAD\n" "from both the file and the HEAD\n"
"(use -f to force removal)", name); "(use -f to force removal)"), name);
} }
else if (!index_only) { else if (!index_only) {
if (staged_changes) if (staged_changes)
errs = error("'%s' has changes staged in the index\n" errs = error(_("'%s' has changes staged in the index\n"
"(use --cached to keep the file, " "(use --cached to keep the file, "
"or -f to force removal)", name); "or -f to force removal)"), name);
if (local_changes) if (local_changes)
errs = error("'%s' has local modifications\n" errs = error(_("'%s' has local modifications\n"
"(use --cached to keep the file, " "(use --cached to keep the file, "
"or -f to force removal)", name); "or -f to force removal)"), name);
} }
} }
return errs; return errs;
@ -159,7 +159,7 @@ int cmd_rm(int argc, const char **argv, const char *prefix)
newfd = hold_locked_index(&lock_file, 1); newfd = hold_locked_index(&lock_file, 1);
if (read_cache() < 0) if (read_cache() < 0)
die("index file corrupt"); die(_("index file corrupt"));
pathspec = get_pathspec(prefix, argv); pathspec = get_pathspec(prefix, argv);
refresh_index(&the_index, REFRESH_QUIET, pathspec, NULL, NULL); refresh_index(&the_index, REFRESH_QUIET, pathspec, NULL, NULL);
@ -183,7 +183,7 @@ int cmd_rm(int argc, const char **argv, const char *prefix)
for (i = 0; (match = pathspec[i]) != NULL ; i++) { for (i = 0; (match = pathspec[i]) != NULL ; i++) {
if (!seen[i]) { if (!seen[i]) {
if (!ignore_unmatch) { if (!ignore_unmatch) {
die("pathspec '%s' did not match any files", die(_("pathspec '%s' did not match any files"),
match); match);
} }
} }
@ -191,7 +191,7 @@ int cmd_rm(int argc, const char **argv, const char *prefix)
seen_any = 1; seen_any = 1;
} }
if (!recursive && seen[i] == MATCHED_RECURSIVELY) if (!recursive && seen[i] == MATCHED_RECURSIVELY)
die("not removing '%s' recursively without -r", die(_("not removing '%s' recursively without -r"),
*match ? match : "."); *match ? match : ".");
} }
@ -227,7 +227,7 @@ int cmd_rm(int argc, const char **argv, const char *prefix)
printf("rm '%s'\n", path); printf("rm '%s'\n", path);
if (remove_file_from_cache(path)) if (remove_file_from_cache(path))
die("git rm: unable to remove %s", path); die(_("git rm: unable to remove %s"), path);
} }
if (show_only) if (show_only)
@ -257,7 +257,7 @@ int cmd_rm(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 0; return 0;