Commit 88ba7022 authored by Friedemann Kleint's avatar Friedemann Kleint
Browse files

L10n: tr()-Fixes for 2.2

parent a6fc7e88
<ui version="4.0" >
<?xml version="1.0" encoding="UTF-8"?>
<ui version="4.0">
<class>mainClass</class>
<widget class="QWidget" name="mainClass" >
<property name="geometry" >
<widget class="QWidget" name="mainClass">
<property name="geometry">
<rect>
<x>0</x>
<y>0</y>
<width>399</width>
<height>176</height>
<width>390</width>
<height>146</height>
</rect>
</property>
<property name="windowTitle" >
<string>main</string>
<property name="windowTitle">
<string notr="true">main</string>
</property>
<layout class="QVBoxLayout" >
<layout class="QVBoxLayout">
<item>
<widget class="QComboBox" name="comboBox" />
<widget class="QComboBox" name="comboBox"/>
</item>
<item>
<layout class="QVBoxLayout" >
<layout class="QVBoxLayout">
<item>
<layout class="QHBoxLayout" >
<layout class="QHBoxLayout">
<item>
<widget class="QLabel" name="label" >
<property name="sizePolicy" >
<sizepolicy vsizetype="Preferred" hsizetype="Preferred" >
<widget class="QLabel" name="label">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Preferred">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="text" >
<string>Text1:</string>
<property name="text">
<string notr="true">Text1:</string>
</property>
</widget>
</item>
<item>
<widget class="QLabel" name="text1" >
<property name="enabled" >
<widget class="QLabel" name="text1">
<property name="enabled">
<bool>false</bool>
</property>
<property name="sizePolicy" >
<sizepolicy vsizetype="Preferred" hsizetype="MinimumExpanding" >
<property name="sizePolicy">
<sizepolicy hsizetype="MinimumExpanding" vsizetype="Preferred">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="text" >
<string>N/A</string>
<property name="text">
<string notr="true">N/A</string>
</property>
</widget>
</item>
</layout>
</item>
<item>
<layout class="QHBoxLayout" >
<layout class="QHBoxLayout">
<item>
<widget class="QLabel" name="label_3" >
<property name="text" >
<string>Text2:</string>
<widget class="QLabel" name="label_3">
<property name="text">
<string notr="true">Text2:</string>
</property>
</widget>
</item>
<item>
<widget class="QLabel" name="text2" >
<property name="enabled" >
<widget class="QLabel" name="text2">
<property name="enabled">
<bool>false</bool>
</property>
<property name="sizePolicy" >
<sizepolicy vsizetype="Preferred" hsizetype="MinimumExpanding" >
<property name="sizePolicy">
<sizepolicy hsizetype="MinimumExpanding" vsizetype="Preferred">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="text" >
<string>N/A</string>
<property name="text">
<string notr="true">N/A</string>
</property>
</widget>
</item>
</layout>
</item>
<item>
<layout class="QHBoxLayout" >
<layout class="QHBoxLayout">
<item>
<widget class="QLabel" name="label_5" >
<property name="text" >
<string>Text3:</string>
<widget class="QLabel" name="label_5">
<property name="text">
<string notr="true">Text3:</string>
</property>
</widget>
</item>
<item>
<widget class="QLabel" name="text3" >
<property name="enabled" >
<widget class="QLabel" name="text3">
<property name="enabled">
<bool>false</bool>
</property>
<property name="sizePolicy" >
<sizepolicy vsizetype="Preferred" hsizetype="MinimumExpanding" >
<property name="sizePolicy">
<sizepolicy hsizetype="MinimumExpanding" vsizetype="Preferred">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="text" >
<string>N/A</string>
<property name="text">
<string notr="true">N/A</string>
</property>
</widget>
</item>
......@@ -109,10 +110,10 @@
</item>
<item>
<spacer>
<property name="orientation" >
<property name="orientation">
<enum>Qt::Vertical</enum>
</property>
<property name="sizeHint" >
<property name="sizeHint" stdset="0">
<size>
<width>20</width>
<height>40</height>
......@@ -122,7 +123,7 @@
</item>
</layout>
</widget>
<layoutdefault spacing="6" margin="11" />
<layoutdefault spacing="6" margin="11"/>
<resources/>
<connections/>
</ui>
......@@ -317,10 +317,12 @@ void IPCEngineHost::fetchFrameSource(qint64 id)
void IPCEngineHost::rpcCallback(quint64 f, QByteArray payload)
{
switch (f) {
default:
default: {
showMessage(QLatin1String("IPC Error: unhandled id in guest to host call"));
showMessage(tr("Fatal engine shutdown. Incompatible binary or ipc error."), LogError);
showStatusMessage(tr("Fatal engine shutdown. Incompatible binary or ipc error."));
const QString logMessage = tr("Fatal engine shutdown. Incompatible binary or IPC error.");
showMessage(logMessage, LogError);
showStatusMessage(logMessage);
}
nuke();
break;
case IPCEngineGuest::NotifyEngineSetupOk:
......
......@@ -173,7 +173,7 @@ LldbEngineHost::LldbEngineHost(const DebuggerStartParameters &startParameters)
m_guestProcess->setReadChannel(QProcess::StandardOutput);
if (!m_guestProcess->waitForStarted()) {
showStatusMessage(tr("qtcreator-lldb failed to start %1").arg(m_guestProcess->error()));
showStatusMessage(tr("qtcreator-lldb failed to start: %1").arg(m_guestProcess->errorString()));
notifyEngineSpontaneousShutdown();
return;
}
......@@ -212,7 +212,7 @@ void LldbEngineHost::nuke()
}
void LldbEngineHost::sshConnectionError(Utils::SshError e)
{
showStatusMessage(tr("ssh connection error: %1").arg(e));
showStatusMessage(tr("SSH connection error: %1").arg(e));
}
void LldbEngineHost::finished(int, QProcess::ExitStatus status)
......
......@@ -191,10 +191,10 @@ bool GLSLEditorPlugin::initialize(const QStringList & /*arguments*/, QString *er
fragWizardParameters.setDisplayCategory(QCoreApplication::translate("GLSLEditor", Constants::WIZARD_TR_CATEGORY_GLSL));
fragWizardParameters.setDescription
(tr("Creates a fragment shader in the OpenGL/ES 2.0 Shading "
"Language (GLSL/ES). Fragment shaders generate the final "
"pixel colors for triangles, points, and lines rendered "
"Language (GLSL/ES). Fragment shaders generate the final "
"pixel colors for triangles, points and lines rendered "
"with OpenGL."));
fragWizardParameters.setDisplayName(tr("Fragment shader (OpenGL/ES 2.0)"));
fragWizardParameters.setDisplayName(tr("Fragment Shader (OpenGL/ES 2.0)"));
fragWizardParameters.setId(QLatin1String("F.GLSL"));
addAutoReleasedObject(new GLSLFileWizard(fragWizardParameters, GLSLFileWizard::FragmentShaderES, core));
......@@ -203,28 +203,28 @@ bool GLSLEditorPlugin::initialize(const QStringList & /*arguments*/, QString *er
vertWizardParameters.setDisplayCategory(QCoreApplication::translate("GLSLEditor", Constants::WIZARD_TR_CATEGORY_GLSL));
vertWizardParameters.setDescription
(tr("Creates a vertex shader in the OpenGL/ES 2.0 Shading "
"Language (GLSL/ES). Vertex shaders transform the "
"positions, normals, and texture co-ordinates of "
"triangles, points, and lines rendered with OpenGL."));
vertWizardParameters.setDisplayName(tr("Vertex shader (OpenGL/ES 2.0)"));
"Language (GLSL/ES). Vertex shaders transform the "
"positions, normals and texture co-ordinates of "
"triangles, points and lines rendered with OpenGL."));
vertWizardParameters.setDisplayName(tr("Vertex Shader (OpenGL/ES 2.0)"));
vertWizardParameters.setId(QLatin1String("G.GLSL"));
addAutoReleasedObject(new GLSLFileWizard(vertWizardParameters, GLSLFileWizard::VertexShaderES, core));
fragWizardParameters.setDescription
(tr("Creates a fragment shader in the Desktop OpenGL Shading "
"Language (GLSL). Fragment shaders generate the final "
"pixel colors for triangles, points, and lines rendered "
"Language (GLSL). Fragment shaders generate the final "
"pixel colors for triangles, points and lines rendered "
"with OpenGL."));
fragWizardParameters.setDisplayName(tr("Fragment shader (Desktop OpenGL)"));
fragWizardParameters.setDisplayName(tr("Fragment Shader (Desktop OpenGL)"));
fragWizardParameters.setId(QLatin1String("J.GLSL"));
addAutoReleasedObject(new GLSLFileWizard(fragWizardParameters, GLSLFileWizard::FragmentShaderDesktop, core));
vertWizardParameters.setDescription
(tr("Creates a vertex shader in the Desktop OpenGL Shading "
"Language (GLSL). Vertex shaders transform the "
"positions, normals, and texture co-ordinates of "
"triangles, points, and lines rendered with OpenGL."));
vertWizardParameters.setDisplayName(tr("Vertex shader (Desktop OpenGL)"));
"Language (GLSL). Vertex shaders transform the "
"positions, normals and texture co-ordinates of "
"triangles, points and lines rendered with OpenGL."));
vertWizardParameters.setDisplayName(tr("Vertex Shader (Desktop OpenGL)"));
vertWizardParameters.setId(QLatin1String("K.GLSL"));
addAutoReleasedObject(new GLSLFileWizard(vertWizardParameters, GLSLFileWizard::VertexShaderDesktop, core));
......
......@@ -120,7 +120,8 @@ void PluginDumper::dumpAllPlugins()
static QString qmldumpErrorMessage(const QString &libraryPath, const QString &error)
{
return PluginDumper::tr("Type dump of QML plugin in %0 failed.\nErrors:\n%1\n").arg(libraryPath, error);
return PluginDumper::tr("Type dump of QML plugin in %1 failed.\nErrors:\n%2\n").
arg(libraryPath, error);
}
static QString qmldumpFailedMessage(const QString &error)
......
......@@ -301,7 +301,7 @@ private:
QDir parentDir = QDir(dirPath + QLatin1String("/.."));
if ((!dir.exists() && !parentDir.mkdir(dir.dirName()))
|| !QFileInfo(dirPath).isWritable()) {
QMessageBox::critical(this, tr("Can't Create Keys"),
QMessageBox::critical(this, tr("Cannot Create Keys"),
tr("You have not entered a writable directory."));
return;
}
......@@ -312,7 +312,7 @@ private:
Utils::SshKeyGenerator keyGenerator;
if (!keyGenerator.generateKeys(Utils::SshKeyGenerator::Rsa,
Utils::SshKeyGenerator::OpenSsl, 1024)) {
QMessageBox::critical(this, tr("Can't Create Keys"),
QMessageBox::critical(this, tr("Cannot Create Keys"),
tr("Key creation failed: %1").arg(keyGenerator.error()));
enableInput();
return;
......@@ -324,7 +324,7 @@ private:
return;
}
m_ui->statusLabel->setText(m_ui->statusLabel->text() + tr("Done!"));
m_ui->statusLabel->setText(m_ui->statusLabel->text() + tr("Done."));
m_isComplete = true;
emit completeChanged();
}
......@@ -337,7 +337,7 @@ private:
file.write(data);
if (!canOpen || file.error() != QFile::NoError) {
QMessageBox::critical(this, tr("Could Not Save File"),
tr("Failed to save key file %1: %1").arg(filePath, file.errorString()));
tr("Failed to save key file %1: %2").arg(filePath, file.errorString()));
return false;
}
return true;
......@@ -428,7 +428,7 @@ private:
QMessageBox::information(this, tr("Key Deployment Success"),
tr("The key was successfully deployed. You may now close "
"the \"Mad Developer\" application and continue."));
m_ui->statusLabel->setText(m_ui->statusLabel->text() + tr("Done!"));
m_ui->statusLabel->setText(m_ui->statusLabel->text() + tr("Done."));
m_isComplete = true;
emit completeChanged();
}
......
......@@ -114,7 +114,7 @@ QVariant MaemoPublishedProjectModel::data(const QModelIndex &index,
return QFileSystemModel::data(index, role);
const bool include = !m_filesToExclude.contains(filePath(index));
if (role == Qt::DisplayRole)
return include ? tr("Include") : tr("Don't include");
return include ? tr("Include") : tr("Do not include");
else if (role == Qt::CheckStateRole)
return include ? Qt::Checked : Qt::Unchecked;
else
......
......@@ -96,7 +96,7 @@ MaemoRemoteProcessesDialog::~MaemoRemoteProcessesDialog()
void MaemoRemoteProcessesDialog::handleRemoteError(const QString &errorMsg)
{
QMessageBox::critical(this, tr("Remote error"), errorMsg);
QMessageBox::critical(this, tr("Remote Error"), errorMsg);
m_ui->updateListButton->setEnabled(true);
handleSelectionChanged();
}
......
......@@ -116,7 +116,7 @@ bool CodaRunControl::setupLauncher()
if (m_serialPort.length()) {
// We get the port from SymbianDeviceManager
appendMessage(tr("Connecting to '%2'...").arg(m_serialPort), NormalMessageFormat);
appendMessage(tr("Connecting to '%1'...").arg(m_serialPort), NormalMessageFormat);
m_codaDevice = SymbianUtils::SymbianDeviceManager::instance()->getTcfPort(m_serialPort);
bool ok = m_codaDevice && m_codaDevice->device()->isOpen();
......
......@@ -177,19 +177,19 @@ S60CertificateInfo::CertificateState S60CertificateInfo::validateCertificate()
QDateTime endTime(m_certificate->endTime());
QDateTime startTime(m_certificate->startTime());
if (currentTime > endTime) {
m_errorString = tr("The \"%1\" certificate has already expired and cannot be used."
m_errorString = tr("The certificate \"%1\" has already expired and cannot be used."
"\nExpiration date: %2.")
.arg(QFileInfo(m_filePath).fileName())
.arg(endTime.toLocalTime().toString(QLatin1String(SIMPLE_DATE_FORMAT)));
result = CertificateError;
} else if (currentTime < startTime) {
m_errorString = tr("The \"%1\" certificate is not yet valid.\nValid from: %2.")
m_errorString = tr("The certificate \"%1\" is not yet valid.\nValid from: %2.")
.arg(QFileInfo(m_filePath).fileName())
.arg(startTime.toLocalTime().toString(QLatin1String(SIMPLE_DATE_FORMAT)));
result = CertificateWarning; //This certificate may be valid in the near future
}
} else {
m_errorString = tr("The \"%1\" certificate is not a valid X.509 certificate.")
m_errorString = tr("The certificate \"%1\" is not a valid X.509 certificate.")
.arg(QFileInfo(m_filePath).baseName());
result = CertificateError;
}
......
......@@ -62,7 +62,7 @@ bool S60CreatePackageParser::parseLine(const QString &line)
QString lines = m_patchingLines.join("\n");
m_patchingLines.clear();
//: %1 package name, %2 will be replaced by a list of patching lines.
QString message = tr("The binary package '%1' was patched to be installable after being self-signed!\n%2\n"
QString message = tr("The binary package '%1' was patched to be installable after being self-signed.\n%2\n"
"Use a developer certificate or any other signing option to prevent "
"this patching from happening.").
arg(m_packageName, lines);
......
......@@ -46,7 +46,7 @@ SubdirsProjectWizardDialog::SubdirsProjectWizardDialog(const QString &templateNa
setWindowIcon(icon);
setWindowTitle(templateName);
setIntroDescription(tr("This wizard generates Qt4 subdirs project. "
setIntroDescription(tr("This wizard generates a Qt4 subdirs project. "
"Add subprojects to it later on by using the other wizards."));
addTargetSetupPage();
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment