git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH] tag, update-ref: improve description of option "create-reflog"
@ 2015-09-11 16:04 Ralf Thielow
  2015-09-11 16:47 ` Junio C Hamano
  0 siblings, 1 reply; 3+ messages in thread
From: Ralf Thielow @ 2015-09-11 16:04 UTC (permalink / raw)
  To: git; +Cc: gitster, worldhello.net, Ralf Thielow

The description of option "create-reflog" is "create_reflog", which
is neither a good description, nor a sensible string to translate.
Change it to a more meaningful message.

Signed-off-by: Ralf Thielow <ralf.thielow@gmail.com>
---
 builtin/tag.c        | 2 +-
 builtin/update-ref.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/builtin/tag.c b/builtin/tag.c
index cccca99..cba0e22 100644
--- a/builtin/tag.c
+++ b/builtin/tag.c
@@ -606,7 +606,7 @@ int cmd_tag(int argc, const char **argv, const char *prefix)
 		OPT_STRING('u', "local-user", &keyid, N_("key-id"),
 					N_("use another key to sign the tag")),
 		OPT__FORCE(&force, N_("replace the tag if exists")),
-		OPT_BOOL(0, "create-reflog", &create_reflog, N_("create_reflog")),
+		OPT_BOOL(0, "create-reflog", &create_reflog, N_("create a reflog")),
 
 		OPT_GROUP(N_("Tag listing options")),
 		OPT_COLUMN(0, "column", &colopts, N_("show tag list in columns")),
diff --git a/builtin/update-ref.c b/builtin/update-ref.c
index 04dd00f..7f30d3a 100644
--- a/builtin/update-ref.c
+++ b/builtin/update-ref.c
@@ -365,7 +365,7 @@ int cmd_update_ref(int argc, const char **argv, const char *prefix)
 					N_("update <refname> not the one it points to")),
 		OPT_BOOL('z', NULL, &end_null, N_("stdin has NUL-terminated arguments")),
 		OPT_BOOL( 0 , "stdin", &read_stdin, N_("read updates from stdin")),
-		OPT_BOOL( 0 , "create-reflog", &create_reflog, N_("create_reflog")),
+		OPT_BOOL( 0 , "create-reflog", &create_reflog, N_("create a reflog")),
 		OPT_END(),
 	};
 
-- 
2.6.0.rc1.199.g678474c

^ permalink raw reply related	[flat|nested] 3+ messages in thread

* Re: [PATCH] tag, update-ref: improve description of option "create-reflog"
  2015-09-11 16:04 [PATCH] tag, update-ref: improve description of option "create-reflog" Ralf Thielow
@ 2015-09-11 16:47 ` Junio C Hamano
  2015-09-12 15:07   ` Jiang Xin
  0 siblings, 1 reply; 3+ messages in thread
From: Junio C Hamano @ 2015-09-11 16:47 UTC (permalink / raw)
  To: Ralf Thielow; +Cc: git, worldhello.net

Ralf Thielow <ralf.thielow@gmail.com> writes:

> The description of option "create-reflog" is "create_reflog", which
> is neither a good description, nor a sensible string to translate.
> Change it to a more meaningful message.
>
> Signed-off-by: Ralf Thielow <ralf.thielow@gmail.com>
> ---

This definitely is an improvement.  I will assume i18n team is OK
with a change like this this late in the cycle (I see you CC'ed
Jiang) and will merge before the next -rc.

Thanks.

>  builtin/tag.c        | 2 +-
>  builtin/update-ref.c | 2 +-
>  2 files changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/builtin/tag.c b/builtin/tag.c
> index cccca99..cba0e22 100644
> --- a/builtin/tag.c
> +++ b/builtin/tag.c
> @@ -606,7 +606,7 @@ int cmd_tag(int argc, const char **argv, const char *prefix)
>  		OPT_STRING('u', "local-user", &keyid, N_("key-id"),
>  					N_("use another key to sign the tag")),
>  		OPT__FORCE(&force, N_("replace the tag if exists")),
> -		OPT_BOOL(0, "create-reflog", &create_reflog, N_("create_reflog")),
> +		OPT_BOOL(0, "create-reflog", &create_reflog, N_("create a reflog")),
>  
>  		OPT_GROUP(N_("Tag listing options")),
>  		OPT_COLUMN(0, "column", &colopts, N_("show tag list in columns")),
> diff --git a/builtin/update-ref.c b/builtin/update-ref.c
> index 04dd00f..7f30d3a 100644
> --- a/builtin/update-ref.c
> +++ b/builtin/update-ref.c
> @@ -365,7 +365,7 @@ int cmd_update_ref(int argc, const char **argv, const char *prefix)
>  					N_("update <refname> not the one it points to")),
>  		OPT_BOOL('z', NULL, &end_null, N_("stdin has NUL-terminated arguments")),
>  		OPT_BOOL( 0 , "stdin", &read_stdin, N_("read updates from stdin")),
> -		OPT_BOOL( 0 , "create-reflog", &create_reflog, N_("create_reflog")),
> +		OPT_BOOL( 0 , "create-reflog", &create_reflog, N_("create a reflog")),
>  		OPT_END(),
>  	};

^ permalink raw reply	[flat|nested] 3+ messages in thread

* Re: [PATCH] tag, update-ref: improve description of option "create-reflog"
  2015-09-11 16:47 ` Junio C Hamano
