Hi Oscar! On Mon, 24 Jan 2005, Oscar Carlsson wrote:
> Stefan Frank wrote, On 2005-01-23 12:28: > >Hi, > > > >this patch replaces the first one and includes the new inactive > >recording type. > > Not against current CVS wich is Revision 1.187: > > retrieving revision 1.186 Hm, too many changes committed too quickly to keep up with. ;) So here it is again. The 2nd patch also updates all *.ts files in order not to lose the current translations, except the german one. I'll send a bigger update for that later. Bye, Stefan > > /O > _______________________________________________ > mythtv-dev mailing list > [email protected] > http://mythtv.org/cgi-bin/mailman/listinfo/mythtv-dev >
Index: libs/libmythtv/programinfo.cpp
===================================================================
RCS file: /var/lib/mythcvs/mythtv/libs/libmythtv/programinfo.cpp,v
retrieving revision 1.189
diff -u -r1.189 programinfo.cpp
--- libs/libmythtv/programinfo.cpp 28 Jan 2005 08:30:18 -0000 1.189
+++ libs/libmythtv/programinfo.cpp 29 Jan 2005 00:46:35 -0000
@@ -1811,24 +1811,24 @@
switch (rectype)
{
case kSingleRecord:
- return QObject::tr("S", "RecTypeChar");
+ return QObject::tr("S", "RecTypeChar kSingleRecord");
case kTimeslotRecord:
- return QObject::tr("T", "RecTypeChar");
+ return QObject::tr("T", "RecTypeChar kTimeslotRecord");
case kWeekslotRecord:
- return QObject::tr("W", "RecTypeChar");
+ return QObject::tr("W", "RecTypeChar kWeekslotRecord");
case kChannelRecord:
- return QObject::tr("C", "RecTypeChar");
+ return QObject::tr("C", "RecTypeChar kChannelRecord");
case kAllRecord:
- return QObject::tr("A", "RecTypeChar");
+ return QObject::tr("A", "RecTypeChar kAllRecord");
case kFindOneRecord:
- return QObject::tr("F", "RecTypeChar");
+ return QObject::tr("F", "RecTypeChar kFindOneRecord");
case kFindDailyRecord:
- return QObject::tr("d", "RecTypeChar");
+ return QObject::tr("d", "RecTypeChar kFindDailyRecord");
case kFindWeeklyRecord:
- return QObject::tr("w", "RecTypeChar");
+ return QObject::tr("w", "RecTypeChar kFindWeeklyRecord");
case kOverrideRecord:
case kDontRecord:
- return QObject::tr("O", "RecTypeChar");
+ return QObject::tr("O", "RecTypeChar kOverrideRecord/kDontRecord");
case kNotRecording:
default:
return " ";
@@ -1868,39 +1868,39 @@
switch (recstatus)
{
case rsDeleted:
- return QObject::tr("D", "RecStatusChar");
+ return QObject::tr("D", "RecStatusChar rsDeleted");
case rsStopped:
- return QObject::tr("S", "RecStatusChar");
+ return QObject::tr("S", "RecStatusChar rsStopped");
case rsRecorded:
- return QObject::tr("R", "RecStatusChar");
+ return QObject::tr("R", "RecStatusChar rsRecorded");
case rsRecording:
return QString::number(cardid);
case rsWillRecord:
return QString::number(cardid);
case rsDontRecord:
- return QObject::tr("X", "RecStatusChar");
+ return QObject::tr("X", "RecStatusChar rsDontRecord");
case rsPreviousRecording:
- return QObject::tr("P", "RecStatusChar");
+ return QObject::tr("P", "RecStatusChar rsPreviousRecording");
case rsCurrentRecording:
- return QObject::tr("R", "RecStatusChar");
+ return QObject::tr("R", "RecStatusChar rsCurrentRecording");
case rsRepeat:
- return QObject::tr("r", "RecStatusChar");
+ return QObject::tr("r", "RecStatusChar rsRepeat");
case rsEarlierShowing:
- return QObject::tr("E", "RecStatusChar");
+ return QObject::tr("E", "RecStatusChar rsEarlierShowing");
case rsTooManyRecordings:
- return QObject::tr("T", "RecStatusChar");
+ return QObject::tr("T", "RecStatusChar rsTooManyRecordings");
case rsCancelled:
- return QObject::tr("N", "RecStatusChar");
+ return QObject::tr("N", "RecStatusChar rsCancelled");
case rsConflict:
- return QObject::tr("C", "RecStatusChar");
+ return QObject::tr("C", "RecStatusChar rsConflict");
case rsLaterShowing:
- return QObject::tr("L", "RecStatusChar");
+ return QObject::tr("L", "RecStatusChar rsLaterShowing");
case rsLowDiskSpace:
- return QObject::tr("K", "RecStatusChar");
+ return QObject::tr("K", "RecStatusChar rsLowDiskSpace");
case rsTunerBusy:
- return QObject::tr("B", "RecStatusChar");
+ return QObject::tr("B", "RecStatusChar rsTunerBusy");
case rsInactive:
- return QObject::tr("x", "RecStatusChar");
+ return QObject::tr("x", "RecStatusChar rsInactive");
default:
return "-";
}
mythtv_programinfo.cpp_ts_20050129.diff.gz
Description: Binary data
_______________________________________________ mythtv-dev mailing list [email protected] http://mythtv.org/cgi-bin/mailman/listinfo/mythtv-dev
