On Sun, Sep 12, 2010 at 20:09, Peter Krefting <peter@xxxxxxxxxxxxxxxx> wrote:
First off, thanks for contributing to this.
> - t = init_notes_check(N_("list"));
> + t = init_notes_check("list");
> - t = init_notes_check(N_("add"));
> + t = init_notes_check("add");
> - t = init_notes_check(N_("copy"));
> + t = init_notes_check("copy");
> - t = init_notes_check(N_("show"));
> + t = init_notes_check("show");
> - t = init_notes_check(N_("remove"));
> + t = init_notes_check("remove");
> - t = init_notes_check(N_("prune"));
> + t = init_notes_check("prune");
I disagree with all those. These don't end up being used in a context like:
die("git-%s: error ...", command);
But:
die(_("Refusing to %s notes in %s (outside of refs/notes/)"),
_(subcommand), t->ref);
I.e. here the git notes command name should be translated as a verb in
the native language (or not, that's up to the translator). E.g. I'd
translate that as:
add: Neita að bæta við
copy: Neita að afrita
etc. into Icelandic. Other languages will probably also want to
translate that.
> prune_notes(t, (verbose ? NOTES_PRUNE_VERBOSE : 0) |
> (show_only ? NOTES_PRUNE_VERBOSE|NOTES_PRUNE_DRYRUN : 0) );
> diff --git a/wt-status.c b/wt-status.c
> index f6946e1..7d4719f 100644
> --- a/wt-status.c
> +++ b/wt-status.c
> @@ -663,9 +663,9 @@ void wt_status_print(struct wt_status *s)
> wt_status_print_submodule_summary(s, 1); /* unstaged */
> }
> if (s->show_untracked_files) {
> - wt_status_print_other(s, &s->untracked, _("Untracked"), _("add"));
> + wt_status_print_other(s, &s->untracked, _("Untracked"), "add");
> if (s->show_ignored_files)
> - wt_status_print_other(s, &s->ignored, _("Ignored"), _("add -f"));
> + wt_status_print_other(s, &s->ignored, _("Ignored"), "add -f");
> } else if (s->commitable)
> fprintf(s->fp, _("# Untracked files not listed%s\n"),
> advice_status_hints
These however are good, because here it gets used as:
color_fprintf_ln(s->fp, c, _("# (use \"git %s <file>...\" to
include in what will be committed)"), how);
I.e. this is purely a hardcoded command name.
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html