* [PATCH] Collocate strings to simplify translation
@ 2012-05-24 7:41 Vincent van Ravesteijn
2012-05-24 8:32 ` Zbigniew Jędrzejewski-Szmek
0 siblings, 1 reply; 5+ messages in thread
From: Vincent van Ravesteijn @ 2012-05-24 7:41 UTC (permalink / raw)
To: git; +Cc: Vincent van Ravesteijn
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);
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");
} else if (s->commitable)
status_printf_ln(s, GIT_COLOR_NORMAL, _("Untracked files not listed%s"),
advice_status_hints
--
1.7.9.msysgit.0
^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: [PATCH] Collocate strings to simplify translation
2012-05-24 7:41 [PATCH] Collocate strings to simplify translation Vincent van Ravesteijn
@ 2012-05-24 8:32 ` Zbigniew Jędrzejewski-Szmek
2012-05-24 9:55 ` Vincent van Ravesteijn
0 siblings, 1 reply; 5+ messages in thread
From: Zbigniew Jędrzejewski-Szmek @ 2012-05-24 8:32 UTC (permalink / raw)
To: Vincent van Ravesteijn; +Cc: git
On 05/24/2012 09:41 AM, Vincent van Ravesteijn wrote:
> 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.
> 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
Zbyszek
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH] Collocate strings to simplify translation
2012-05-24 8:32 ` Zbigniew Jędrzejewski-Szmek
@ 2012-05-24 9:55 ` Vincent van Ravesteijn
2012-05-24 12:20 ` Johannes Sixt
0 siblings, 1 reply; 5+ messages in thread
From: Vincent van Ravesteijn @ 2012-05-24 9:55 UTC (permalink / raw)
To: Zbigniew Jędrzejewski-Szmek; +Cc: git
Op 24-5-2012 10:32, Zbigniew Jędrzejewski-Szmek schreef:
> On 05/24/2012 09:41 AM, Vincent van Ravesteijn wrote:
>> 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.
Some languages might use a character different from ':'. For example,
Chinese uses a full-width character ':' (unicode 0xFF1A) instead of a
half-width character. Maybe this is taken care of by the system/shell or
whatever, maybe not. Other examples are languages that read from right
to left. I guess it should then be translated by ":%s".
This will probably be a matter of convention.
Vincent
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH] Collocate strings to simplify translation
2012-05-24 9:55 ` Vincent van Ravesteijn
@ 2012-05-24 12:20 ` Johannes Sixt
2012-05-24 12:34 ` Vincent van Ravesteijn
0 siblings, 1 reply; 5+ messages in thread
From: Johannes Sixt @ 2012-05-24 12:20 UTC (permalink / raw)
To: Vincent van Ravesteijn; +Cc: Zbigniew Jędrzejewski-Szmek, git
Am 5/24/2012 11:55, schrieb Vincent van Ravesteijn:
> Op 24-5-2012 10:32, Zbigniew Jędrzejewski-Szmek schreef:
>> On 05/24/2012 09:41 AM, Vincent van Ravesteijn wrote:
>>> - status_printf_ln(s, c, _("%s files:"), what);
>>> + status_printf_ln(s, c, _("%s:"), what);
>> How can "%s:" be translated? _() should be removed here.
>
> Some languages might use a character different from ':'. For example,
> Chinese uses a full-width character ':' (unicode 0xFF1A) instead of a
> half-width character. Maybe this is taken care of by the system/shell or
> whatever, maybe not. Other examples are languages that read from right to
> left. I guess it should then be translated by ":%s".
>
> This will probably be a matter of convention.
Shouldn't you then move the colon with the "files"? That is, here we have:
- status_printf_ln(s, c, _("%s files:"), what);
+ status_printf_ln(s, c, "%s", what);
and elsewhere we use _("Untracked files:") and _("Ignored files:").
-- Hannes
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH] Collocate strings to simplify translation
2012-05-24 12:20 ` Johannes Sixt
@ 2012-05-24 12:34 ` Vincent van Ravesteijn
0 siblings, 0 replies; 5+ messages in thread
From: Vincent van Ravesteijn @ 2012-05-24 12:34 UTC (permalink / raw)
To: Johannes Sixt; +Cc: Zbigniew Jędrzejewski-Szmek, git
Op 24-5-2012 14:20, Johannes Sixt schreef:
> Am 5/24/2012 11:55, schrieb Vincent van Ravesteijn:
>> Op 24-5-2012 10:32, Zbigniew Jędrzejewski-Szmek schreef:
>>> On 05/24/2012 09:41 AM, Vincent van Ravesteijn wrote:
>>>> - status_printf_ln(s, c, _("%s files:"), what);
>>>> + status_printf_ln(s, c, _("%s:"), what);
>>> How can "%s:" be translated? _() should be removed here.
>> Some languages might use a character different from ':'. For example,
>> Chinese uses a full-width character ':' (unicode 0xFF1A) instead of a
>> half-width character. Maybe this is taken care of by the system/shell or
>> whatever, maybe not. Other examples are languages that read from right to
>> left. I guess it should then be translated by ":%s".
>>
>> This will probably be a matter of convention.
> Shouldn't you then move the colon with the "files"? That is, here we have:
>
> - status_printf_ln(s, c, _("%s files:"), what);
> + status_printf_ln(s, c, "%s", what);
>
> and elsewhere we use _("Untracked files:") and _("Ignored files:").
I would avoid having too many 'decorations' in the strings themselves,
because it is annoying to have to translate "Untracked files",
"untracked files", "untracked files:", " (untracked files)" etc.
Besides, the translation of "%s:" can be reused numerous times.
Just my opinion.
Vincent
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2012-05-24 12:34 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-05-24 7:41 [PATCH] Collocate strings to simplify translation Vincent van Ravesteijn
2012-05-24 8:32 ` Zbigniew Jędrzejewski-Szmek
2012-05-24 9:55 ` Vincent van Ravesteijn
2012-05-24 12:20 ` Johannes Sixt
2012-05-24 12:34 ` Vincent van Ravesteijn
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).