Signed-off-by: Ralf Thielow <ralf.thielow@xxxxxxxxx>
---
combine-diff.c | 2 +-
diff.c | 10 +++++-----
2 Dateien geändert, 6 Zeilen hinzugefügt(+), 6 Zeilen entfernt(-)
diff --git a/combine-diff.c b/combine-diff.c
index 9786680..bf534e4 100644
--- a/combine-diff.c
+++ b/combine-diff.c
@@ -734,7 +734,7 @@ static void show_combined_header(struct combine_diff_path *elem,
DIFF_STATUS_ADDED)
added = 0;
if (added)
- printf("%snew file mode %06o",
+ printf(_("%snew file mode %06o"),
c_meta, elem->mode);
else {
if (deleted)
diff --git a/diff.c b/diff.c
index 1a594df..25fcb6f 100644
--- a/diff.c
+++ b/diff.c
@@ -2264,21 +2264,21 @@ static void builtin_diff(const char *name_a,
strbuf_addf(&header, "%s%sdiff --git %s %s%s\n", line_prefix, set, a_one, b_two, reset);
if (lbl[0][0] == '/') {
/* /dev/null */
- strbuf_addf(&header, "%s%snew file mode %06o%s\n", line_prefix, set, two->mode, reset);
+ strbuf_addf(&header, "%s%s%s %06o%s\n", line_prefix, set, _("new file mode"), two->mode, reset);
if (xfrm_msg)
strbuf_addstr(&header, xfrm_msg);
must_show_header = 1;
}
else if (lbl[1][0] == '/') {
- strbuf_addf(&header, "%s%sdeleted file mode %06o%s\n", line_prefix, set, one->mode, reset);
+ strbuf_addf(&header, "%s%s%s %06o%s\n", line_prefix, set, _("deleted file mode"), one->mode, reset);
if (xfrm_msg)
strbuf_addstr(&header, xfrm_msg);
must_show_header = 1;
}
else {
if (one->mode != two->mode) {
- strbuf_addf(&header, "%s%sold mode %06o%s\n", line_prefix, set, one->mode, reset);
- strbuf_addf(&header, "%s%snew mode %06o%s\n", line_prefix, set, two->mode, reset);
+ strbuf_addf(&header, "%s%s%s %06o%s\n", line_prefix, set, _("old mode"), one->mode, reset);
+ strbuf_addf(&header, "%s%s%s %06o%s\n", line_prefix, set, _("new mode"), two->mode, reset);
must_show_header = 1;
}
if (xfrm_msg)
@@ -4130,7 +4130,7 @@ static void show_mode_change(FILE *file, struct diff_filepair *p, int show_name,
const char *line_prefix)
{
if (p->one->mode && p->two->mode && p->one->mode != p->two->mode) {
- fprintf(file, "%s mode change %06o => %06o%c", line_prefix, p->one->mode,
+ fprintf(file, _("%s mode change %06o => %06o%c"), line_prefix, p->one->mode,
p->two->mode, show_name ? ' ' : '\n');
if (show_name) {
write_name_quoted(p->two->path, file, '\n');
--
1.7.11.1
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html