Index: libs/libmyth/managedlist.cpp
===================================================================
RCS file: /var/lib/mythcvs/mythtv/libs/libmyth/managedlist.cpp,v
retrieving revision 1.23
diff -u -r1.23 managedlist.cpp
--- libs/libmyth/managedlist.cpp	15 Oct 2004 03:06:40 -0000	1.23
+++ libs/libmyth/managedlist.cpp	7 Dec 2004 06:06:02 -0000
@@ -104,9 +104,9 @@
 
 #define ASSIGN_TEMPLATE(x,y,z) \
     if (x.find("%1") != -1) \
-        y = QString(tr(x)).arg(abs(z)); \
+        y = QString(x).arg(abs(z)); \
     else \
-        y = tr(x);
+        y = x;
 
 
 
Index: libs/libmyth/managedlist.h
===================================================================
RCS file: /var/lib/mythcvs/mythtv/libs/libmyth/managedlist.h,v
retrieving revision 1.18
diff -u -r1.18 managedlist.h
--- libs/libmyth/managedlist.h	15 Oct 2004 03:06:40 -0000	1.18
+++ libs/libmyth/managedlist.h	7 Dec 2004 06:06:02 -0000
@@ -502,7 +502,7 @@
                                  QString _table, QString _column, ManagedList* _parentList=NULL)
                                : ManagedListSetting(_table, _column, _parentList)
         {
-            constructListItem(QObject::tr(listText), _group, _parentList, listName);
+            constructListItem(listText, _group, _parentList, listName);
             listItem = selectItem;
 
             connect(listItem, SIGNAL(changed(ManagedListItem*)), this, SLOT(itemChanged(ManagedListItem*)));
@@ -517,41 +517,27 @@
         }
 
     public:
-        ManagedListItem* addSelection(const QString& label, const QString& value, bool trans = true )
+        ManagedListItem* addSelection(const QString& label, const QString& value)
         {
             if (selectItem)
-            {
-                if (trans)
-                    return selectItem->addSelection(QObject::tr(label), value);
-                else
-                    return selectItem->addSelection(label, value);
-            }
+                return selectItem->addSelection(label, value);
 
             return NULL;
         }
 
-        ManagedListItem* addButton(const QString& label, const QString& value, bool trans = true )
+        ManagedListItem* addButton(const QString& label, const QString& value)
         {
             if (selectItem)
-            {
-                if (trans)
-                    return selectItem->addButton(QObject::tr(label), value);
-                else
-                    return selectItem->addButton(label, value);
-            }
+                return selectItem->addButton(label, value);
 
             return NULL;
         }
 
-        ManagedListItem* addSelection(const QString& label, int value, bool trans = true )
+        ManagedListItem* addSelection(const QString& label, int value)
         {
             if (selectItem)
-            {
-                if (trans)
-                    return selectItem->addSelection(QObject::tr(label), QString::number(value));
-                else
-                    return selectItem->addSelection(label, QString::number(value));
-            }
+                return selectItem->addSelection(label, QString::number(value));
+
             return NULL;
         }
 
@@ -574,7 +560,7 @@
         {
             boolListItem = new BoolManagedListItem(false, _group, _parentList, this, ItemName);
             listItem = boolListItem;
-            boolListItem->setLabels(QObject::tr(trueText), QObject::tr(falseText));
+            boolListItem->setLabels(trueText, falseText);
             connect(listItem, SIGNAL(changed(ManagedListItem*)), this, SLOT(itemChanged(ManagedListItem*)));
         }
 
Index: libs/libmythtv/sr_items.cpp
===================================================================
RCS file: /var/lib/mythcvs/mythtv/libs/libmythtv/sr_items.cpp,v
retrieving revision 1.15
diff -u -r1.15 sr_items.cpp
--- libs/libmythtv/sr_items.cpp	24 Sep 2004 02:37:52 -0000	1.15
+++ libs/libmythtv/sr_items.cpp	7 Dec 2004 06:06:02 -0000
@@ -141,7 +141,7 @@
                                                          " enter the group name"), newGroup);
     if (ok)
     {
-        addSelection(QString(QObject::tr("Store in the \"%1\" recording group")).arg(newGroup), newGroup, true);
+        addSelection(QString(QObject::tr("Store in the \"%1\" recording group")).arg(newGroup), newGroup);
         selectItem->selectValue(newGroup);
     }
 }
Index: libs/libmythtv/sr_items.h
===================================================================
RCS file: /var/lib/mythcvs/mythtv/libs/libmythtv/sr_items.h,v
retrieving revision 1.20
diff -u -r1.20 sr_items.h
--- libs/libmythtv/sr_items.h	5 Nov 2004 18:43:57 -0000	1.20
+++ libs/libmythtv/sr_items.h	7 Dec 2004 06:06:02 -0000
@@ -674,7 +674,7 @@
                                        SLOT(showNewRecGroup()));
 
             addSelection(QString(QObject::tr("Store in the \"%1\" recording group"))
-                         .arg(QObject::tr("Default")), "Default", false);
+                         .arg(QObject::tr("Default")), "Default");
 
             QString thequery = QString("SELECT DISTINCT recgroup from recorded "
                                        "WHERE recgroup <> 'Default'");
@@ -684,9 +684,10 @@
             {
                 while (query.next())
                 {
-                    addSelection(QString(QObject::tr("Store in the \"%1\" recording "
-                                                     "group")).arg(query.value(0).toString()),
-                                 query.value(0).toString(), false);
+                    QString recgroup = QString::fromUtf8(query.value(0).toString());
+
+                    addSelection(QString(QObject::tr("Store in the \"%1\" recording group")).arg(recgroup),
+                                 recgroup);
                 }
             }
 
@@ -696,8 +697,12 @@
 
             if (query.isActive() && query.numRowsAffected() > 0)
                 while (query.next())
-                    addSelection(QString(QObject::tr("Store in the \"%1\" recording group")).arg(query.value(0).toString()),
-                                 query.value(0).toString(), false);
+                {
+                    QString recgroup = QString::fromUtf8(query.value(0).toString());
+                    addSelection(QString(QObject::tr("Store in the \"%1\" recording group")).arg(recgroup),
+                                 recgroup);
+                }
+
         }