Thread (2 messages) flat view 2 messages, 2 authors, 2016-06-24

Re: [PATCH] unpack-trees: fix English grammar in do-this-before-that messages

From: Vasco Almeida <hidden>
Date: 2016-06-24 11:39:30

Às 05:31 de 24-06-2016, Alex Henrie escreveu:
quoted hunk ↗ jump to hunk
Signed-off-by: Alex Henrie <redacted>
---
 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.
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help