Permalink
Browse files

Make more strings translatable.

  • Loading branch information...
1 parent 96db5e8 commit 5a1ff67e42776783ee43cd2a9bb7c15444a106aa @lordmulder committed Jan 1, 2011
Oops, something went wrong.
@@ -17,6 +17,9 @@ for %%f in (..\..\gui\*.ui) do (
for %%f in (..\..\src\*.cpp) do (
echo %%f >> update.lst
)
+for %%f in (..\..\src\*.h) do (
+ echo %%f >> update.lst
+)
REM ---------------------------
for %%f in (*.ts) do (
lupdate.exe @update.lst -no-obsolete -ts %%f
View
@@ -172,7 +172,7 @@
<item>
<widget class="QLabel" name="headerText">
<property name="text">
- <string>&lt;b&gt;Log File&lt;/b&gt;&lt;br&gt;The log file shows detailed information about the selected job.</string>
+ <string notr="true">&lt;b&gt;HEADER&lt;/b&gt;&lt;br&gt;(more header text)</string>
</property>
</widget>
</item>
@@ -286,7 +286,7 @@
<cursorShape>ArrowCursor</cursorShape>
</property>
<property name="plainText">
- <string>C:\DOS
+ <string notr="true">C:\DOS
C:\DOS\RUN
RUN\DOS\RUN
</string>
@@ -372,6 +372,7 @@ RUN\DOS\RUN
<include location="../res/Images.qrc"/>
<include location="../res/Images.qrc"/>
<include location="../res/Images.qrc"/>
+ <include location="../res/Images.qrc"/>
</resources>
<connections>
<connection>
View
@@ -137,7 +137,7 @@
</font>
</property>
<property name="text">
- <string>&lt;b&gt;Meta Information&lt;/b&gt;&lt;br&gt;The following meta information have been extracted from the original file.</string>
+ <string notr="true">&lt;b&gt;HEADER&lt;/b&gt;&lt;br&gt;(more header text)</string>
</property>
</widget>
</item>
@@ -318,6 +318,7 @@
<include location="../res/Images.qrc"/>
<include location="../res/Images.qrc"/>
<include location="../res/Images.qrc"/>
+ <include location="../res/Images.qrc"/>
</resources>
<connections>
<connection>
View
@@ -182,7 +182,7 @@
<item>
<widget class="QLabel" name="label_headerStatus">
<property name="text">
- <string>&lt;b&gt;Encoding Files&lt;/b&gt;&lt;br&gt;Your files are being encoded, please be patient...</string>
+ <string notr="true">&lt;b&gt;Header&lt;/b&gt;&lt;br&gt;(more status details)</string>
</property>
</widget>
</item>
@@ -355,7 +355,7 @@
<cursorShape>PointingHandCursor</cursorShape>
</property>
<property name="text">
- <string>(VERSION_TAG)</string>
+ <string notr="true">(VERSION_TAG)</string>
</property>
<property name="alignment">
<set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
@@ -436,6 +436,8 @@
<include location="../res/Images.qrc"/>
<include location="../res/Icons.qrc"/>
<include location="../res/Images.qrc"/>
+ <include location="../res/Icons.qrc"/>
+ <include location="../res/Images.qrc"/>
</resources>
<connections>
<connection>
View
@@ -212,7 +212,7 @@
<item>
<widget class="QLabel" name="hintLabel">
<property name="text">
- <string>$(HINT_TEXT)</string>
+ <string notr="true">$(HINT_TEXT)</string>
</property>
</widget>
</item>
@@ -246,7 +246,7 @@
<item row="1" column="2">
<widget class="QLabel" name="labelVersionLatest">
<property name="text">
- <string>(Unknown)</string>
+ <string notr="true">(Unknown)</string>
</property>
</widget>
</item>
@@ -260,7 +260,7 @@
<item row="0" column="2">
<widget class="QLabel" name="labelVersionInstalled">
<property name="text">
- <string>(Unknown)</string>
+ <string notr="true">(Unknown)</string>
</property>
</widget>
</item>
@@ -340,7 +340,7 @@
<item>
<widget class="QLabel" name="infoLabel">
<property name="text">
- <string>$(INFORMATION)</string>
+ <string notr="true">$(INFORMATION)</string>
</property>
</widget>
</item>
@@ -555,6 +555,10 @@
<include location="../res/Images.qrc"/>
<include location="../res/Icons.qrc"/>
<include location="../res/Images.qrc"/>
+ <include location="../res/Icons.qrc"/>
+ <include location="../res/Images.qrc"/>
+ <include location="../res/Icons.qrc"/>
+ <include location="../res/Images.qrc"/>
</resources>
<connections>
<connection>
View
@@ -87,7 +87,7 @@
</palette>
</property>
<property name="windowTitle">
- <string>Frame</string>
+ <string notr="true">Working</string>
</property>
<layout class="QHBoxLayout" name="horizontalLayout_2">
<item>
@@ -123,7 +123,7 @@
</font>
</property>
<property name="text">
- <string>$(Status)</string>
+ <string notr="true">$(Status)</string>
</property>
<property name="alignment">
<set>Qt::AlignCenter</set>
@@ -142,6 +142,7 @@
<include location="../res/Images.qrc"/>
<include location="../res/Images.qrc"/>
<include location="../res/Images.qrc"/>
+ <include location="../res/Images.qrc"/>
</resources>
<connections/>
</ui>
Binary file not shown.
View
@@ -25,7 +25,7 @@
#define VER_LAMEXP_MAJOR 4
#define VER_LAMEXP_MINOR_HI 0
#define VER_LAMEXP_MINOR_LO 0
-#define VER_LAMEXP_BUILD 202
+#define VER_LAMEXP_BUILD 204
#define VER_LAMEXP_SUFFIX TechPreview
/*
View
@@ -42,7 +42,7 @@
//Helper macros
#define LINK(URL) QString("<a href=\"%1\">%2</a>").arg(URL).arg(URL)
#define CONTRIBUTOR(LANG, CNTR, ICON) QString("<tr><td valign=\"middle\"><img src=\"%1\"></td><td>&nbsp;&nbsp;</td><td valign=\"middle\">%2</td><td>&nbsp;&nbsp;</td><td valign=\"middle\">%3</td></tr>").arg(ICON, LANG, CNTR);
-#define VSTR(BASE,TOOL,FORMAT) QString(BASE).arg(lamexp_version2string(FORMAT, lamexp_tool_version(TOOL)))
+#define VSTR(BASE,TOOL,FORMAT) BASE.arg(lamexp_version2string(FORMAT, lamexp_tool_version(TOOL)))
//Constants
const char *AboutDialog::neroAacUrl = "http://www.nero.com/eng/technologies-aac-codec.html";
@@ -58,11 +58,10 @@ AboutDialog::AboutDialog(SettingsModel *settings, QWidget *parent, bool firstSta
{
QString aboutText;
- aboutText += "<h2>LameXP - Audio Encoder Front-end</h2>";
+ aboutText += QString("<h2>%1</h2>").arg(tr("LameXP - Audio Encoder Front-end"));
aboutText += QString("<b>Copyright (C) 2004-%1 LoRd_MuldeR &lt;MuldeR2@GMX.de&gt;. Some rights reserved.</b><br>").arg(max(lamexp_version_date().year(),QDate::currentDate().year()));
aboutText += QString().sprintf("<b>Version %d.%02d %s, Build %d [%s]</b><br><br>", lamexp_version_major(), lamexp_version_minor(), lamexp_version_release(), lamexp_version_build(), lamexp_version_date().toString(Qt::ISODate).toLatin1().constData());
- aboutText += "<nobr>Please visit "; //the official web-site at
- aboutText += LINK("http://forum.doom9.org/showthread.php?t=157726") += " for news and updates!</nobr><br>"; //LINK("http://mulder.dummwiedeutsch.de/")
+ aboutText += QString("<nobr>%1</nobr><br>").arg(tr("Please visit %1 for news and updates!").arg(LINK("http://forum.doom9.org/showthread.php?t=157726")));
aboutText += "<hr><br>";
aboutText += "<nobr><tt>This program is free software; you can redistribute it and/or<br>";
aboutText += "modify it under the terms of the GNU General Public License<br>";
@@ -77,52 +76,52 @@ AboutDialog::AboutDialog(SettingsModel *settings, QWidget *parent, bool firstSta
aboutText += "Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.</tt></nobr><br>";
aboutText += "<hr><table><tr>";
aboutText += "<td valign=\"middle\"><img src=\":/icons/error_big.png\"</td><td>&nbsp;</td>";
- aboutText += "<td><font color=\"darkred\">Note: LameXP is free software. Do <b>not</b> pay money to obtain or use LameXP! If some third-party website tries to make you pay for downloading LameXP, you should <b>not</b> respond to the offer !!!</font></td>";
+ aboutText += QString("<td><font color=\"darkred\">%1</font></td>").arg(tr("Note: LameXP is free software. Do <b>not</b> pay money to obtain or use LameXP! If some third-party website tries to make you pay for downloading LameXP, you should <b>not</b> respond to the offer !!!"));
aboutText += "</tr></table><hr><br>";
- aboutText += QString("Special thanks go out to \"John33\" from %1 for his continuous support.<br>").arg(LINK("http://www.rarewares.org/"));
+ aboutText += QString("%1<br>").arg(tr("Special thanks go out to \"John33\" from %1 for his continuous support.").arg(LINK("http://www.rarewares.org/")));
setText(aboutText);
setIconPixmap(dynamic_cast<QApplication*>(QApplication::instance())->windowIcon().pixmap(QSize(64,64)));
- setWindowTitle("About LameXP");
+ setWindowTitle(tr("About LameXP"));
if(firstStart)
{
- QPushButton *firstButton = addButton("Show License Text", QMessageBox::AcceptRole);
+ QPushButton *firstButton = addButton(tr("Show License Text"), QMessageBox::AcceptRole);
firstButton->setIcon(QIcon(":/icons/script.png"));
firstButton->setMinimumWidth(135);
firstButton->disconnect();
connect(firstButton, SIGNAL(clicked()), this, SLOT(openLicenseText()));
- QPushButton *secondButton = addButton("Accept License", QMessageBox::AcceptRole);
+ QPushButton *secondButton = addButton(tr("Accept License"), QMessageBox::AcceptRole);
secondButton->setIcon(QIcon(":/icons/accept.png"));
secondButton->setMinimumWidth(120);
- QPushButton *thirdButton = addButton("Decline License", QMessageBox::AcceptRole);
+ QPushButton *thirdButton = addButton(tr("Decline License"), QMessageBox::AcceptRole);
thirdButton->setIcon(QIcon(":/icons/delete.png"));
thirdButton->setMinimumWidth(120);
thirdButton->setEnabled(false);
}
else
{
- QPushButton *firstButton = addButton("3rd Party S/W", QMessageBox::AcceptRole);
+ QPushButton *firstButton = addButton(tr("3rd Party S/W"), QMessageBox::AcceptRole);
firstButton->setIcon(QIcon(":/icons/page_white_cplusplus.png"));
firstButton->setMinimumWidth(120);
firstButton->disconnect();
connect(firstButton, SIGNAL(clicked()), this, SLOT(showMoreAbout()));
- QPushButton *secondButton = addButton("Contributors", QMessageBox::AcceptRole);
+ QPushButton *secondButton = addButton(tr("Contributors"), QMessageBox::AcceptRole);
secondButton->setIcon(QIcon(":icons/user_suit.png"));
secondButton->setMinimumWidth(120);
secondButton->disconnect();
connect(secondButton, SIGNAL(clicked()), this, SLOT(showAboutContributors()));
- QPushButton *thirdButton = addButton("About Qt4", QMessageBox::AcceptRole);
+ QPushButton *thirdButton = addButton(tr("About Qt4"), QMessageBox::AcceptRole);
thirdButton->setIcon(QIcon(":/images/Qt.svg"));
thirdButton->setMinimumWidth(120);
thirdButton->disconnect();
connect(thirdButton, SIGNAL(clicked()), this, SLOT(showAboutQt()));
- QPushButton *fourthButton = addButton("Discard", QMessageBox::AcceptRole);
+ QPushButton *fourthButton = addButton(tr("Discard"), QMessageBox::AcceptRole);
fourthButton->setIcon(QIcon(":/icons/cross.png"));
fourthButton->setMinimumWidth(90);
}
@@ -191,24 +190,24 @@ void AboutDialog::showAboutQt(void)
void AboutDialog::showAboutContributors(void)
{
QString contributorsAboutText;
- contributorsAboutText += "<h3>The following people have contributed to LameXP:</h3>";
- contributorsAboutText += "<b>Translators:</b>";
+ contributorsAboutText += QString("<h3>%1</h3>").arg(tr("The following people have contributed to LameXP:"));
+ contributorsAboutText += QString("<b>%1</b>").arg(tr("Translators:"));
contributorsAboutText += "<table style=\"margin-top:5px\">";
contributorsAboutText += CONTRIBUTOR("Englisch", "LoRd_MuldeR &lt;MuldeR2@GMX.de&gt;", ":/flags/gb.png");
contributorsAboutText += CONTRIBUTOR("Deutsch", "LoRd_MuldeR &lt;MuldeR2@GMX.de&gt;", ":/flags/de.png");
contributorsAboutText += "</table>";
contributorsAboutText += "<br><br>";
- contributorsAboutText += "<i>If you are willing to contribute a LameXP translation, feel free to contact us!</i><br>";
+ contributorsAboutText += QString("<i>%1</i><br>").arg(tr("If you are willing to contribute a LameXP translation, feel free to contact us!"));
QMessageBox *contributorsAboutBox = new QMessageBox(this);
contributorsAboutBox->setText(contributorsAboutText);
contributorsAboutBox->setIconPixmap(dynamic_cast<QApplication*>(QApplication::instance())->windowIcon().pixmap(QSize(64,64)));
- QPushButton *closeButton = contributorsAboutBox->addButton("Discard", QMessageBox::AcceptRole);
+ QPushButton *closeButton = contributorsAboutBox->addButton(tr("Discard"), QMessageBox::AcceptRole);
closeButton->setIcon(QIcon(":/icons/cross.png"));
closeButton->setMinimumWidth(90);
- contributorsAboutBox->setWindowTitle("About Contributors");
+ contributorsAboutBox->setWindowTitle(tr("About Contributors"));
contributorsAboutBox->setIconPixmap(QIcon(":/images/Logo_Contributors.png").pixmap(QSize(64,74)));
contributorsAboutBox->setWindowIcon(QIcon(":/icons/user_suit.png"));
contributorsAboutBox->exec();
@@ -219,64 +218,64 @@ void AboutDialog::showAboutContributors(void)
void AboutDialog::showMoreAbout(void)
{
QString moreAboutText;
- moreAboutText += "<h3>The following third-party software is used in LameXP:</h3>";
+ moreAboutText += QString("<h3>%1</h3>").arg(tr("The following third-party software is used in LameXP:"));
moreAboutText += "<div style=\"margin-left:-25px;font-size:8pt\"><ul>";
- moreAboutText += VSTR( "<li><b>LAME - OpenSource mp3 Encoder (%1)</b><br>", "lame.exe", "v?.?? a??");
- moreAboutText += "Released under the terms of the GNU Leser General Public License.<br>";
+ moreAboutText += VSTR(QString("<li><b>%1 (%2)</b><br>").arg(tr("LAME - OpenSource mp3 Encoder")), "lame.exe", "v?.?? a??");
+ moreAboutText += QString("<nobr>%1</nobr><br>").arg(tr("Released under the terms of the GNU Leser General Public License."));
moreAboutText += LINK("http://lame.sourceforge.net/");
moreAboutText += "<div style=\"font-size:1pt\"><br></div>";
- moreAboutText += VSTR("<li><b>OggEnc - Ogg Vorbis Encoder (%1)</b>", "oggenc2_i386.exe", "v?.??");
- moreAboutText += "<br>Completely open and patent-free audio encoding technology.<br>";
+ moreAboutText += VSTR(QString("<li><b>%1 (%2)</b><br>").arg(tr("OggEnc - Ogg Vorbis Encoder")), "oggenc2_i386.exe", "v?.??");
+ moreAboutText += QString("<nobr>%1</nobr><br>").arg(tr("Completely open and patent-free audio encoding technology."));
moreAboutText += LINK("http://www.vorbis.com/");
moreAboutText += "<div style=\"font-size:1pt\"><br></div>";
- moreAboutText += VSTR("<li><b>Nero AAC reference MPEG-4 Encoder (%1)</b><br>", "neroAacEnc.exe", "v?.?.?.?");
- moreAboutText += "Freeware state-of-the-art HE-AAC encoder with 2-Pass support.<br>";
- moreAboutText += "<i>Available from vendor web-site as free download:</i><br>";
+ moreAboutText += VSTR(QString("<li><b>%1 (%2)</b><br>").arg(tr("Nero AAC reference MPEG-4 Encoder")), "neroAacEnc.exe", "v?.?.?.?");
+ moreAboutText += QString("<nobr>%1</nobr><br>").arg(tr("Freeware state-of-the-art HE-AAC encoder with 2-Pass support."));
+ moreAboutText += QString("<nobr><i>%1</i></nobr><br>").arg(tr("Available from vendor web-site as free download:"));
moreAboutText += LINK(neroAacUrl);
moreAboutText += "<div style=\"font-size:1pt\"><br></div>";
- moreAboutText += VSTR("<li><b>FLAC - Free Lossless Audio Codec (%1)</b><br>", "flac.exe", "v?.?.?");
- moreAboutText += "Open and patent-free lossless audio compression technology.<br>";
+ moreAboutText += VSTR(QString("<li><b>%1 (%2)</b><br>").arg(tr("FLAC - Free Lossless Audio Codec")), "flac.exe", "v?.?.?");
+ moreAboutText += QString("<nobr>%1</nobr><br>").arg(tr("Open and patent-free lossless audio compression technology."));
moreAboutText += LINK("http://flac.sourceforge.net/");
moreAboutText += "<div style=\"font-size:1pt\"><br></div>";
- moreAboutText += VSTR("<li><b>AC3Filter Tools - AC3/DTS Decoder (%1)</b><br>", "valdec.exe", "v?.??");
- moreAboutText += "Released under the terms of the GNU Leser General Public License.<br>";
+ moreAboutText += VSTR(QString("<li><b>%1 (%2)</b><br>").arg(tr("AC3Filter Tools - AC3/DTS Decoder")), "valdec.exe", "v?.??");
+ moreAboutText += QString("<nobr>%1</nobr><br>").arg(tr("Released under the terms of the GNU Leser General Public License."));
moreAboutText += LINK("http://www.ac3filter.net/projects/tools");
moreAboutText += "<div style=\"font-size:1pt\"><br></div>";
- moreAboutText += VSTR("<li><b>MediaInfo - Media File Analysis Tool (%1)</b><br>", "mediainfo_i386.exe", "v?.?.?");
- moreAboutText += "Released under the terms of the GNU Leser General Public License.<br>";
+ moreAboutText += VSTR(QString("<li><b>%1 (%2)</b><br>").arg(tr("MediaInfo - Media File Analysis Tool")), "mediainfo_i386.exe", "v?.?.?");
+ moreAboutText += QString("<nobr>%1</nobr><br>").arg(tr("Released under the terms of the GNU Leser General Public License."));
moreAboutText += LINK("http://mediainfo.sourceforge.net/");
moreAboutText += "<div style=\"font-size:1pt\"><br></div>";
- moreAboutText += VSTR("<li><b>SoX - Sound eXchange (%1)</b><br>", "sox.exe", "v??.?.?");
- moreAboutText += "Released under the terms of the GNU Leser General Public License.<br>";
+ moreAboutText += VSTR(QString("<li><b>%1 (%2)</b><br>").arg(tr("SoX - Sound eXchange")), "sox.exe", "v??.?.?");
+ moreAboutText += QString("<nobr>%1</nobr><br>").arg(tr("Released under the terms of the GNU Leser General Public License."));
moreAboutText += LINK("http://sox.sourceforge.net/");
moreAboutText += "<div style=\"font-size:1pt\"><br></div>";
- moreAboutText += VSTR("<li><b>GnuPG - The GNU Privacy Guard (%1)</b><br>", "gpgv.exe", "v?.?.??");
- moreAboutText += "Released under the terms of the GNU Leser General Public License.<br>";
+ moreAboutText += VSTR(QString("<li><b>%1 (%2)</b><br>").arg(tr("GnuPG - The GNU Privacy Guard")), "gpgv.exe", "v?.?.??");
+ moreAboutText += QString("<nobr>%1</nobr><br>").arg(tr("Released under the terms of the GNU Leser General Public License."));
moreAboutText += LINK("http://www.gnupg.org/");
moreAboutText += "<div style=\"font-size:1pt\"><br></div>";
- moreAboutText += "<li><b>Silk Icons - Over 700 icons in PNG format (v1.3)</b><br>";
- moreAboutText += "<nobr>By Mark James, released under the Creative Commons 'by' License.</nobr><br>";
+ moreAboutText += QString("<li><b>%1 (v1.3)</b><br>").arg(tr("Silk Icons - Over 700 icons in PNG format"));
+ moreAboutText += QString("<nobr>%1</nobr><br>").arg(tr("By Mark James, released under the Creative Commons 'by' License."));
moreAboutText += LINK("http://www.famfamfam.com/lab/icons/silk/");
moreAboutText += "<br></ul></div>";
QMessageBox *moreAboutBox = new QMessageBox(this);
moreAboutBox->setText(moreAboutText);
moreAboutBox->setIconPixmap(dynamic_cast<QApplication*>(QApplication::instance())->windowIcon().pixmap(QSize(64,64)));
- QPushButton *closeButton = moreAboutBox->addButton("Discard", QMessageBox::AcceptRole);
+ QPushButton *closeButton = moreAboutBox->addButton(tr("Discard"), QMessageBox::AcceptRole);
closeButton->setIcon(QIcon(":/icons/cross.png"));
closeButton->setMinimumWidth(90);
- moreAboutBox->setWindowTitle("About Third-party Software");
+ moreAboutBox->setWindowTitle(tr("About Third-party Software"));
moreAboutBox->setIconPixmap(QIcon(":/images/Logo_Software.png").pixmap(QSize(64,71)));
moreAboutBox->setWindowIcon(QIcon(":/icons/page_white_cplusplus.png"));
moreAboutBox->exec();
View
@@ -64,7 +64,8 @@ DropBox::DropBox(QWidget *parent, QAbstractItemModel *model, SettingsModel *sett
setWindowOpacity(0.8);
//Translate UI
- retranslateUi(this);
+ QEvent languageChangeEvent(QEvent::LanguageChange);
+ changeEvent(&languageChangeEvent);
}
////////////////////////////////////////////////////////////
@@ -79,11 +80,6 @@ DropBox::~DropBox(void)
// PUBLIC SLOTS
////////////////////////////////////////////////////////////
-void DropBox::doRetranslate(void)
-{
- retranslateUi(this);
-}
-
void DropBox::modelChanged(void)
{
if(m_model)
View
@@ -64,6 +64,5 @@ class DropBox: public QDialog, private Ui::DropBox
public slots:
void modelChanged(void);
- void doRetranslate(void);
void showToolTip(void);
};
Oops, something went wrong.

0 comments on commit 5a1ff67

Please sign in to comment.