Macro qtTrIdx() replaced by tr() and QT_TRANSLATE_NOOP()

diff --git a/qmafw-gst-subtitles-renderer/applet/subtitlesapplet.cpp b/qmafw-gst-subtitles-renderer/applet/subtitlesapplet.cpp
index 986c872..44270af 100644 (file)
--- a/qmafw-gst-subtitles-renderer/applet/subtitlesapplet.cpp
+++ b/qmafw-gst-subtitles-renderer/applet/subtitlesapplet.cpp
@@ -60,7 +60,7 @@ SubtitlesApplet::constructStylableWidget (int widgetId)
 
 QString SubtitlesApplet::title () const
 {
-    return qtTrId ("Subtitles");
+    return tr ("Subtitles");
 }
 
 QVector<MAction*>

diff --git a/qmafw-gst-subtitles-renderer/applet/subtitleswidget.cpp b/qmafw-gst-subtitles-renderer/applet/subtitleswidget.cpp
index ab27035..47e11cb 100644 (file)
--- a/qmafw-gst-subtitles-renderer/applet/subtitleswidget.cpp
+++ b/qmafw-gst-subtitles-renderer/applet/subtitleswidget.cpp
@@ -49,14 +49,14 @@ typedef enum
 
 typedef struct {
     int index;
-    const QString name;
+    const char *name;
 } FontStyle;
 
 static FontStyle font_styles[] = {
-    {FONT_STYLE_REGULAR,       qtTrId ("Regular")},
-    {FONT_STYLE_ITALIC,                qtTrId ("Italic")},
-    {FONT_STYLE_BOLD,          qtTrId ("Bold")},
-    {FONT_STYLE_ITALIC_BOLD,   qtTrId ("Italic Bold")},
+    {FONT_STYLE_REGULAR,       QT_TRANSLATE_NOOP ("SubtitlesWidget", "Regular")},
+    {FONT_STYLE_ITALIC,                QT_TRANSLATE_NOOP ("SubtitlesWidget", "Italic")},
+    {FONT_STYLE_BOLD,          QT_TRANSLATE_NOOP ("SubtitlesWidget", "Bold")},
+    {FONT_STYLE_ITALIC_BOLD,   QT_TRANSLATE_NOOP ("SubtitlesWidget", "Italic Bold")},
 };
 
 static const int font_sizes[] =
