* [PATCH] unpack-trees: fix English grammar in do-this-before-that messages
@ 2016-06-24 5:31 Alex Henrie
2016-06-24 9:26 ` Matthieu Moy
2016-06-24 11:39 ` Vasco Almeida
0 siblings, 2 replies; 5+ messages in thread
From: Alex Henrie @ 2016-06-24 5:31 UTC (permalink / raw)
To: gitster, diane.gasselin, Matthieu.Moy, vascomalmeida, git; +Cc: Alex Henrie
Signed-off-by: Alex Henrie <alexhenrie24@gmail.com>
---
unpack-trees.c | 18 +++++++++---------
1 file changed, 9 insertions(+), 9 deletions(-)
diff --git a/unpack-trees.c b/unpack-trees.c
index 6bc9512..11c37fb 100644
--- a/unpack-trees.c
+++ b/unpack-trees.c
@@ -62,17 +62,17 @@ void setup_unpack_trees_porcelain(struct unpack_trees_options *opts,
if (!strcmp(cmd, "checkout"))
msg = advice_commit_before_merge
? _("Your local changes to the following files would be overwritten by checkout:\n%%s"
- "Please commit your changes or stash them before you can switch branches.")
+ "Please commit your changes or stash them before you switch branches.")
: _("Your local changes to the following files would be overwritten by checkout:\n%%s");
else if (!strcmp(cmd, "merge"))
msg = advice_commit_before_merge
? _("Your local changes to the following files would be overwritten by merge:\n%%s"
- "Please commit your changes or stash them before you can merge.")
+ "Please commit your changes or stash them before you merge.")
: _("Your local changes to the following files would be overwritten by merge:\n%%s");
else
msg = advice_commit_before_merge
? _("Your local changes to the following files would be overwritten by %s:\n%%s"
- "Please commit your changes or stash them before you can %s.")
+ "Please commit your changes or stash them before you %s.")
: _("Your local changes to the following files would be overwritten by %s:\n%%s");
msgs[ERROR_WOULD_OVERWRITE] = msgs[ERROR_NOT_UPTODATE_FILE] =
xstrfmt(msg, cmd, cmd);
@@ -83,34 +83,34 @@ void setup_unpack_trees_porcelain(struct unpack_trees_options *opts,
if (!strcmp(cmd, "checkout"))
msg = advice_commit_before_merge
? _("The following untracked working tree files would be removed by checkout:\n%%s"
- "Please move or remove them before you can switch branches.")
+ "Please move or remove them before you switch branches.")
: _("The following untracked working tree files would be removed by checkout:\n%%s");
else if (!strcmp(cmd, "merge"))
msg = advice_commit_before_merge
? _("The following untracked working tree files would be removed by merge:\n%%s"
- "Please move or remove them before you can merge.")
+ "Please move or remove them before you merge.")
: _("The following untracked working tree files would be removed by merge:\n%%s");
else
msg = advice_commit_before_merge
? _("The following untracked working tree files would be removed by %s:\n%%s"
- "Please move or remove them before you can %s.")
+ "Please move or remove them before you %s.")
: _("The following untracked working tree files would be removed by %s:\n%%s");
msgs[ERROR_WOULD_LOSE_UNTRACKED_REMOVED] = xstrfmt(msg, cmd, cmd);
if (!strcmp(cmd, "checkout"))
msg = advice_commit_before_merge
? _("The following untracked working tree files would be overwritten by checkout:\n%%s"
- "Please move or remove them before you can switch branches.")
+ "Please move or remove them before you switch branches.")
: _("The following untracked working tree files would be overwritten by checkout:\n%%s");
else if (!strcmp(cmd, "merge"))
msg = advice_commit_before_merge
? _("The following untracked working tree files would be overwritten by merge:\n%%s"
- "Please move or remove them before you can merge.")
+ "Please move or remove them before you merge.")
: _("The following untracked working tree files would be overwritten by merge:\n%%s");
else
msg = advice_commit_before_merge
? _("The following untracked working tree files would be overwritten by %s:\n%%s"
- "Please move or remove them before you can %s.")
+ "Please move or remove them before you %s.")
: _("The following untracked working tree files would be overwritten by %s:\n%%s");
msgs[ERROR_WOULD_LOSE_UNTRACKED_OVERWRITTEN] = xstrfmt(msg, cmd, cmd);
--
2.9.0
^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: [PATCH] unpack-trees: fix English grammar in do-this-before-that messages
2016-06-24 5:31 [PATCH] unpack-trees: fix English grammar in do-this-before-that messages Alex Henrie
@ 2016-06-24 9:26 ` Matthieu Moy
2016-06-24 11:39 ` Vasco Almeida
1 sibling, 0 replies; 5+ messages in thread
From: Matthieu Moy @ 2016-06-24 9:26 UTC (permalink / raw)
To: Alex Henrie; +Cc: gitster, diane.gasselin, vascomalmeida, git
Alex Henrie <alexhenrie24@gmail.com> writes:
> Signed-off-by: Alex Henrie <alexhenrie24@gmail.com>
> ---
> unpack-trees.c | 18 +++++++++---------
> 1 file changed, 9 insertions(+), 9 deletions(-)
>
> diff --git a/unpack-trees.c b/unpack-trees.c
> index 6bc9512..11c37fb 100644
> --- a/unpack-trees.c
> +++ b/unpack-trees.c
> @@ -62,17 +62,17 @@ void setup_unpack_trees_porcelain(struct unpack_trees_options *opts,
> if (!strcmp(cmd, "checkout"))
> msg = advice_commit_before_merge
> ? _("Your local changes to the following files would be overwritten by checkout:\n%%s"
> - "Please commit your changes or stash them before you can switch branches.")
> + "Please commit your changes or stash them before you switch branches.")
I'm not a native speaker, but I think both versions are correct.
I'm OK with the change, though. Dropping something useless is usually a
good thing :-).
--
Matthieu Moy
http://www-verimag.imag.fr/~moy/
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH] unpack-trees: fix English grammar in do-this-before-that messages
2016-06-24 5:31 [PATCH] unpack-trees: fix English grammar in do-this-before-that messages Alex Henrie
2016-06-24 9:26 ` Matthieu Moy
@ 2016-06-24 11:39 ` Vasco Almeida
2016-06-24 22:28 ` Junio C Hamano
1 sibling, 1 reply; 5+ messages in thread
From: Vasco Almeida @ 2016-06-24 11:39 UTC (permalink / raw)
To: Alex Henrie; +Cc: gitster, diane.gasselin, Matthieu.Moy, git
Às 05:31 de 24-06-2016, Alex Henrie escreveu:
> Signed-off-by: Alex Henrie <alexhenrie24@gmail.com>
> ---
> unpack-trees.c | 18 +++++++++---------
> 1 file changed, 9 insertions(+), 9 deletions(-)
>
> diff --git a/unpack-trees.c b/unpack-trees.c
> index 6bc9512..11c37fb 100644
> --- a/unpack-trees.c
> +++ b/unpack-trees.c
> @@ -62,17 +62,17 @@ void setup_unpack_trees_porcelain(struct unpack_trees_options *opts,
> if (!strcmp(cmd, "checkout"))
> msg = advice_commit_before_merge
> ? _("Your local changes to the following files would be overwritten by checkout:\n%%s"
> - "Please commit your changes or stash them before you can switch branches.")
> + "Please commit your changes or stash them before you switch branches.")
> : _("Your local changes to the following files would be overwritten by checkout:\n%%s");
The only downside I can tell about this is translator are going to have
to update those strings on their translations, but that is a normal
thing to do on an active project like Git.
I'm not a native speak either, but I think I have translated that as if
the sentences were like this patch introduces. I agree with this change.
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH] unpack-trees: fix English grammar in do-this-before-that messages
2016-06-24 11:39 ` Vasco Almeida
@ 2016-06-24 22:28 ` Junio C Hamano
2016-06-24 23:02 ` Vasco Almeida
0 siblings, 1 reply; 5+ messages in thread
From: Junio C Hamano @ 2016-06-24 22:28 UTC (permalink / raw)
To: Vasco Almeida; +Cc: Alex Henrie, diane.gasselin, Matthieu.Moy, git
Vasco Almeida <vascomalmeida@sapo.pt> writes:
> The only downside I can tell about this is translator are going to have
> to update those strings on their translations, but that is a normal
> thing to do on an active project like Git.
A larger issue is this fails to update tests that check these
messages.
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH] unpack-trees: fix English grammar in do-this-before-that messages
2016-06-24 22:28 ` Junio C Hamano
@ 2016-06-24 23:02 ` Vasco Almeida
0 siblings, 0 replies; 5+ messages in thread
From: Vasco Almeida @ 2016-06-24 23:02 UTC (permalink / raw)
To: Junio C Hamano; +Cc: Alex Henrie, diane.gasselin, Matthieu.Moy, git
Citando Junio C Hamano <gitster@pobox.com>:
> Vasco Almeida <vascomalmeida@sapo.pt> writes:
>
>> The only downside I can tell about this is translator are going to have
>> to update those strings on their translations, but that is a normal
>> thing to do on an active project like Git.
>
> A larger issue is this fails to update tests that check these
> messages.
Yes, I forget about tests :-). Alex Henrie, or someone else, should
update the tests to reflect this change if it is to go forward.
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2016-06-24 23:02 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2016-06-24 5:31 [PATCH] unpack-trees: fix English grammar in do-this-before-that messages Alex Henrie
2016-06-24 9:26 ` Matthieu Moy
2016-06-24 11:39 ` Vasco Almeida
2016-06-24 22:28 ` Junio C Hamano
2016-06-24 23:02 ` Vasco Almeida
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.