From 9160de07065ae4b25c3991d267780c44a69fdc64 Mon Sep 17 00:00:00 2001
From: Nicolas Riendeau <nriendeau@mythtv.org>
Date: Wed, 17 Jul 2013 23:16:11 -0400
Subject: [PATCH] Miscellaneous translation fixes

Make some translatable strings extractable.

Add a new translatable string.

Change the translation context.
---
 mythtv/i18n/translate.pro                   |  2 ++
 mythtv/libs/libmythtv/DVD/dvdringbuffer.cpp | 10 +++++-----
 mythtv/libs/libmythtv/DVD/dvdringbuffer.h   |  7 +++++++
 3 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/mythtv/i18n/translate.pro b/mythtv/i18n/translate.pro
index 015c0ffd6c5..4f8c290ef07 100644
--- a/mythtv/i18n/translate.pro
+++ b/mythtv/i18n/translate.pro
@@ -11,6 +11,8 @@ SOURCES += ../libs/libmythtv/AirPlay/*.cpp
 SOURCES += ../libs/libmythtv/AirPlay/*.h
 SOURCES += ../libs/libmythtv/channelscan/*.cpp
 SOURCES += ../libs/libmythtv/channelscan/*.h
+SOURCES += ../libs/libmythtv/DVD/*.cpp
+SOURCES += ../libs/libmythtv/DVD/*.h
 SOURCES += ../libs/libmythtv/iptv/*.cpp
 SOURCES += ../libs/libmythtv/mpeg/*.cpp
 SOURCES += ../libs/libmythui/*.cpp
diff --git a/mythtv/libs/libmythtv/DVD/dvdringbuffer.cpp b/mythtv/libs/libmythtv/DVD/dvdringbuffer.cpp
index c99b9786622..f7ecf784405 100644
--- a/mythtv/libs/libmythtv/DVD/dvdringbuffer.cpp
+++ b/mythtv/libs/libmythtv/DVD/dvdringbuffer.cpp
@@ -49,8 +49,8 @@ DVDInfo::DVDInfo(const QString &filename)
     dvdnav_status_t res = dvdnav_open(&m_nav, fname.constData());
     if (res == DVDNAV_STATUS_ERR)
     {
-        m_lastError = QObject::tr("Failed to open device at %1")
-                        .arg(fname.constData());
+        m_lastError = tr("Failed to open device at %1")
+                         .arg(fname.constData());
         LOG(VB_GENERAL, LOG_ERR, QString("DVDInfo: ") + m_lastError);
         return;
     }
@@ -402,12 +402,12 @@ void DVDRingBuffer::GetDescForPos(QString &desc)
     {
         if ((m_part <= DVD_MENU_MAX) && dvdnav_menu_table[m_part] )
         {
-            desc = QString("%1 Menu").arg(dvdnav_menu_table[m_part]);
+            desc = tr("%1 Menu").arg(dvdnav_menu_table[m_part]);
         }
     }
     else
     {
-        desc = QObject::tr("Title %1 chapter %2").arg(m_title).arg(m_part);
+        desc = tr("Title %1 chapter %2").arg(m_title).arg(m_part);
     }
 }
 
@@ -430,7 +430,7 @@ bool DVDRingBuffer::OpenFile(const QString &lfilename, uint retry_ms)
     dvdnav_status_t res = dvdnav_open(&m_dvdnav, fname.constData());
     if (res == DVDNAV_STATUS_ERR)
     {
-        lastError = QObject::tr("Failed to open DVD device at %1").arg(filename);
+        lastError = tr("Failed to open DVD device at %1").arg(filename);
         LOG(VB_GENERAL, LOG_ERR,
             LOC + QString("Failed to open DVD device at %1")
                 .arg(fname.constData()));
diff --git a/mythtv/libs/libmythtv/DVD/dvdringbuffer.h b/mythtv/libs/libmythtv/DVD/dvdringbuffer.h
index 18c3062a0e8..423765164ae 100644
--- a/mythtv/libs/libmythtv/DVD/dvdringbuffer.h
+++ b/mythtv/libs/libmythtv/DVD/dvdringbuffer.h
@@ -5,11 +5,14 @@
 #define DVD_BLOCK_SIZE 2048LL
 #define DVD_MENU_MAX 7
 
+// Qt headers
 #include <QMap>
 #include <QString>
 #include <QMutex>
 #include <QRect>
+#include <QCoreApplication>
 
+// MythTV headers
 #include "ringbuffer.h"
 #include "mythdate.h"
 #include "referencecounter.h"
@@ -64,6 +67,8 @@ class MythDVDPlayer;
 
 class MTV_PUBLIC DVDInfo
 {
+    Q_DECLARE_TR_FUNCTIONS(DVDInfo)
+
   public:
     DVDInfo(const QString &filename);
    ~DVDInfo(void);
@@ -80,6 +85,8 @@ class MTV_PUBLIC DVDInfo
 
 class MTV_PUBLIC DVDRingBuffer : public RingBuffer
 {
+    Q_DECLARE_TR_FUNCTIONS(DVDRingBuffer)
+
   public:
     DVDRingBuffer(const QString &lfilename);
     virtual ~DVDRingBuffer();