Thomas Gummerer <t.gummerer@xxxxxxxxx> writes: > if (write_in_full(out_fd, buf.buf, buf.len) < 0) > - die("unable to write rerere record"); > + die(_("unable to write rerere record")); As we'd be adding these new strings to the .po file, perhaps we would want to downcase the first letter in the message to match the convention? > ... > - return error_errno("Could not open %s", path); > + return error_errno(_("Could not open %s"), path); > ... > - error("There were errors while writing %s (%s)", > + error(_("There were errors while writing %s (%s)"), > ... > - io.io.wrerror = error_errno("Failed to flush %s", path); > + io.io.wrerror = error_errno(_("Failed to flush %s"), path); > ... > - return error("Could not parse conflict hunks in %s", path); > + return error(_("Could not parse conflict hunks in %s"), path);