feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

L10n: tr()-Fixes for 2.2

Browse Source
This commit is contained in:
Friedemann Kleint
2011-02-15 16:05:52 +01:00
parent a6fc7e8857
commit 88ba702293
12 changed files with 82 additions and 78 deletions
Download Patch File Download Diff File Expand all files Collapse all files

91
src/libs/aggregation/examples/text/main.ui
View File

@@ -1,105 +1,106 @@
<ui version="4.0" > <?xml version="1.0" encoding="UTF-8"?>
<ui version="4.0">
<class>mainClass</class> <class>mainClass</class>
<widget class="QWidget" name="mainClass" > <widget class="QWidget" name="mainClass">
<property name="geometry" > <property name="geometry">
<rect> <rect>
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>399</width> <width>390</width>
<height>176</height> <height>146</height>
</rect> </rect>
</property> </property>
<property name="windowTitle" > <property name="windowTitle">
<string>main</string> <string notr="true">main</string>
</property> </property>
<layout class="QVBoxLayout" > <layout class="QVBoxLayout">
<item> <item>
<widget class="QComboBox" name="comboBox" /> <widget class="QComboBox" name="comboBox"/>
</item> </item>
<item> <item>
<layout class="QVBoxLayout" > <layout class="QVBoxLayout">
<item> <item>
<layout class="QHBoxLayout" > <layout class="QHBoxLayout">
<item> <item>
<widget class="QLabel" name="label" > <widget class="QLabel" name="label">
<property name="sizePolicy" > <property name="sizePolicy">
<sizepolicy vsizetype="Preferred" hsizetype="Preferred" > <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
<horstretch>0</horstretch> <horstretch>0</horstretch>
<verstretch>0</verstretch> <verstretch>0</verstretch>
</sizepolicy> </sizepolicy>
</property> </property>
<property name="text" > <property name="text">
<string>Text1:</string> <string notr="true">Text1:</string>
</property> </property>
</widget> </widget>
</item> </item>
<item> <item>
<widget class="QLabel" name="text1" > <widget class="QLabel" name="text1">
<property name="enabled" > <property name="enabled">
<bool>false</bool> <bool>false</bool>
</property> </property>
<property name="sizePolicy" > <property name="sizePolicy">
<sizepolicy vsizetype="Preferred" hsizetype="MinimumExpanding" > <sizepolicy hsizetype="MinimumExpanding" vsizetype="Preferred">
<horstretch>0</horstretch> <horstretch>0</horstretch>
<verstretch>0</verstretch> <verstretch>0</verstretch>
</sizepolicy> </sizepolicy>
</property> </property>
<property name="text" > <property name="text">
<string>N/A</string> <string notr="true">N/A</string>
</property> </property>
</widget> </widget>
</item> </item>
</layout> </layout>
</item> </item>
<item> <item>
<layout class="QHBoxLayout" > <layout class="QHBoxLayout">
<item> <item>
<widget class="QLabel" name="label_3" > <widget class="QLabel" name="label_3">
<property name="text" > <property name="text">
<string>Text2:</string> <string notr="true">Text2:</string>
</property> </property>
</widget> </widget>
</item> </item>
<item> <item>
<widget class="QLabel" name="text2" > <widget class="QLabel" name="text2">
<property name="enabled" > <property name="enabled">
<bool>false</bool> <bool>false</bool>
</property> </property>
<property name="sizePolicy" > <property name="sizePolicy">
<sizepolicy vsizetype="Preferred" hsizetype="MinimumExpanding" > <sizepolicy hsizetype="MinimumExpanding" vsizetype="Preferred">
<horstretch>0</horstretch> <horstretch>0</horstretch>
<verstretch>0</verstretch> <verstretch>0</verstretch>
</sizepolicy> </sizepolicy>
</property> </property>
<property name="text" > <property name="text">
<string>N/A</string> <string notr="true">N/A</string>
</property> </property>
</widget> </widget>
</item> </item>
</layout> </layout>
</item> </item>
<item> <item>
<layout class="QHBoxLayout" > <layout class="QHBoxLayout">
<item> <item>
<widget class="QLabel" name="label_5" > <widget class="QLabel" name="label_5">
<property name="text" > <property name="text">
<string>Text3:</string> <string notr="true">Text3:</string>
</property> </property>
</widget> </widget>
</item> </item>
<item> <item>
<widget class="QLabel" name="text3" > <widget class="QLabel" name="text3">
<property name="enabled" > <property name="enabled">
<bool>false</bool> <bool>false</bool>
</property> </property>
<property name="sizePolicy" > <property name="sizePolicy">
<sizepolicy vsizetype="Preferred" hsizetype="MinimumExpanding" > <sizepolicy hsizetype="MinimumExpanding" vsizetype="Preferred">
<horstretch>0</horstretch> <horstretch>0</horstretch>
<verstretch>0</verstretch> <verstretch>0</verstretch>
</sizepolicy> </sizepolicy>
</property> </property>
<property name="text" > <property name="text">
<string>N/A</string> <string notr="true">N/A</string>
</property> </property>
</widget> </widget>
</item> </item>
@@ -109,10 +110,10 @@
</item> </item>
<item> <item>
<spacer> <spacer>
<property name="orientation" > <property name="orientation">
<enum>Qt::Vertical</enum> <enum>Qt::Vertical</enum>
</property> </property>
<property name="sizeHint" > <property name="sizeHint" stdset="0">
<size> <size>
<width>20</width> <width>20</width>
<height>40</height> <height>40</height>
@@ -122,7 +123,7 @@
</item> </item>
</layout> </layout>
</widget> </widget>
<layoutdefault spacing="6" margin="11" /> <layoutdefault spacing="6" margin="11"/>
<resources/> <resources/>
<connections/> <connections/>
</ui> </ui>

