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

Re: [PATCH v2 7/7] i18n: merge-recursive: mark strings for translation

From: Junio C Hamano <hidden>
Date: 2016-06-15 22:54:18

Jiang Xin [off-list ref] writes:
quoted hunk ↗ jump to hunk
@@ -249,14 +249,14 @@ struct tree *write_tree_from_memory(struct merge_options *o)
 
 	if (unmerged_cache()) {
 		int i;
-		fprintf(stderr, "BUG: There are unmerged index entries:\n");
+		fprintf(stderr, _("BUG: There are unmerged index entries:\n"));
Micronit. "BUG:" entries are only to help Git developers to locate
the exact codepath that is buggy, and I think it is better left
untranslated.
+		if (NULL == renamed) {
Better written as "if (!renamed)".
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help