diff options
| author | Junio C Hamano <gitster@pobox.com> | 2017-05-04 16:26:44 +0900 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-05-04 16:26:44 +0900 |
| commit | fa675ebd998bcbf6192b95bb0fe70f345c06d07d (patch) | |
| tree | 2ef870bc0652e2590d68c14011448c1c444e88e5 | |
| parent | d2bbb7c2bcf6e77ebfcabf4e12110fe6d5c91de6 (diff) | |
| parent | 78bde923f16daccf590c78a619fbdbbe2a3d82ac (diff) | |
| download | git-fa675ebd998bcbf6192b95bb0fe70f345c06d07d.tar.gz git-fa675ebd998bcbf6192b95bb0fe70f345c06d07d.tar.xz | |
Merge branch 'ja/i18n-cleanup'
* ja/i18n-cleanup:
i18n: read-cache: typofix
i18n: remove i18n from tag reflog message
| -rw-r--r-- | builtin/tag.c | 12 | ||||
| -rw-r--r-- | read-cache.c | 2 |
2 files changed, 7 insertions, 7 deletions
diff --git a/builtin/tag.c b/builtin/tag.c index 222404522..bdf1e88e9 100644 --- a/builtin/tag.c +++ b/builtin/tag.c @@ -309,7 +309,7 @@ static void create_reflog_msg(const unsigned char *sha1, struct strbuf *sb) if (rla) { strbuf_addstr(sb, rla); } else { - strbuf_addstr(sb, _("tag: tagging ")); + strbuf_addstr(sb, "tag: tagging "); strbuf_add_unique_abbrev(sb, sha1, DEFAULT_ABBREV); } @@ -317,14 +317,14 @@ static void create_reflog_msg(const unsigned char *sha1, struct strbuf *sb) type = sha1_object_info(sha1, NULL); switch (type) { default: - strbuf_addstr(sb, _("object of unknown type")); + strbuf_addstr(sb, "object of unknown type"); break; case OBJ_COMMIT: if ((buf = read_sha1_file(sha1, &type, &size)) != NULL) { subject_len = find_commit_subject(buf, &subject_start); strbuf_insert(sb, sb->len, subject_start, subject_len); } else { - strbuf_addstr(sb, _("commit object")); + strbuf_addstr(sb, "commit object"); } free(buf); @@ -332,13 +332,13 @@ static void create_reflog_msg(const unsigned char *sha1, struct strbuf *sb) strbuf_addf(sb, ", %s", show_date(c->date, 0, DATE_MODE(SHORT))); break; case OBJ_TREE: - strbuf_addstr(sb, _("tree object")); + strbuf_addstr(sb, "tree object"); break; case OBJ_BLOB: - strbuf_addstr(sb, _("blob object")); + strbuf_addstr(sb, "blob object"); break; case OBJ_TAG: - strbuf_addstr(sb, _("other tag object")); + strbuf_addstr(sb, "other tag object"); break; } strbuf_addch(sb, ')'); diff --git a/read-cache.c b/read-cache.c index b3d0f3c30..0d0081a11 100644 --- a/read-cache.c +++ b/read-cache.c @@ -2372,7 +2372,7 @@ static int should_delete_shared_index(const char *shared_index_path) if (!expiration) return 0; if (stat(shared_index_path, &st)) - return error_errno(_("could not stat '%s"), shared_index_path); + return error_errno(_("could not stat '%s'"), shared_index_path); if (st.st_mtime > expiration) return 0; |