Make 8 more strings translatable.

This commit is contained in:
LoRd_MuldeR 2011-01-14 23:34:31 +01:00
parent f0266d7fdb
commit effbe66566
14 changed files with 275 additions and 14 deletions

View File

@ -1105,6 +1105,36 @@
<File
RelativePath=".\src\Model_AudioFile.h"
>
<FileConfiguration
Name="Debug|Win32"
>
<Tool
Name="VCCustomBuildTool"
Description="MOC &quot;$(SolutionDir)tmp\MOC_$(SafeInputName).cpp&quot;"
CommandLine="&quot;$(QTDIR)\bin\moc.exe&quot; -o &quot;$(SolutionDir)tmp\MOC_$(SafeInputName).cpp&quot; &quot;$(InputPath)&quot;"
Outputs="&quot;$(SolutionDir)tmp\MOC_$(SafeInputName).cpp&quot;"
/>
</FileConfiguration>
<FileConfiguration
Name="Release|Win32"
>
<Tool
Name="VCCustomBuildTool"
Description="MOC &quot;$(SolutionDir)tmp\MOC_$(SafeInputName).cpp&quot;"
CommandLine="&quot;$(QTDIR)\bin\moc.exe&quot; -o &quot;$(SolutionDir)tmp\MOC_$(SafeInputName).cpp&quot; &quot;$(InputPath)&quot;"
Outputs="&quot;$(SolutionDir)tmp\MOC_$(SafeInputName).cpp&quot;"
/>
</FileConfiguration>
<FileConfiguration
Name="Release_Static|Win32"
>
<Tool
Name="VCCustomBuildTool"
Description="MOC &quot;$(SolutionDir)tmp\MOC_$(SafeInputName).cpp&quot;"
CommandLine="&quot;$(QTDIR)\bin\moc.exe&quot; -o &quot;$(SolutionDir)tmp\MOC_$(SafeInputName).cpp&quot; &quot;$(InputPath)&quot;"
Outputs="&quot;$(SolutionDir)tmp\MOC_$(SafeInputName).cpp&quot;"
/>
</FileConfiguration>
</File>
<File
RelativePath=".\src\Model_FileList.h"
@ -1540,6 +1570,10 @@
RelativePath=".\tmp\MOC_Filter_Abstract.cpp"
>
</File>
<File
RelativePath=".\tmp\MOC_Model_AudioFile.cpp"
>
</File>
<File
RelativePath=".\tmp\MOC_Model_FileList.cpp"
>

View File

@ -135,6 +135,37 @@
<source>About Third-party Software</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>n/a</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>AudioFileModel</name>
<message>
<source>Profile</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Channels</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Samplerate</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Bitdepth</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Type</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Version</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>DecoderRegistry</name>
@ -574,6 +605,10 @@
<source>The current version available is %1 (or later), but you still have version %2 installed.</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>n/a</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>You can download the latest version of the Nero AAC encoder from the Nero website at:</source>
<translation type="unfinished"></translation>

View File

@ -135,6 +135,37 @@
<source>About Third-party Software</source>
<translation>Über Drittsoftware</translation>
</message>
<message>
<source>n/a</source>
<translation>n/v</translation>
</message>
</context>
<context>
<name>AudioFileModel</name>
<message>
<source>Profile</source>
<translation>Profil</translation>
</message>
<message>
<source>Channels</source>
<translation>Kanäle</translation>
</message>
<message>
<source>Samplerate</source>
<translation>Abtastrate</translation>
</message>
<message>
<source>Bitdepth</source>
<translation>Bittiefe</translation>
</message>
<message>
<source>Type</source>
<translation>Typ</translation>
</message>
<message>
<source>Version</source>
<translation>Version</translation>
</message>
</context>
<context>
<name>DecoderRegistry</name>
@ -843,6 +874,10 @@
<source>Translation Files</source>
<translation>Übersetzungsdateien</translation>
</message>
<message>
<source>n/a</source>
<translation>n/v</translation>
</message>
</context>
<context>
<name>MetaInfo</name>

View File

@ -136,6 +136,37 @@
<source>About Third-party Software</source>
<translation>Acerca del Software de terceros</translation>
</message>
<message>
<source>n/a</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>AudioFileModel</name>
<message>
<source>Profile</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Channels</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Samplerate</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Bitdepth</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Type</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Version</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>DecoderRegistry</name>
@ -843,6 +874,10 @@
<source>Quit LameXP</source>
<translation>Salir de LameXP</translation>
</message>
<message>
<source>n/a</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>MetaInfo</name>

View File