8
src/plugins/debugger/lldb/ipcenginehost.cpp
View File

@@ -317,10 +317,12 @@ void IPCEngineHost::fetchFrameSource(qint64 id)
void IPCEngineHost::rpcCallback(quint64 f, QByteArray payload) void IPCEngineHost::rpcCallback(quint64 f, QByteArray payload)
{ {
switch (f) { switch (f) {
default: default: {
showMessage(QLatin1String("IPC Error: unhandled id in guest to host call")); showMessage(QLatin1String("IPC Error: unhandled id in guest to host call"));
showMessage(tr("Fatal engine shutdown. Incompatible binary or ipc error."), LogError); const QString logMessage = tr("Fatal engine shutdown. Incompatible binary or IPC error.");
showStatusMessage(tr("Fatal engine shutdown. Incompatible binary or ipc error.")); showMessage(logMessage, LogError);
showStatusMessage(logMessage);
}
nuke(); nuke();
break; break;
case IPCEngineGuest::NotifyEngineSetupOk: case IPCEngineGuest::NotifyEngineSetupOk:

4
src/plugins/debugger/lldb/lldbenginehost.cpp
View File

@@ -173,7 +173,7 @@ LldbEngineHost::LldbEngineHost(const DebuggerStartParameters &startParameters)
m_guestProcess->setReadChannel(QProcess::StandardOutput); m_guestProcess->setReadChannel(QProcess::StandardOutput);
if (!m_guestProcess->waitForStarted()) { 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(); notifyEngineSpontaneousShutdown();
return; return;
} }
@@ -212,7 +212,7 @@ void LldbEngineHost::nuke()
} }
void LldbEngineHost::sshConnectionError(Utils::SshError e) 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) void LldbEngineHost::finished(int, QProcess::ExitStatus status)

20
src/plugins/glsleditor/glsleditorplugin.cpp
View File

@@ -192,9 +192,9 @@ bool GLSLEditorPlugin::initialize(const QStringList & /*arguments*/, QString *er
fragWizardParameters.setDescription fragWizardParameters.setDescription
(tr("Creates a fragment shader in the OpenGL/ES 2.0 Shading " (tr("Creates a fragment shader in the OpenGL/ES 2.0 Shading "
"Language (GLSL/ES). Fragment shaders generate the final " "Language (GLSL/ES). Fragment shaders generate the final "
"pixel colors for triangles, points, and lines rendered " "pixel colors for triangles, points and lines rendered "
"with OpenGL.")); "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")); fragWizardParameters.setId(QLatin1String("F.GLSL"));
addAutoReleasedObject(new GLSLFileWizard(fragWizardParameters, GLSLFileWizard::FragmentShaderES, core)); addAutoReleasedObject(new GLSLFileWizard(fragWizardParameters, GLSLFileWizard::FragmentShaderES, core));
@@ -204,27 +204,27 @@ bool GLSLEditorPlugin::initialize(const QStringList & /*arguments*/, QString *er
vertWizardParameters.setDescription vertWizardParameters.setDescription
(tr("Creates a vertex shader in the OpenGL/ES 2.0 Shading " (tr("Creates a vertex shader in the OpenGL/ES 2.0 Shading "
"Language (GLSL/ES). Vertex shaders transform the " "Language (GLSL/ES). Vertex shaders transform the "
"positions, normals, and texture co-ordinates of " "positions, normals and texture co-ordinates of "
"triangles, points, and lines rendered with OpenGL.")); "triangles, points and lines rendered with OpenGL."));
vertWizardParameters.setDisplayName(tr("Vertex shader (OpenGL/ES 2.0)")); vertWizardParameters.setDisplayName(tr("Vertex Shader (OpenGL/ES 2.0)"));
vertWizardParameters.setId(QLatin1String("G.GLSL")); vertWizardParameters.setId(QLatin1String("G.GLSL"));
addAutoReleasedObject(new GLSLFileWizard(vertWizardParameters, GLSLFileWizard::VertexShaderES, core)); addAutoReleasedObject(new GLSLFileWizard(vertWizardParameters, GLSLFileWizard::VertexShaderES, core));
fragWizardParameters.setDescription fragWizardParameters.setDescription
(tr("Creates a fragment shader in the Desktop OpenGL Shading " (tr("Creates a fragment shader in the Desktop OpenGL Shading "
"Language (GLSL). Fragment shaders generate the final " "Language (GLSL). Fragment shaders generate the final "
"pixel colors for triangles, points, and lines rendered " "pixel colors for triangles, points and lines rendered "
"with OpenGL.")); "with OpenGL."));
fragWizardParameters.setDisplayName(tr("Fragment shader (Desktop OpenGL)")); fragWizardParameters.setDisplayName(tr("Fragment Shader (Desktop OpenGL)"));
fragWizardParameters.setId(QLatin1String("J.GLSL")); fragWizardParameters.setId(QLatin1String("J.GLSL"));
addAutoReleasedObject(new GLSLFileWizard(fragWizardParameters, GLSLFileWizard::FragmentShaderDesktop, core)); addAutoReleasedObject(new GLSLFileWizard(fragWizardParameters, GLSLFileWizard::FragmentShaderDesktop, core));
vertWizardParameters.setDescription vertWizardParameters.setDescription
(tr("Creates a vertex shader in the Desktop OpenGL Shading " (tr("Creates a vertex shader in the Desktop OpenGL Shading "
"Language (GLSL). Vertex shaders transform the " "Language (GLSL). Vertex shaders transform the "
"positions, normals, and texture co-ordinates of " "positions, normals and texture co-ordinates of "
"triangles, points, and lines rendered with OpenGL.")); "triangles, points and lines rendered with OpenGL."));
vertWizardParameters.setDisplayName(tr("Vertex shader (Desktop OpenGL)")); vertWizardParameters.setDisplayName(tr("Vertex Shader (Desktop OpenGL)"));
vertWizardParameters.setId(QLatin1String("K.GLSL")); vertWizardParameters.setId(QLatin1String("K.GLSL"));
addAutoReleasedObject(new GLSLFileWizard(vertWizardParameters, GLSLFileWizard::VertexShaderDesktop, core)); addAutoReleasedObject(new GLSLFileWizard(vertWizardParameters, GLSLFileWizard::VertexShaderDesktop, core));

3
src/plugins/qmljstools/qmljsplugindumper.cpp
View File

@@ -120,7 +120,8 @@ void PluginDumper::dumpAllPlugins()
static QString qmldumpErrorMessage(const QString &libraryPath, const QString &error) 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) static QString qmldumpFailedMessage(const QString &error)

10
src/plugins/qt4projectmanager/qt-maemo/maemodeviceconfigwizard.cpp
View File

@@ -301,7 +301,7 @@ private:
QDir parentDir = QDir(dirPath + QLatin1String("/..")); QDir parentDir = QDir(dirPath + QLatin1String("/.."));
if ((!dir.exists() && !parentDir.mkdir(dir.dirName())) if ((!dir.exists() && !parentDir.mkdir(dir.dirName()))
|| !QFileInfo(dirPath).isWritable()) { || !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.")); tr("You have not entered a writable directory."));
return; return;
} }
@@ -312,7 +312,7 @@ private:
Utils::SshKeyGenerator keyGenerator; Utils::SshKeyGenerator keyGenerator;
if (!keyGenerator.generateKeys(Utils::SshKeyGenerator::Rsa, if (!keyGenerator.generateKeys(Utils::SshKeyGenerator::Rsa,
Utils::SshKeyGenerator::OpenSsl, 1024)) { 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())); tr("Key creation failed: %1").arg(keyGenerator.error()));
enableInput(); enableInput();
return; return;
@@ -324,7 +324,7 @@ private:
return; return;
} }
m_ui->statusLabel->setText(m_ui->statusLabel->text() + tr("Done!")); m_ui->statusLabel->setText(m_ui->statusLabel->text() + tr("Done."));
m_isComplete = true; m_isComplete = true;
emit completeChanged(); emit completeChanged();
} }
@@ -337,7 +337,7 @@ private:
file.write(data); file.write(data);
if (!canOpen || file.error() != QFile::NoError) { if (!canOpen || file.error() != QFile::NoError) {
QMessageBox::critical(this, tr("Could Not Save File"), 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 false;
} }
return true; return true;
@@ -428,7 +428,7 @@ private:
QMessageBox::information(this, tr("Key Deployment Success"), QMessageBox::information(this, tr("Key Deployment Success"),
tr("The key was successfully deployed. You may now close " tr("The key was successfully deployed. You may now close "
"the \"Mad Developer\" application and continue.")); "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; m_isComplete = true;
emit completeChanged(); emit completeChanged();
} }

2
src/plugins/qt4projectmanager/qt-maemo/maemopublishedprojectmodel.cpp
View File

@@ -114,7 +114,7 @@ QVariant MaemoPublishedProjectModel::data(const QModelIndex &index,
return QFileSystemModel::data(index, role); return QFileSystemModel::data(index, role);
const bool include = !m_filesToExclude.contains(filePath(index)); const bool include = !m_filesToExclude.contains(filePath(index));
if (role == Qt::DisplayRole) 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) else if (role == Qt::CheckStateRole)
return include ? Qt::Checked : Qt::Unchecked; return include ? Qt::Checked : Qt::Unchecked;
else else

2
src/plugins/qt4projectmanager/qt-maemo/maemoremoteprocessesdialog.cpp
View File

@@ -96,7 +96,7 @@ MaemoRemoteProcessesDialog::~MaemoRemoteProcessesDialog()
void MaemoRemoteProcessesDialog::handleRemoteError(const QString &errorMsg) 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); m_ui->updateListButton->setEnabled(true);
handleSelectionChanged(); handleSelectionChanged();
} }

2
src/plugins/qt4projectmanager/qt-s60/codaruncontrol.cpp
View File

@@ -116,7 +116,7 @@ bool CodaRunControl::setupLauncher()
if (m_serialPort.length()) { if (m_serialPort.length()) {
// We get the port from SymbianDeviceManager // 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); m_codaDevice = SymbianUtils::SymbianDeviceManager::instance()->getTcfPort(m_serialPort);
bool ok = m_codaDevice && m_codaDevice->device()->isOpen(); bool ok = m_codaDevice && m_codaDevice->device()->isOpen();

6
src/plugins/qt4projectmanager/qt-s60/s60certificateinfo.cpp
View File

@@ -177,19 +177,19 @@ S60CertificateInfo::CertificateState S60CertificateInfo::validateCertificate()
QDateTime endTime(m_certificate->endTime()); QDateTime endTime(m_certificate->endTime());
QDateTime startTime(m_certificate->startTime()); QDateTime startTime(m_certificate->startTime());
if (currentTime > endTime) { 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.") "\nExpiration date: %2.")
.arg(QFileInfo(m_filePath).fileName()) .arg(QFileInfo(m_filePath).fileName())
.arg(endTime.toLocalTime().toString(QLatin1String(SIMPLE_DATE_FORMAT))); .arg(endTime.toLocalTime().toString(QLatin1String(SIMPLE_DATE_FORMAT)));
result = CertificateError; result = CertificateError;
} else if (currentTime < startTime) { } 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(QFileInfo(m_filePath).fileName())
.arg(startTime.toLocalTime().toString(QLatin1String(SIMPLE_DATE_FORMAT))); .arg(startTime.toLocalTime().toString(QLatin1String(SIMPLE_DATE_FORMAT)));
result = CertificateWarning; //This certificate may be valid in the near future result = CertificateWarning; //This certificate may be valid in the near future
} }
} else { } 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()); .arg(QFileInfo(m_filePath).baseName());
result = CertificateError; result = CertificateError;
} }

2
src/plugins/qt4projectmanager/qt-s60/s60createpackageparser.cpp
View File

@@ -62,7 +62,7 @@ bool S60CreatePackageParser::parseLine(const QString &line)
QString lines = m_patchingLines.join("\n"); QString lines = m_patchingLines.join("\n");
m_patchingLines.clear(); m_patchingLines.clear();
//: %1 package name, %2 will be replaced by a list of patching lines. //: %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 " "Use a developer certificate or any other signing option to prevent "
"this patching from happening."). "this patching from happening.").
arg(m_packageName, lines); arg(m_packageName, lines);

2
src/plugins/qt4projectmanager/wizards/subdirsprojectwizarddialog.cpp
View File

@@ -46,7 +46,7 @@ SubdirsProjectWizardDialog::SubdirsProjectWizardDialog(const QString &templateNa
setWindowIcon(icon); setWindowIcon(icon);
setWindowTitle(templateName); 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.")); "Add subprojects to it later on by using the other wizards."));
addTargetSetupPage(); addTargetSetupPage();