@ 2015-09-12 15:07   ` Jiang Xin
  0 siblings, 0 replies; 3+ messages in thread
From: Jiang Xin @ 2015-09-12 15:07 UTC (permalink / raw)
  To: Junio C Hamano, Peter Krefting, Trần Ngọc Quân
  Cc: Ralf Thielow, Git List

2015-09-12 0:47 GMT+08:00 Junio C Hamano <gitster@pobox.com>:
> Ralf Thielow <ralf.thielow@gmail.com> writes:
>
>> The description of option "create-reflog" is "create_reflog", which
>> is neither a good description, nor a sensible string to translate.
>> Change it to a more meaningful message.
>>
>> Signed-off-by: Ralf Thielow <ralf.thielow@gmail.com>
>> ---
>
> This definitely is an improvement.  I will assume i18n team is OK
> with a change like this this late in the cycle (I see you CC'ed
> Jiang) and will merge before the next -rc.
>

Agree. Those who have already finished this round of l10n
(including sv (Swedish) and vi (Vietnamese)) should update
their translations for this update.


> Thanks.
>
>>  builtin/tag.c        | 2 +-
>>  builtin/update-ref.c | 2 +-
>>  2 files changed, 2 insertions(+), 2 deletions(-)
>>
>> diff --git a/builtin/tag.c b/builtin/tag.c
>> index cccca99..cba0e22 100644
>> --- a/builtin/tag.c
>> +++ b/builtin/tag.c
>> @@ -606,7 +606,7 @@ int cmd_tag(int argc, const char **argv, const char *prefix)
>>               OPT_STRING('u', "local-user", &keyid, N_("key-id"),
>>                                       N_("use another key to sign the tag")),
>>               OPT__FORCE(&force, N_("replace the tag if exists")),
>> -             OPT_BOOL(0, "create-reflog", &create_reflog, N_("create_reflog")),
>> +             OPT_BOOL(0, "create-reflog", &create_reflog, N_("create a reflog")),
>>
>>               OPT_GROUP(N_("Tag listing options")),
>>               OPT_COLUMN(0, "column", &colopts, N_("show tag list in columns")),
>> diff --git a/builtin/update-ref.c b/builtin/update-ref.c
>> index 04dd00f..7f30d3a 100644
>> --- a/builtin/update-ref.c
>> +++ b/builtin/update-ref.c
>> @@ -365,7 +365,7 @@ int cmd_update_ref(int argc, const char **argv, const char *prefix)
>>                                       N_("update <refname> not the one it points to")),
>>               OPT_BOOL('z', NULL, &end_null, N_("stdin has NUL-terminated arguments")),
>>               OPT_BOOL( 0 , "stdin", &read_stdin, N_("read updates from stdin")),
>> -             OPT_BOOL( 0 , "create-reflog", &create_reflog, N_("create_reflog")),
>> +             OPT_BOOL( 0 , "create-reflog", &create_reflog, N_("create a reflog")),
>>               OPT_END(),
>>       };



-- 
Jiang Xin

^ permalink raw reply	[flat|nested] 3+ messages in thread

end of thread, other threads:[~2015-09-12 15:07 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-09-11 16:04 [PATCH] tag, update-ref: improve description of option "create-reflog" Ralf Thielow
2015-09-11 16:47 ` Junio C Hamano
2015-09-12 15:07   ` Jiang Xin

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).