@@ -177,114 +177,114 @@ typedef enum
 typedef struct {
     int index;
     const QString charset;
-    const QString name;
+    const char *name;
 } SubtitleEncoding;
 
 static SubtitleEncoding encodings[] = {
-    {SUBTITLE_ENCODING_ISO_8859_6,     "ISO-8859-6",           qtTrId ("Arabic")},
-    {SUBTITLE_ENCODING_IBM_864,                "IBM864",               qtTrId ("Arabic")},
-    {SUBTITLE_ENCODING_MAC_ARABIC,     "MAC_ARABIC",           qtTrId ("Arabic")},
-    {SUBTITLE_ENCODING_WINDOWS_1256,   "WINDOWS-1256",         qtTrId ("Arabic")},
+    {SUBTITLE_ENCODING_ISO_8859_6,     "ISO-8859-6",           QT_TRANSLATE_NOOP ("SubtitlesWidget", "Arabic")},
+    {SUBTITLE_ENCODING_IBM_864,                "IBM864",               QT_TRANSLATE_NOOP ("SubtitlesWidget", "Arabic")},
+    {SUBTITLE_ENCODING_MAC_ARABIC,     "MAC_ARABIC",           QT_TRANSLATE_NOOP ("SubtitlesWidget", "Arabic")},
+    {SUBTITLE_ENCODING_WINDOWS_1256,   "WINDOWS-1256",         QT_TRANSLATE_NOOP ("SubtitlesWidget", "Arabic")},
 
-    {SUBTITLE_ENCODING_ARMSCII_8,      "ARMSCII-8",            qtTrId ("Armenian")},
+    {SUBTITLE_ENCODING_ARMSCII_8,      "ARMSCII-8",            QT_TRANSLATE_NOOP ("SubtitlesWidget", "Armenian")},
 
-    {SUBTITLE_ENCODING_ISO_8859_4,     "ISO-8859-4",           qtTrId ("Baltic")},
-    {SUBTITLE_ENCODING_ISO_8859_13,    "ISO-8859-13",          qtTrId ("Baltic")},
-    {SUBTITLE_ENCODING_WINDOWS_1257,   "WINDOWS-1257",         qtTrId ("Baltic")},
+    {SUBTITLE_ENCODING_ISO_8859_4,     "ISO-8859-4",           QT_TRANSLATE_NOOP ("SubtitlesWidget", "Baltic")},
+    {SUBTITLE_ENCODING_ISO_8859_13,    "ISO-8859-13",          QT_TRANSLATE_NOOP ("SubtitlesWidget", "Baltic")},
+    {SUBTITLE_ENCODING_WINDOWS_1257,   "WINDOWS-1257",         QT_TRANSLATE_NOOP ("SubtitlesWidget", "Baltic")},
 
-    {SUBTITLE_ENCODING_ISO_8859_14,    "ISO-8859-14",          qtTrId ("Celtic")},
+    {SUBTITLE_ENCODING_ISO_8859_14,    "ISO-8859-14",          QT_TRANSLATE_NOOP ("SubtitlesWidget", "Celtic")},
 
-    {SUBTITLE_ENCODING_ISO_8859_2,     "ISO-8859-2",           qtTrId ("Central European")},
-    {SUBTITLE_ENCODING_IBM_852,                "IBM852",               qtTrId ("Central European")},
-    {SUBTITLE_ENCODING_MAC_CE,         "MAC_CE",               qtTrId ("Central European")},
-    {SUBTITLE_ENCODING_WINDOWS_1250,   "WINDOWS-1250",         qtTrId ("Central European")},
+    {SUBTITLE_ENCODING_ISO_8859_2,     "ISO-8859-2",           QT_TRANSLATE_NOOP ("SubtitlesWidget", "Central European")},
+    {SUBTITLE_ENCODING_IBM_852,                "IBM852",               QT_TRANSLATE_NOOP ("SubtitlesWidget", "Central European")},
+    {SUBTITLE_ENCODING_MAC_CE,         "MAC_CE",               QT_TRANSLATE_NOOP ("SubtitlesWidget", "Central European")},
+    {SUBTITLE_ENCODING_WINDOWS_1250,   "WINDOWS-1250",         QT_TRANSLATE_NOOP ("SubtitlesWidget", "Central European")},
 
-    {SUBTITLE_ENCODING_GB18030,                "GB18030",              qtTrId ("Chinese Simplified")},
-    {SUBTITLE_ENCODING_GB2312,         "GB2312",               qtTrId ("Chinese Simplified")},
-    {SUBTITLE_ENCODING_GBK,            "GBK",                  qtTrId ("Chinese Simplified")},
-    {SUBTITLE_ENCODING_HZ,             "HZ",                   qtTrId ("Chinese Simplified")},
+    {SUBTITLE_ENCODING_GB18030,                "GB18030",              QT_TRANSLATE_NOOP ("SubtitlesWidget", "Chinese Simplified")},
+    {SUBTITLE_ENCODING_GB2312,         "GB2312",               QT_TRANSLATE_NOOP ("SubtitlesWidget", "Chinese Simplified")},
+    {SUBTITLE_ENCODING_GBK,            "GBK",                  QT_TRANSLATE_NOOP ("SubtitlesWidget", "Chinese Simplified")},
+    {SUBTITLE_ENCODING_HZ,             "HZ",                   QT_TRANSLATE_NOOP ("SubtitlesWidget", "Chinese Simplified")},
 
-    {SUBTITLE_ENCODING_BIG5,           "BIG5",                 qtTrId ("Chinese Traditional")},
-    {SUBTITLE_ENCODING_BIG5_HKSCS,     "BIG5-HKSCS",           qtTrId ("Chinese Traditional")},
-    {SUBTITLE_ENCODING_EUC_TW,         "EUC-TW",               qtTrId ("Chinese Traditional")},
+    {SUBTITLE_ENCODING_BIG5,           "BIG5",                 QT_TRANSLATE_NOOP ("SubtitlesWidget", "Chinese Traditional")},
+    {SUBTITLE_ENCODING_BIG5_HKSCS,     "BIG5-HKSCS",           QT_TRANSLATE_NOOP ("SubtitlesWidget", "Chinese Traditional")},
+    {SUBTITLE_ENCODING_EUC_TW,         "EUC-TW",               QT_TRANSLATE_NOOP ("SubtitlesWidget", "Chinese Traditional")},
 
-    {SUBTITLE_ENCODING_MAC_CROATIAN,   "MAC_CROATIAN",         qtTrId ("Croatian")},
+    {SUBTITLE_ENCODING_MAC_CROATIAN,   "MAC_CROATIAN",         QT_TRANSLATE_NOOP ("SubtitlesWidget", "Croatian")},
 
-    {SUBTITLE_ENCODING_ISO_8859_5,     "ISO-8859-5",           qtTrId ("Cyrillic")},
-    {SUBTITLE_ENCODING_IBM_855,                "IBM855",               qtTrId ("Cyrillic")},
-    {SUBTITLE_ENCODING_ISO_IR_111,     "ISO-IR-111",           qtTrId ("Cyrillic")},
-    {SUBTITLE_ENCODING_KOI8_R,         "KOI8-R",               qtTrId ("Cyrillic")},
-    {SUBTITLE_ENCODING_MAC_CYRILLIC,   "MAC-CYRILLIC",         qtTrId ("Cyrillic")},
-    {SUBTITLE_ENCODING_WINDOWS_1251,   "WINDOWS-1251",         qtTrId ("Cyrillic")},
+    {SUBTITLE_ENCODING_ISO_8859_5,     "ISO-8859-5",           QT_TRANSLATE_NOOP ("SubtitlesWidget", "Cyrillic")},
+    {SUBTITLE_ENCODING_IBM_855,                "IBM855",               QT_TRANSLATE_NOOP ("SubtitlesWidget", "Cyrillic")},
+    {SUBTITLE_ENCODING_ISO_IR_111,     "ISO-IR-111",           QT_TRANSLATE_NOOP ("SubtitlesWidget", "Cyrillic")},
+    {SUBTITLE_ENCODING_KOI8_R,         "KOI8-R",               QT_TRANSLATE_NOOP ("SubtitlesWidget", "Cyrillic")},
+    {SUBTITLE_ENCODING_MAC_CYRILLIC,   "MAC-CYRILLIC",         QT_TRANSLATE_NOOP ("SubtitlesWidget", "Cyrillic")},
+    {SUBTITLE_ENCODING_WINDOWS_1251,   "WINDOWS-1251",         QT_TRANSLATE_NOOP ("SubtitlesWidget", "Cyrillic")},
 
-    {SUBTITLE_ENCODING_CP_866,         "CP866",                qtTrId ("Cyrillic/Russian")},
+    {SUBTITLE_ENCODING_CP_866,         "CP866",                QT_TRANSLATE_NOOP ("SubtitlesWidget", "Cyrillic/Russian")},
 
-    {SUBTITLE_ENCODING_MAC_UKRAINIAN,  "MAC_UKRAINIAN",        qtTrId ("Cyrillic/Ukrainian")},
-    {SUBTITLE_ENCODING_KOI8_U,         "KOI8-U",               qtTrId ("Cyrillic/Ukrainian")},
+    {SUBTITLE_ENCODING_MAC_UKRAINIAN,  "MAC_UKRAINIAN",        QT_TRANSLATE_NOOP ("SubtitlesWidget", "Cyrillic/Ukrainian")},
+    {SUBTITLE_ENCODING_KOI8_U,         "KOI8-U",               QT_TRANSLATE_NOOP ("SubtitlesWidget", "Cyrillic/Ukrainian")},
 
-    {SUBTITLE_ENCODING_GEOSTD8,                "GEORGIAN-PS",          qtTrId ("Georgian")},
+    {SUBTITLE_ENCODING_GEOSTD8,                "GEORGIAN-PS",          QT_TRANSLATE_NOOP ("SubtitlesWidget", "Georgian")},
 
-    {SUBTITLE_ENCODING_ISO_8859_7,     "ISO-8859-7",           qtTrId ("Greek")},
-    {SUBTITLE_ENCODING_MAC_GREEK,      "MAC_GREEK",            qtTrId ("Greek")},
-    {SUBTITLE_ENCODING_WINDOWS_1253,   "WINDOWS-1253",         qtTrId ("Greek")},
+    {SUBTITLE_ENCODING_ISO_8859_7,     "ISO-8859-7",           QT_TRANSLATE_NOOP ("SubtitlesWidget", "Greek")},
+    {SUBTITLE_ENCODING_MAC_GREEK,      "MAC_GREEK",            QT_TRANSLATE_NOOP ("SubtitlesWidget", "Greek")},
+    {SUBTITLE_ENCODING_WINDOWS_1253,   "WINDOWS-1253",         QT_TRANSLATE_NOOP ("SubtitlesWidget", "Greek")},
 
-    {SUBTITLE_ENCODING_MAC_GUJARATI,   "MAC_GUJARATI",         qtTrId ("Gujarati")},
+    {SUBTITLE_ENCODING_MAC_GUJARATI,   "MAC_GUJARATI",         QT_TRANSLATE_NOOP ("SubtitlesWidget", "Gujarati")},
 
-    {SUBTITLE_ENCODING_MAC_GURMUKHI,   "MAC_GURMUKHI",         qtTrId ("Gurmukhi")},
+    {SUBTITLE_ENCODING_MAC_GURMUKHI,   "MAC_GURMUKHI",         QT_TRANSLATE_NOOP ("SubtitlesWidget", "Gurmukhi")},
 
-    {SUBTITLE_ENCODING_ISO_8859_8_I,   "ISO-8859-8-I",         qtTrId ("Hebrew")},
-    {SUBTITLE_ENCODING_IBM_862,                "IBM862",               qtTrId ("Hebrew")},
-    {SUBTITLE_ENCODING_MAC_HEBREW,     "MAC_HEBREW",           qtTrId ("Hebrew")},
-    {SUBTITLE_ENCODING_WINDOWS_1255,   "WINDOWS-1255",         qtTrId ("Hebrew")},
+    {SUBTITLE_ENCODING_ISO_8859_8_I,   "ISO-8859-8-I",         QT_TRANSLATE_NOOP ("SubtitlesWidget", "Hebrew")},
+    {SUBTITLE_ENCODING_IBM_862,                "IBM862",               QT_TRANSLATE_NOOP ("SubtitlesWidget", "Hebrew")},
+    {SUBTITLE_ENCODING_MAC_HEBREW,     "MAC_HEBREW",           QT_TRANSLATE_NOOP ("SubtitlesWidget", "Hebrew")},
+    {SUBTITLE_ENCODING_WINDOWS_1255,   "WINDOWS-1255",         QT_TRANSLATE_NOOP ("SubtitlesWidget", "Hebrew")},
 
-    {SUBTITLE_ENCODING_ISO_8859_8,     "ISO-8859-8",           qtTrId ("Hebrew Visual")},
+    {SUBTITLE_ENCODING_ISO_8859_8,     "ISO-8859-8",           QT_TRANSLATE_NOOP ("SubtitlesWidget", "Hebrew Visual")},
 
-    {SUBTITLE_ENCODING_MAC_DEVANAGARI, "MAC_DEVANAGARI",       qtTrId ("Hindi")},
+    {SUBTITLE_ENCODING_MAC_DEVANAGARI, "MAC_DEVANAGARI",       QT_TRANSLATE_NOOP ("SubtitlesWidget", "Hindi")},
 
-    {SUBTITLE_ENCODING_MAC_ICELANDIC,  "MAC_ICELANDIC",        qtTrId ("Icelandic")},
+    {SUBTITLE_ENCODING_MAC_ICELANDIC,  "MAC_ICELANDIC",        QT_TRANSLATE_NOOP ("SubtitlesWidget", "Icelandic")},
 
-    {SUBTITLE_ENCODING_EUC_JP,         "EUC-JP",               qtTrId ("Japanese")},
-    {SUBTITLE_ENCODING_ISO_2022_JP,    "ISO2022JP",            qtTrId ("Japanese")},
-    {SUBTITLE_ENCODING_SHIFT_JIS,      "SHIFT-JIS",            qtTrId ("Japanese")},
+    {SUBTITLE_ENCODING_EUC_JP,         "EUC-JP",               QT_TRANSLATE_NOOP ("SubtitlesWidget", "Japanese")},
+    {SUBTITLE_ENCODING_ISO_2022_JP,    "ISO2022JP",            QT_TRANSLATE_NOOP ("SubtitlesWidget", "Japanese")},
+    {SUBTITLE_ENCODING_SHIFT_JIS,      "SHIFT-JIS",            QT_TRANSLATE_NOOP ("SubtitlesWidget", "Japanese")},
 
-    {SUBTITLE_ENCODING_EUC_KR,         "EUC-KR",               qtTrId ("Korean")},
-    {SUBTITLE_ENCODING_ISO_2022_KR,    "ISO2022KR",            qtTrId ("Korean")},
-    {SUBTITLE_ENCODING_JOHAB,          "JOHAB",                qtTrId ("Korean")},
-    {SUBTITLE_ENCODING_UHC,            "UHC",                  qtTrId ("Korean")},
+    {SUBTITLE_ENCODING_EUC_KR,         "EUC-KR",               QT_TRANSLATE_NOOP ("SubtitlesWidget", "Korean")},
+    {SUBTITLE_ENCODING_ISO_2022_KR,    "ISO2022KR",            QT_TRANSLATE_NOOP ("SubtitlesWidget", "Korean")},
+    {SUBTITLE_ENCODING_JOHAB,          "JOHAB",                QT_TRANSLATE_NOOP ("SubtitlesWidget", "Korean")},
+    {SUBTITLE_ENCODING_UHC,            "UHC",                  QT_TRANSLATE_NOOP ("SubtitlesWidget", "Korean")},
 
-    {SUBTITLE_ENCODING_ISO_8859_10,    "ISO-8859-10",          qtTrId ("Nordic")},
+    {SUBTITLE_ENCODING_ISO_8859_10,    "ISO-8859-10",          QT_TRANSLATE_NOOP ("SubtitlesWidget", "Nordic")},
 
-    {SUBTITLE_ENCODING_MAC_FARSI,      "MAC_FARSI",            qtTrId ("Persian")},
+    {SUBTITLE_ENCODING_MAC_FARSI,      "MAC_FARSI",            QT_TRANSLATE_NOOP ("SubtitlesWidget", "Persian")},
 
-    {SUBTITLE_ENCODING_ISO_8859_16,    "ISO-8859-16",          qtTrId ("Romanian")},
-    {SUBTITLE_ENCODING_MAC_ROMANIAN,   "MAC_ROMANIAN",         qtTrId ("Romanian")},
+    {SUBTITLE_ENCODING_ISO_8859_16,    "ISO-8859-16",          QT_TRANSLATE_NOOP ("SubtitlesWidget", "Romanian")},
+    {SUBTITLE_ENCODING_MAC_ROMANIAN,   "MAC_ROMANIAN",         QT_TRANSLATE_NOOP ("SubtitlesWidget", "Romanian")},
 
-    {SUBTITLE_ENCODING_ISO_8859_3,     "ISO-8859-3",           qtTrId ("South European")},
+    {SUBTITLE_ENCODING_ISO_8859_3,     "ISO-8859-3",           QT_TRANSLATE_NOOP ("SubtitlesWidget", "South European")},
 
-    {SUBTITLE_ENCODING_TIS_620,                "TIS-620",              qtTrId ("Thai")},
+    {SUBTITLE_ENCODING_TIS_620,                "TIS-620",              QT_TRANSLATE_NOOP ("SubtitlesWidget", "Thai")},
 
-    {SUBTITLE_ENCODING_ISO_8859_9,     "ISO-8859-9",           qtTrId ("Turkish")},
-    {SUBTITLE_ENCODING_IBM_857,                "IBM857",               qtTrId ("Turkish")},
-    {SUBTITLE_ENCODING_MAC_TURKISH,    "MAC_TURKISH",          qtTrId ("Turkish")},
-    {SUBTITLE_ENCODING_WINDOWS_1254,   "WINDOWS-1254",         qtTrId ("Turkish")},
+    {SUBTITLE_ENCODING_ISO_8859_9,     "ISO-8859-9",           QT_TRANSLATE_NOOP ("SubtitlesWidget", "Turkish")},
+    {SUBTITLE_ENCODING_IBM_857,                "IBM857",               QT_TRANSLATE_NOOP ("SubtitlesWidget", "Turkish")},
+    {SUBTITLE_ENCODING_MAC_TURKISH,    "MAC_TURKISH",          QT_TRANSLATE_NOOP ("SubtitlesWidget", "Turkish")},
+    {SUBTITLE_ENCODING_WINDOWS_1254,   "WINDOWS-1254",         QT_TRANSLATE_NOOP ("SubtitlesWidget", "Turkish")},
 
-    {SUBTITLE_ENCODING_UTF_7,          "UTF-7",                qtTrId ("Unicode")},
-    {SUBTITLE_ENCODING_UTF_8,          "UTF-8",                qtTrId ("Unicode")},
-    {SUBTITLE_ENCODING_UTF_16,         "UTF-16",               qtTrId ("Unicode")},
-    {SUBTITLE_ENCODING_UCS_2,          "UCS-2",                qtTrId ("Unicode")},
-    {SUBTITLE_ENCODING_UCS_4,          "UCS-4",                qtTrId ("Unicode")},
+    {SUBTITLE_ENCODING_UTF_7,          "UTF-7",                QT_TRANSLATE_NOOP ("SubtitlesWidget", "Unicode")},
+    {SUBTITLE_ENCODING_UTF_8,          "UTF-8",                QT_TRANSLATE_NOOP ("SubtitlesWidget", "Unicode")},
+    {SUBTITLE_ENCODING_UTF_16,         "UTF-16",               QT_TRANSLATE_NOOP ("SubtitlesWidget", "Unicode")},
+    {SUBTITLE_ENCODING_UCS_2,          "UCS-2",                QT_TRANSLATE_NOOP ("SubtitlesWidget", "Unicode")},
+    {SUBTITLE_ENCODING_UCS_4,          "UCS-4",                QT_TRANSLATE_NOOP ("SubtitlesWidget", "Unicode")},
 
-    {SUBTITLE_ENCODING_ISO_8859_1,     "ISO-8859-1",           qtTrId ("Western")},
-    {SUBTITLE_ENCODING_ISO_8859_15,    "ISO-8859-15",          qtTrId ("Western")},
-    {SUBTITLE_ENCODING_IBM_850,                "IBM850",               qtTrId ("Western")},
-    {SUBTITLE_ENCODING_MAC_ROMAN,      "MAC_ROMAN",            qtTrId ("Western")},
-    {SUBTITLE_ENCODING_WINDOWS_1252,   "WINDOWS-1252",         qtTrId ("Western")},
+    {SUBTITLE_ENCODING_ISO_8859_1,     "ISO-8859-1",           QT_TRANSLATE_NOOP ("SubtitlesWidget", "Western")},
+    {SUBTITLE_ENCODING_ISO_8859_15,    "ISO-8859-15",          QT_TRANSLATE_NOOP ("SubtitlesWidget", "Western")},
+    {SUBTITLE_ENCODING_IBM_850,                "IBM850",               QT_TRANSLATE_NOOP ("SubtitlesWidget", "Western")},
+    {SUBTITLE_ENCODING_MAC_ROMAN,      "MAC_ROMAN",            QT_TRANSLATE_NOOP ("SubtitlesWidget", "Western")},
+    {SUBTITLE_ENCODING_WINDOWS_1252,   "WINDOWS-1252",         QT_TRANSLATE_NOOP ("SubtitlesWidget", "Western")},
 
-    {SUBTITLE_ENCODING_TCVN,           "TCVN",                 qtTrId ("Vietnamese")},
-    {SUBTITLE_ENCODING_VISCII,         "VISCII",               qtTrId ("Vietnamese")},
-    {SUBTITLE_ENCODING_WINDOWS_1258,   "WINDOWS-1258",         qtTrId ("Vietnamese")},
+    {SUBTITLE_ENCODING_TCVN,           "TCVN",                 QT_TRANSLATE_NOOP ("SubtitlesWidget", "Vietnamese")},
+    {SUBTITLE_ENCODING_VISCII,         "VISCII",               QT_TRANSLATE_NOOP ("SubtitlesWidget", "Vietnamese")},
+    {SUBTITLE_ENCODING_WINDOWS_1258,   "WINDOWS-1258",         QT_TRANSLATE_NOOP ("SubtitlesWidget", "Vietnamese")},
 
-    {SUBTITLE_ENCODING_CURRENT_LOCALE, NULL,                   qtTrId ("Current Locale")}
+    {SUBTITLE_ENCODING_CURRENT_LOCALE, NULL,                   QT_TRANSLATE_NOOP ("SubtitlesWidget", "Current Locale")}
 };
 
 /******************************************************************************
@@ -394,7 +394,7 @@ SubtitlesWidget::addHeaderContainer ()
     layout = new QGraphicsLinearLayout (Qt::Horizontal);
     layout->setContentsMargins (0.0, 0.0, 0.0, 0.0);
 
-    m_TitleLabel = new MLabel (qtTrId ("Subtitles"));
+    m_TitleLabel = new MLabel (tr ("Subtitles"));
     m_TitleLabel->setStyleName ("CommonHeaderInverted");
     layout->addItem (m_TitleLabel);
     layout->setAlignment (m_TitleLabel, Qt::AlignLeft);
@@ -424,7 +424,7 @@ SubtitlesWidget::addAutoloadSubtitlesContainer ()
     MLabel *label = new MLabel;
     label->setWordWrap (true);
     label->setStyleName ("CommonSingleTitleInverted");
-    label->setText (qtTrId ("Automatically load subtitles"));
+    label->setText (tr ("Automatically load subtitles"));
     layout->addItem (label);
     layout->setAlignment (label, Qt::AlignVCenter);
 
@@ -464,7 +464,7 @@ SubtitlesWidget::addSubtitlesFontStyleContainer ()
     layout->setSpacing (0.0);
     container->centralWidget()->setLayout (layout);
 
-    m_FontStyleLabel = new MLabel (qtTrId ("Font style"));
+    m_FontStyleLabel = new MLabel (tr ("Font style"));
     m_FontStyleLabel->setStyleName ("CommonTitleInverted");
 
     layout->addItem (m_FontStyleLabel);
@@ -483,7 +483,7 @@ SubtitlesWidget::addSubtitlesFontStyleContainer ()
     m_RegularStyleButton = new MButton ();
     m_RegularStyleButton->setCheckable (true);
     m_RegularStyleButton->setViewType (MButton::groupType);
-    m_RegularStyleButton->setText (font_styles[0].name);
+    m_RegularStyleButton->setText (tr (font_styles[0].name));
     buttonGroupLayout->addItem (m_RegularStyleButton);
 
     connect (m_RegularStyleButton, SIGNAL (toggled (bool)),
@@ -492,7 +492,7 @@ SubtitlesWidget::addSubtitlesFontStyleContainer ()
     m_ItalicStyleButton = new MButton ();
     m_ItalicStyleButton->setCheckable (true);
     m_ItalicStyleButton->setViewType (MButton::groupType);
-    m_ItalicStyleButton->setText (font_styles[1].name);
+    m_ItalicStyleButton->setText (tr (font_styles[1].name));
     buttonGroupLayout->addItem (m_ItalicStyleButton);
 
     connect (m_ItalicStyleButton, SIGNAL (toggled (bool)),
@@ -501,7 +501,7 @@ SubtitlesWidget::addSubtitlesFontStyleContainer ()
     m_BoldStyleButton = new MButton ();
     m_BoldStyleButton->setCheckable (true);
     m_BoldStyleButton->setViewType (MButton::groupType);
-    m_BoldStyleButton->setText (font_styles[2].name);
+    m_BoldStyleButton->setText (tr (font_styles[2].name));
     buttonGroupLayout->addItem (m_BoldStyleButton);
 
     connect (m_BoldStyleButton, SIGNAL (toggled (bool)),
@@ -524,7 +524,7 @@ SubtitlesWidget::addSubtitlesFontSizeContainer ()
     int                   index = 0;
 
     m_SubtitlesFontSizeCombo = new MComboBox ();
-    m_SubtitlesFontSizeCombo->setTitle (qtTrId ("Font size"));
+    m_SubtitlesFontSizeCombo->setTitle (tr ("Font size"));
     m_SubtitlesFontSizeCombo->setStyleName ("CommonComboBoxInverted");
 
     while (font_sizes[index] != -1) {
@@ -545,14 +545,14 @@ SubtitlesWidget::addSubtitlesEncodingContainer ()
     int                   index = 0;
 
     m_SubtitlesEncodingCombo = new MComboBox ();
-    m_SubtitlesEncodingCombo->setTitle (qtTrId ("Encoding"));
+    m_SubtitlesEncodingCombo->setTitle (tr ("Encoding"));
     m_SubtitlesEncodingCombo->setStyleName ("CommonComboBoxInverted");
 
     while (index < SUBTITLE_ENCODING_LAST) {
         if (encodings[index].charset.isNull ()) {
-            m_SubtitlesEncodingCombo->addItem (encodings[index].name);
+            m_SubtitlesEncodingCombo->addItem (tr (encodings[index].name));
         } else {
-            m_SubtitlesEncodingCombo->addItem (QString ("%1 (%2)").arg (encodings[index].name)
+            m_SubtitlesEncodingCombo->addItem (QString ("%1 (%2)").arg (tr (encodings[index].name))
                                                                   .arg (encodings[index].charset));
         }
         index++;

diff --git a/qmafw-gst-subtitles-renderer/applet/translations/subtitlesapplet_en.qm b/qmafw-gst-subtitles-renderer/applet/translations/subtitlesapplet_en.qm
index 6657a28..9dad8df 100644 (file)
Binary files a/qmafw-gst-subtitles-renderer/applet/translations/subtitlesapplet_en.qm and b/qmafw-gst-subtitles-renderer/applet/translations/subtitlesapplet_en.qm differ

diff --git a/qmafw-gst-subtitles-renderer/applet/translations/subtitlesapplet_en.ts b/qmafw-gst-subtitles-renderer/applet/translations/subtitlesapplet_en.ts
index 28c58da..b174430 100644 (file)
--- a/qmafw-gst-subtitles-renderer/applet/translations/subtitlesapplet_en.ts
+++ b/qmafw-gst-subtitles-renderer/applet/translations/subtitlesapplet_en.ts
@@ -2,251 +2,257 @@
 <!DOCTYPE TS>
 <TS version="2.0" language="en_US">
 <context>
-    <name></name>
-    <message id="Subtitles">
-        <location filename="../subtitlesapplet.cpp" line="64"/>
-        <location filename="../subtitleswidget.cpp" line="397"/>
-        <location filename="../subtitleswidget.cpp" line="572"/>
-        <source></source>
-        <translation>Subtitles</translation>
+    <name>SubtitlesApplet</name>
+    <message>
+        <location filename="../subtitlesapplet.cpp" line="63"/>
+        <source>Subtitles</source>
+        <translation type="unfinished"></translation>
     </message>
-    <message id="Regular">
+</context>
+<context>
+    <name>SubtitlesWidget</name>
+    <message>
+        <location filename="../subtitleswidget.cpp" line="56"/>
+        <source>Regular</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <location filename="../subtitleswidget.cpp" line="57"/>
-        <source></source>
-        <translation>Regular</translation>
+        <source>Italic</source>
+        <translation type="unfinished"></translation>
     </message>
-    <message id="Italic">
+    <message>
         <location filename="../subtitleswidget.cpp" line="58"/>
-        <source></source>
-        <translation>Italic</translation>
+        <source>Bold</source>
+        <translation type="unfinished"></translation>
     </message>
-    <message id="Bold">
+    <message>
         <location filename="../subtitleswidget.cpp" line="59"/>
-        <source></source>
-        <translation>Bold</translation>
-    </message>
-    <message id="Italic Bold">
-        <location filename="../subtitleswidget.cpp" line="60"/>
-        <source></source>
-        <translation>Italic Bold</translation>
+        <source>Italic Bold</source>
+        <translation type="unfinished"></translation>
     </message>
-    <message id="Arabic">
+    <message>
+        <location filename="../subtitleswidget.cpp" line="184"/>
         <location filename="../subtitleswidget.cpp" line="185"/>
         <location filename="../subtitleswidget.cpp" line="186"/>
         <location filename="../subtitleswidget.cpp" line="187"/>
-        <location filename="../subtitleswidget.cpp" line="188"/>
-        <source></source>
+        <source>Arabic</source>
         <translation type="unfinished"></translation>
     </message>
-    <message id="Armenian">
-        <location filename="../subtitleswidget.cpp" line="190"/>
-        <source></source>
+    <message>
+        <location filename="../subtitleswidget.cpp" line="189"/>
+        <source>Armenian</source>
         <translation type="unfinished"></translation>
     </message>
-    <message id="Baltic">
+    <message>
+        <location filename="../subtitleswidget.cpp" line="191"/>
         <location filename="../subtitleswidget.cpp" line="192"/>
         <location filename="../subtitleswidget.cpp" line="193"/>
-        <location filename="../subtitleswidget.cpp" line="194"/>
-        <source></source>
+        <source>Baltic</source>
         <translation type="unfinished"></translation>
     </message>
-    <message id="Celtic">
-        <location filename="../subtitleswidget.cpp" line="196"/>
-        <source></source>
+    <message>
+        <location filename="../subtitleswidget.cpp" line="195"/>
+        <source>Celtic</source>
         <translation type="unfinished"></translation>
     </message>
-    <message id="Central European">
+    <message>
+        <location filename="../subtitleswidget.cpp" line="197"/>
         <location filename="../subtitleswidget.cpp" line="198"/>
         <location filename="../subtitleswidget.cpp" line="199"/>
         <location filename="../subtitleswidget.cpp" line="200"/>
-        <location filename="../subtitleswidget.cpp" line="201"/>
-        <source></source>
+        <source>Central European</source>
         <translation type="unfinished"></translation>
     </message>
-    <message id="Chinese Simplified">
+    <message>
+        <location filename="../subtitleswidget.cpp" line="202"/>
         <location filename="../subtitleswidget.cpp" line="203"/>
         <location filename="../subtitleswidget.cpp" line="204"/>
         <location filename="../subtitleswidget.cpp" line="205"/>
-        <location filename="../subtitleswidget.cpp" line="206"/>
-        <source></source>
+        <source>Chinese Simplified</source>
         <translation type="unfinished"></translation>
     </message>
-    <message id="Chinese Traditional">
+    <message>
+        <location filename="../subtitleswidget.cpp" line="207"/>
         <location filename="../subtitleswidget.cpp" line="208"/>
         <location filename="../subtitleswidget.cpp" line="209"/>
-        <location filename="../subtitleswidget.cpp" line="210"/>
-        <source></source>
+        <source>Chinese Traditional</source>
         <translation type="unfinished"></translation>
     </message>
-    <message id="Croatian">
-        <location filename="../subtitleswidget.cpp" line="212"/>
-        <source></source>
+    <message>
+        <location filename="../subtitleswidget.cpp" line="211"/>
+        <source>Croatian</source>
         <translation type="unfinished"></translation>
     </message>
-    <message id="Cyrillic">
+    <message>
+        <location filename="../subtitleswidget.cpp" line="213"/>
         <location filename="../subtitleswidget.cpp" line="214"/>
         <location filename="../subtitleswidget.cpp" line="215"/>
         <location filename="../subtitleswidget.cpp" line="216"/>
         <location filename="../subtitleswidget.cpp" line="217"/>
         <location filename="../subtitleswidget.cpp" line="218"/>
-        <location filename="../subtitleswidget.cpp" line="219"/>
-        <source></source>
+        <source>Cyrillic</source>
         <translation type="unfinished"></translation>
     </message>
-    <message id="Cyrillic/Russian">
-        <location filename="../subtitleswidget.cpp" line="221"/>
-        <source></source>
+    <message>
+        <location filename="../subtitleswidget.cpp" line="220"/>
+        <source>Cyrillic/Russian</source>
         <translation type="unfinished"></translation>
     </message>
-    <message id="Cyrillic/Ukrainian">
+    <message>
+        <location filename="../subtitleswidget.cpp" line="222"/>
         <location filename="../subtitleswidget.cpp" line="223"/>
-        <location filename="../subtitleswidget.cpp" line="224"/>
-        <source></source>
+        <source>Cyrillic/Ukrainian</source>
         <translation type="unfinished"></translation>
     </message>
-    <message id="Georgian">
-        <location filename="../subtitleswidget.cpp" line="226"/>
-        <source></source>
+    <message>
+        <location filename="../subtitleswidget.cpp" line="225"/>
+        <source>Georgian</source>
         <translation type="unfinished"></translation>
     </message>
-    <message id="Greek">
+    <message>
+        <location filename="../subtitleswidget.cpp" line="227"/>
         <location filename="../subtitleswidget.cpp" line="228"/>
         <location filename="../subtitleswidget.cpp" line="229"/>
-        <location filename="../subtitleswidget.cpp" line="230"/>
-        <source></source>
+        <source>Greek</source>
         <translation type="unfinished"></translation>
     </message>
-    <message id="Gujarati">
-        <location filename="../subtitleswidget.cpp" line="232"/>
-        <source></source>
+    <message>
+        <location filename="../subtitleswidget.cpp" line="231"/>
+        <source>Gujarati</source>
         <translation type="unfinished"></translation>
     </message>
-    <message id="Gurmukhi">
-        <location filename="../subtitleswidget.cpp" line="234"/>
-        <source></source>
+    <message>
+        <location filename="../subtitleswidget.cpp" line="233"/>
+        <source>Gurmukhi</source>
         <translation type="unfinished"></translation>
     </message>
-    <message id="Hebrew">
+    <message>
+        <location filename="../subtitleswidget.cpp" line="235"/>
         <location filename="../subtitleswidget.cpp" line="236"/>
         <location filename="../subtitleswidget.cpp" line="237"/>
         <location filename="../subtitleswidget.cpp" line="238"/>
-        <location filename="../subtitleswidget.cpp" line="239"/>
-        <source></source>
+        <source>Hebrew</source>
         <translation type="unfinished"></translation>
     </message>
-    <message id="Hebrew Visual">
-        <location filename="../subtitleswidget.cpp" line="241"/>
-        <source></source>
+    <message>
+        <location filename="../subtitleswidget.cpp" line="240"/>
+        <source>Hebrew Visual</source>
         <translation type="unfinished"></translation>
     </message>
-    <message id="Hindi">
-        <location filename="../subtitleswidget.cpp" line="243"/>
-        <source></source>
+    <message>
+        <location filename="../subtitleswidget.cpp" line="242"/>
+        <source>Hindi</source>
         <translation type="unfinished"></translation>
     </message>
-    <message id="Icelandic">
-        <location filename="../subtitleswidget.cpp" line="245"/>
-        <source></source>
+    <message>
+        <location filename="../subtitleswidget.cpp" line="244"/>
+        <source>Icelandic</source>
         <translation type="unfinished"></translation>
     </message>
-    <message id="Japanese">
+    <message>
+        <location filename="../subtitleswidget.cpp" line="246"/>
         <location filename="../subtitleswidget.cpp" line="247"/>
         <location filename="../subtitleswidget.cpp" line="248"/>
-        <location filename="../subtitleswidget.cpp" line="249"/>
-        <source></source>
+        <source>Japanese</source>
         <translation type="unfinished"></translation>
     </message>
-    <message id="Korean">
+    <message>
+        <location filename="../subtitleswidget.cpp" line="250"/>
         <location filename="../subtitleswidget.cpp" line="251"/>
         <location filename="../subtitleswidget.cpp" line="252"/>
         <location filename="../subtitleswidget.cpp" line="253"/>
-        <location filename="../subtitleswidget.cpp" line="254"/>
-        <source></source>
+        <source>Korean</source>
         <translation type="unfinished"></translation>
     </message>
-    <message id="Nordic">
-        <location filename="../subtitleswidget.cpp" line="256"/>
-        <source></source>
+    <message>
+        <location filename="../subtitleswidget.cpp" line="255"/>
+        <source>Nordic</source>
         <translation type="unfinished"></translation>
     </message>
-    <message id="Persian">
-        <location filename="../subtitleswidget.cpp" line="258"/>
-        <source></source>
+    <message>
+        <location filename="../subtitleswidget.cpp" line="257"/>
+        <source>Persian</source>
         <translation type="unfinished"></translation>
     </message>
-    <message id="Romanian">
+    <message>
+        <location filename="../subtitleswidget.cpp" line="259"/>
         <location filename="../subtitleswidget.cpp" line="260"/>
-        <location filename="../subtitleswidget.cpp" line="261"/>
-        <source></source>
+        <source>Romanian</source>
         <translation type="unfinished"></translation>
     </message>
-    <message id="South European">
-        <location filename="../subtitleswidget.cpp" line="263"/>
-        <source></source>
+    <message>
+        <location filename="../subtitleswidget.cpp" line="262"/>
+        <source>South European</source>
         <translation type="unfinished"></translation>
     </message>
-    <message id="Thai">
-        <location filename="../subtitleswidget.cpp" line="265"/>
-        <source></source>
+    <message>
+        <location filename="../subtitleswidget.cpp" line="264"/>
+        <source>Thai</source>
         <translation type="unfinished"></translation>
     </message>
-    <message id="Turkish">
+    <message>
+        <location filename="../subtitleswidget.cpp" line="266"/>
         <location filename="../subtitleswidget.cpp" line="267"/>
         <location filename="../subtitleswidget.cpp" line="268"/>
         <location filename="../subtitleswidget.cpp" line="269"/>
-        <location filename="../subtitleswidget.cpp" line="270"/>
-        <source></source>
+        <source>Turkish</source>
         <translation type="unfinished"></translation>
     </message>
-    <message id="Unicode">
+    <message>
+        <location filename="../subtitleswidget.cpp" line="271"/>
         <location filename="../subtitleswidget.cpp" line="272"/>
         <location filename="../subtitleswidget.cpp" line="273"/>
         <location filename="../subtitleswidget.cpp" line="274"/>
         <location filename="../subtitleswidget.cpp" line="275"/>
-        <location filename="../subtitleswidget.cpp" line="276"/>
-        <source></source>
+        <source>Unicode</source>
         <translation type="unfinished"></translation>
     </message>
-    <message id="Western">
+    <message>
+        <location filename="../subtitleswidget.cpp" line="277"/>
         <location filename="../subtitleswidget.cpp" line="278"/>
         <location filename="../subtitleswidget.cpp" line="279"/>
         <location filename="../subtitleswidget.cpp" line="280"/>
         <location filename="../subtitleswidget.cpp" line="281"/>
-        <location filename="../subtitleswidget.cpp" line="282"/>
-        <source></source>
+        <source>Western</source>
         <translation type="unfinished"></translation>
     </message>
-    <message id="Vietnamese">
+    <message>
+        <location filename="../subtitleswidget.cpp" line="283"/>
         <location filename="../subtitleswidget.cpp" line="284"/>
         <location filename="../subtitleswidget.cpp" line="285"/>
-        <location filename="../subtitleswidget.cpp" line="286"/>
-        <source></source>
+        <source>Vietnamese</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../subtitleswidget.cpp" line="287"/>
+        <source>Current Locale</source>
         <translation type="unfinished"></translation>
     </message>
-    <message id="Current Locale">
-        <location filename="../subtitleswidget.cpp" line="288"/>
-        <source></source>
+    <message>
+        <location filename="../subtitleswidget.cpp" line="397"/>
+        <source>Subtitles</source>
         <translation type="unfinished"></translation>
     </message>
-    <message id="Automatically load subtitles">
+    <message>
         <location filename="../subtitleswidget.cpp" line="427"/>
-        <source></source>
-        <translation>Automatically load subtitles</translation>
+        <source>Automatically load subtitles</source>
+        <translation type="unfinished"></translation>
     </message>
-    <message id="Font style">
+    <message>
         <location filename="../subtitleswidget.cpp" line="467"/>
-        <source></source>
-        <translation>Font style</translation>
+        <source>Font style</source>
+        <translation type="unfinished"></translation>
     </message>
-    <message id="Font size">
+    <message>
         <location filename="../subtitleswidget.cpp" line="527"/>
-        <source></source>
-        <translation>Font size</translation>
+        <source>Font size</source>
+        <translation type="unfinished"></translation>
     </message>
-    <message id="Encoding">
+    <message>
         <location filename="../subtitleswidget.cpp" line="548"/>
-        <source></source>
-        <translation>Encoding</translation>
+        <source>Encoding</source>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>