[vdr] [PATCH] epgsearch: misc fixes
Darren Salt
linux at youmustbejoking.demon.co.uk
Fri Dec 9 00:38:26 CET 2005
The first patch corrects some English hyphenation and spelling errors. The
second patch fixes one compile failure which occurs with my poisoning patch.
--
| Darren Salt | nr. Ashington, | d youmustbejoking,demon,co,uk
| Debian, | Northumberland | s zap,tartarus,org
| RISC OS | Toon Army | @
| Retrocomputing: a PC card in a Risc PC
Good news. Ten weeks from Friday will be a good day.
-------------- next part --------------
diff -urNad vdr-plugin-epgsearch-0.9.8c~/i18n.c vdr-plugin-epgsearch-0.9.8c/i18n.c
--- vdr-plugin-epgsearch-0.9.8c~/i18n.c 2005-12-05 23:39:24.000000000 +0000
+++ vdr-plugin-epgsearch-0.9.8c/i18n.c 2005-12-05 23:47:10.227887388 +0000
@@ -1171,7 +1171,7 @@
#endif
#endif
},
- { "user defined",
+ { "user-defined",
"benutzerdefiniert",
"",// TODO
"definizione dell'utente",// TODO
@@ -1194,7 +1194,7 @@
#endif
#endif
},
- { "Edit user defined days of week",
+ { "Edit user-defined days of week",
"Benutzerdefinierte Wochentage editieren",
"",// TODO
"Modificare giorni della settimana definiti dall'utente",// TODO
@@ -1539,7 +1539,7 @@
#endif
#endif
},
- { "Please check channel criterions!",
+ { "Please check channel criteria!",
"Bitte Senderkriterien pr?fen!",
"",// TODO
"",// TODO
diff -urNad vdr-plugin-epgsearch-0.9.8c~/menu_searchedit.c vdr-plugin-epgsearch-0.9.8c/menu_searchedit.c
--- vdr-plugin-epgsearch-0.9.8c~/menu_searchedit.c 2005-11-21 17:31:00.000000000 +0000
+++ vdr-plugin-epgsearch-0.9.8c/menu_searchedit.c 2005-12-05 23:47:42.277653156 +0000
@@ -32,7 +32,7 @@
asprintf(&DaysOfWeek[4], WeekDayName(4));
asprintf(&DaysOfWeek[5], WeekDayName(5));
asprintf(&DaysOfWeek[6], WeekDayName(6));
- asprintf(&DaysOfWeek[7], tr("user defined"));
+ asprintf(&DaysOfWeek[7], tr("user-defined"));
asprintf(&UseChannelSel[0], tr("no"));
asprintf(&UseChannelSel[1], tr("interval"));
@@ -388,7 +388,7 @@
}
if (channelMin > channelMax)
{
- Skins.Message(mtError, tr("Please check channel criterions!"));
+ Skins.Message(mtError, tr("Please check channel criteria!"));
return osContinue;
}
}
@@ -475,7 +475,7 @@
// --- cMenuEditDaysOfWeek --------------------------------------------------------
cMenuEditDaysOfWeek::cMenuEditDaysOfWeek(int* DaysOfWeek, int Offset, bool Negate)
-:cOsdMenu(tr("Edit user defined days of week"),30)
+:cOsdMenu(tr("Edit user-defined days of week"),30)
{
int i=0;
offset = Offset;
-------------- next part --------------
diff -urNad vdr-plugin-epgsearch-0.9.8c~/menu_whatson.c vdr-plugin-epgsearch-0.9.8c/menu_whatson.c
--- vdr-plugin-epgsearch-0.9.8c~/menu_whatson.c 2005-12-05 23:47:10.091896868 +0000
+++ vdr-plugin-epgsearch-0.9.8c/menu_whatson.c 2005-12-05 23:47:10.227887388 +0000
@@ -310,7 +310,8 @@
char *buffer=NULL; // allows setting the channel for a timer without event
int starthh,startmm,stophh,stopmm;
//for getting the day of month
- struct tm *tm_t=localtime(&now);
+ struct tm tm_r;
+ struct tm *tm_t=localtime_r(&now, &tm_r);
//we have to get away the ':' from the time string
sscanf(TIMESTRING(now),"%2d:%2d",&starthh,&startmm);
sscanf(TIMESTRING(now+Setup.InstantRecordTime*60),"%2d:%2d",&stophh,&stopmm);
More information about the vdr
mailing list