@ -138,6 +138,37 @@
<source>About Third-party Software</source>
<translation>A propos des logiciels tiers</translation>
</message>
<message>
<source>n/a</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>AudioFileModel</name>
<message>
<source>Profile</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Channels</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Samplerate</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Bitdepth</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Type</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Version</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>DecoderRegistry</name>
@ -847,6 +878,10 @@ Votre dossier TEMP est situé ici:</translation>
<source>Quit LameXP</source>
<translation>Quitter LameXP</translation>
</message>
<message>
<source>n/a</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>MetaInfo</name>

View File

@ -135,6 +135,37 @@
<source>Silk Icons - Over 700 icons in PNG format</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>n/a</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>AudioFileModel</name>
<message>
<source>Profile</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Channels</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Samplerate</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Bitdepth</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Type</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Version</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>DecoderRegistry</name>
@ -843,6 +874,10 @@
<source>Translation Files</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>n/a</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>MetaInfo</name>

Binary file not shown.

View File

@ -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 231
#define VER_LAMEXP_BUILD 232
#define VER_LAMEXP_SUFFIX TechPreview
/*

View File

@ -357,7 +357,7 @@ QString AboutDialog::makeToolText(const QString &toolName, const QString &toolBi
if(!toolBin.isEmpty())
{
verStr = lamexp_version2string(toolVerFmt, lamexp_tool_version(toolBin));
verStr = lamexp_version2string(toolVerFmt, lamexp_tool_version(toolBin), tr("n/a"));
}
toolText += QString("<li><b>%1 (%2)</b><br>").arg(toolName, verStr);

View File

@ -450,6 +450,7 @@ void MainWindow::changeEvent(QEvent *e)
m_showFolderContextAction->setText(tr("Browse Selected Folder"));
m_metaInfoModel->clearData();
updateEncoder(m_settings->compressionEncoder());
}
}
@ -648,7 +649,7 @@ void MainWindow::windowShown(void)
{
QString messageText;
messageText += QString("<nobr>%1<br>").arg(tr("LameXP detected that your version of the Nero AAC encoder is outdated!"));
messageText += QString("%1<br><br>").arg(tr("The current version available is %1 (or later), but you still have version %2 installed.").arg(lamexp_version2string("?.?.?.?", lamexp_toolver_neroaac()), lamexp_version2string("?.?.?.?", lamexp_tool_version("neroAacEnc.exe"))));
messageText += QString("%1<br><br>").arg(tr("The current version available is %1 (or later), but you still have version %2 installed.").arg(lamexp_version2string("?.?.?.?", lamexp_toolver_neroaac(), tr("n/a")), lamexp_version2string("?.?.?.?", lamexp_tool_version("neroAacEnc.exe"), tr("n/a"))));
messageText += QString("%1<br>").arg(tr("You can download the latest version of the Nero AAC encoder from the Nero website at:"));
messageText += "<b>" + LINK(AboutDialog::neroAacUrl) + "</b><br></nobr>";
QMessageBox::information(this, tr("AAC Encoder Outdated"), messageText);

View File

@ -841,11 +841,11 @@ unsigned int lamexp_tool_version(const QString &toolName)
/*
* Version number to human-readable string
*/
const QString lamexp_version2string(const QString &pattern, unsigned int version)
const QString lamexp_version2string(const QString &pattern, unsigned int version, const QString &defaultText)
{
if(version == UINT_MAX)
{
return "n/a";
return defaultText;
}
QString result = pattern;

View File

@ -103,7 +103,7 @@ static const char* LAMEXP_DEFAULT_LANGID = "en";
//Auxiliary functions
bool lamexp_clean_folder(const QString folderPath);
const QString lamexp_version2string(const QString &pattern, unsigned int version);
const QString lamexp_version2string(const QString &pattern, unsigned int version, const QString &defaultText);
QString lamexp_known_folder(lamexp_known_folder_t folder_id);
__int64 lamexp_free_diskspace(const QString &path);
bool lamexp_remove_file(const QString &filename);

View File

@ -22,6 +22,7 @@
#include "Model_AudioFile.h"
#include <QTime>
#include <QObject>
////////////////////////////////////////////////////////////
// Constructor & Destructor
@ -39,6 +40,52 @@ AudioFileModel::AudioFileModel(const QString &path, const QString &name)
m_formatAudioBitdepth = 0;
}
AudioFileModel::AudioFileModel(const AudioFileModel &model)
{
setFilePath(model.m_filePath);
setFileName(model.m_fileName);
setFileArtist(model.m_fileArtist);
setFileAlbum(model.m_fileAlbum);
setFileGenre(model.m_fileGenre);
setFileComment(model.m_fileComment);
setFileYear(model.m_fileYear);
setFilePosition(model.m_filePosition);
setFileDuration(model.m_fileDuration);
setFormatContainerType(model.m_formatContainerType);
setFormatContainerProfile(model.m_formatContainerProfile);
setFormatAudioType(model.m_formatAudioType);
setFormatAudioProfile(model.m_formatAudioProfile);
setFormatAudioVersion(model.m_formatAudioVersion);
setFormatAudioSamplerate(model.m_formatAudioSamplerate);
setFormatAudioChannels(model.m_formatAudioChannels);
setFormatAudioBitdepth(model.m_formatAudioBitdepth);
}
AudioFileModel &AudioFileModel::operator=(const AudioFileModel &model)
{
setFilePath(model.m_filePath);
setFileName(model.m_fileName);
setFileArtist(model.m_fileArtist);
setFileAlbum(model.m_fileAlbum);
setFileGenre(model.m_fileGenre);
setFileComment(model.m_fileComment);
setFileYear(model.m_fileYear);
setFilePosition(model.m_filePosition);
setFileDuration(model.m_fileDuration);
setFormatContainerType(model.m_formatContainerType);
setFormatContainerProfile(model.m_formatContainerProfile);
setFormatAudioType(model.m_formatAudioType);
setFormatAudioProfile(model.m_formatAudioProfile);
setFormatAudioVersion(model.m_formatAudioVersion);
setFormatAudioSamplerate(model.m_formatAudioSamplerate);
setFormatAudioChannels(model.m_formatAudioChannels);
setFormatAudioBitdepth(model.m_formatAudioBitdepth);
return (*this);
}
AudioFileModel::~AudioFileModel(void)
{
}
@ -154,7 +201,7 @@ const QString AudioFileModel::formatContainerInfo(void) const
if(!m_formatContainerType.isEmpty())
{
QString info = m_formatContainerType;
if(!m_formatContainerProfile.isEmpty()) info.append(" (Profile: ").append(m_formatContainerProfile).append(")");
if(!m_formatContainerProfile.isEmpty()) info.append(QString(" (%1: %2)").arg(tr("Profile"), m_formatContainerProfile));
return info;
}
else
@ -171,17 +218,17 @@ const QString AudioFileModel::formatAudioBaseInfo(void) const
if(m_formatAudioChannels)
{
if(!info.isEmpty()) info.append(", ");
info.append("Channels: ").append(QString::number(m_formatAudioChannels));
info.append(QString("%1: %2").arg(tr("Channels"), QString::number(m_formatAudioChannels)));
}
if(m_formatAudioSamplerate)
{
if(!info.isEmpty()) info.append(", ");
info.append("Samplerate: ").append(QString::number(m_formatAudioSamplerate)).append(" Hz");
info.append(QString("%1: %2 Hz").arg(tr("Samplerate"), QString::number(m_formatAudioSamplerate)));
}
if(m_formatAudioBitdepth)
{
if(!info.isEmpty()) info.append(", ");
info.append("Bitdepth: ").append(QString::number(m_formatAudioBitdepth)).append(" Bit");
info.append(QString("%1: %2 Bit").arg(tr("Bitdepth"), QString::number(m_formatAudioBitdepth)));
}
return info;
}
@ -198,16 +245,16 @@ const QString AudioFileModel::formatAudioCompressInfo(void) const
QString info;
if(!m_formatAudioProfile.isEmpty() || !m_formatAudioVersion.isEmpty())
{
info.append("Type: ");
info.append(QString("%1: ").arg(tr("Type")));
}
info.append(m_formatAudioType);
if(!m_formatAudioProfile.isEmpty())
{
info.append(", Profile: ").append(m_formatAudioProfile);
info.append(QString(", %1: %2").arg(tr("Profile"), m_formatAudioProfile));
}
if(!m_formatAudioVersion.isEmpty())
{
info.append(", Version: ").append(m_formatAudioVersion);
info.append(QString(", %1: %2").arg(tr("Version"), m_formatAudioVersion));
}
return info;
}

View File

@ -21,13 +21,17 @@
#pragma once
#include <QObject>
#include <QString>
class AudioFileModel
class AudioFileModel : public QObject
{
Q_OBJECT
public:
AudioFileModel(const QString &path = QString(), const QString &name = QString());
AudioFileModel(const AudioFileModel &model);
AudioFileModel &operator=(const AudioFileModel &model);
~AudioFileModel(void);
//-----------------------