Re: [PATCH] Collocate strings to simplify translation
On 05/24/2012 09:41 AM, Vincent van Ravesteijn wrote:
Show 18 quoted lines
> The translation of 'Untracked' and 'Ignored' might depend on the following
> word. To help the translator, this patch collocates the term 'files'.
>
> Signed-off-by: Vincent van Ravesteijn <vfr@lyx.org>
> ---
> wt-status.c | 6 +++---
> 1 files changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/wt-status.c b/wt-status.c
> index dd6d8c4..9b65a8c 100644
> --- a/wt-status.c
> +++ b/wt-status.c
> @@ -185,7 +185,7 @@ static void wt_status_print_other_header(struct wt_status *s,
> const char *how)
> {
> const char *c = color(WT_STATUS_HEADER, s);
> - status_printf_ln(s, c, _("%s files:"), what);
> + status_printf_ln(s, c, _("%s:"), what);How can "%s:" be translated? _() should be removed here.
Show 12 quoted lines
> if (!advice_status_hints)
> return;
> status_printf_ln(s, c, _(" (use \"git %s <file>...\" to include in what will be committed)"), how);
> @@ -766,9 +766,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 files"), "add");
> if (s->show_ignored_files)
> - wt_status_print_other(s, &s->ignored, _("Ignored"), "add -f");
> + wt_status_print_other(s, &s->ignored, _("Ignored files"), "add -f");This part is looks sensible.
> } else if (s->commitable)
> status_printf_ln(s, GIT_COLOR_NORMAL, _("Untracked files not listed%s"),
> advice_status_hints