diff --git a/man/remind.1.in b/man/remind.1.in index 1377d1be..2f4ff460 100644 --- a/man/remind.1.in +++ b/man/remind.1.in @@ -1982,7 +1982,7 @@ symbolic links to files. .PP The \fBSYSINCLUDE\fR command is similar to \fBDO\fR, but it looks for relative pathnames under the system directory containing standard reminder -scripts. For thie version of \fBRemind\fR, the system directory is +scripts. For this version of \fBRemind\fR, the system directory is "@prefix@/share/remind". .PP .SH THE RUN COMMAND diff --git a/src/main.c b/src/main.c index 2369345a..8b4caf1d 100644 --- a/src/main.c +++ b/src/main.c @@ -1998,7 +1998,7 @@ get_day_name(int wkday) if (wkday < 0 || wkday > 6) { return "INVALID_WKDAY"; } - return t(DayName[wkday]); + return tr(DayName[wkday]); } char const * @@ -2007,7 +2007,7 @@ get_month_name(int mon) if (mon < 0 || mon > 11) { return "INVALID_MON"; } - return t(MonthName[mon]); + return tr(MonthName[mon]); } static int GetOnceDateFromFile(void) diff --git a/src/protos.h b/src/protos.h index ce252296..3480ce24 100644 --- a/src/protos.h +++ b/src/protos.h @@ -272,6 +272,5 @@ void InitTranslationTable(void); char const *GetTranslatedString(char const *orig); int GetTranslatedStringTryingVariants(char const *orig, DynamicBuffer *out); char const *GetErr(int r); -char const *t(char const *s); char const *tr(char const *s); void print_escaped_string(FILE *fp, char const *s); diff --git a/src/trans.c b/src/trans.c index 94bafe71..9fbeed46 100644 --- a/src/trans.c +++ b/src/trans.c @@ -313,7 +313,7 @@ GetTranslatedStringTryingVariants(char const *orig, DynamicBuffer *out) return 0; } -char const *t(char const *orig) +char const *tr(char const *orig) { char const *n = GetTranslatedString(orig); if (n) { @@ -322,12 +322,6 @@ char const *t(char const *orig) return orig; } -/* If another "t" is in scope... */ -char const *tr(char const *orig) -{ - return t(orig); -} - int DoTranslate(ParsePtr p) { diff --git a/src/var.c b/src/var.c index d076f1ba..e690fa4f 100644 --- a/src/var.c +++ b/src/var.c @@ -968,7 +968,7 @@ static int SetTranslatableVariable(SysVar *v, Value *value) static int GetTranslatableVariable(SysVar *v, Value *value) { - char const *translated = t((char const *) v->value); + char const *translated = tr((char const *) v->value); if (translated) { value->v.str = StrDup(translated); } else {