Skip to content

Commit fa675eb

Browse files
committed
Merge branch 'ja/i18n-cleanup'
* ja/i18n-cleanup: i18n: read-cache: typofix i18n: remove i18n from tag reflog message
2 parents d2bbb7c + 78bde92 commit fa675eb

File tree

2 files changed

+7
-7
lines changed

2 files changed

+7
-7
lines changed

builtin/tag.c

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -309,36 +309,36 @@ static void create_reflog_msg(const unsigned char *sha1, struct strbuf *sb)
309309
if (rla) {
310310
strbuf_addstr(sb, rla);
311311
} else {
312-
strbuf_addstr(sb, _("tag: tagging "));
312+
strbuf_addstr(sb, "tag: tagging ");
313313
strbuf_add_unique_abbrev(sb, sha1, DEFAULT_ABBREV);
314314
}
315315

316316
strbuf_addstr(sb, " (");
317317
type = sha1_object_info(sha1, NULL);
318318
switch (type) {
319319
default:
320-
strbuf_addstr(sb, _("object of unknown type"));
320+
strbuf_addstr(sb, "object of unknown type");
321321
break;
322322
case OBJ_COMMIT:
323323
if ((buf = read_sha1_file(sha1, &type, &size)) != NULL) {
324324
subject_len = find_commit_subject(buf, &subject_start);
325325
strbuf_insert(sb, sb->len, subject_start, subject_len);
326326
} else {
327-
strbuf_addstr(sb, _("commit object"));
327+
strbuf_addstr(sb, "commit object");
328328
}
329329
free(buf);
330330

331331
if ((c = lookup_commit_reference(sha1)) != NULL)
332332
strbuf_addf(sb, ", %s", show_date(c->date, 0, DATE_MODE(SHORT)));
333333
break;
334334
case OBJ_TREE:
335-
strbuf_addstr(sb, _("tree object"));
335+
strbuf_addstr(sb, "tree object");
336336
break;
337337
case OBJ_BLOB:
338-
strbuf_addstr(sb, _("blob object"));
338+
strbuf_addstr(sb, "blob object");
339339
break;
340340
case OBJ_TAG:
341-
strbuf_addstr(sb, _("other tag object"));
341+
strbuf_addstr(sb, "other tag object");
342342
break;
343343
}
344344
strbuf_addch(sb, ')');

read-cache.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2372,7 +2372,7 @@ static int should_delete_shared_index(const char *shared_index_path)
23722372
if (!expiration)
23732373
return 0;
23742374
if (stat(shared_index_path, &st))
2375-
return error_errno(_("could not stat '%s"), shared_index_path);
2375+
return error_errno(_("could not stat '%s'"), shared_index_path);
23762376
if (st.st_mtime > expiration)
23772377
return 0;
23782378

0 commit comments

Comments
 (0)