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

I10N: First translation fixes for 2.1

Browse Source 
Fix README, some spelling errors, remove contractions,
exclamation marks, correct some plural forms, join split messages.
Add QCoreApplication::translate to non-Q_OBJECT-classes.
Fix some lupdate warnings about discarding meta-data (//:).
This commit is contained in:
Friedemann Kleint
2010-09-10 10:51:43 +02:00
parent 4dd844d76a
commit 24cadd34a1
31 changed files with 107 additions and 75 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
share/qtcreator/translations/README
View File

@@ -3,12 +3,14 @@ How To add translations to Qt Creator
- Coordinate over the mailing list to avoid duplicate work. - Coordinate over the mailing list to avoid duplicate work.
- Read the instructions at http://qt.gitorious.org/qt/pages/QtLocalization
- Add your language to the LANGUAGES line in translations.pro. - Add your language to the LANGUAGES line in translations.pro.
Don't qualify it with a country unless it is reasonable to expect Don't qualify it with a country unless it is reasonable to expect
country-specific variants. country-specific variants.
Skip this step if updating an existing translation, obviously. Skip this step if updating an existing translation, obviously.
- Run "make ts". - Run "make ts-<lang>".
If your Qt version is too old, you may create a template by running If your Qt version is too old, you may create a template by running
lconvert --drop-translations qtcreator_de.ts -o qtcreator_<yours>.ts lconvert --drop-translations qtcreator_de.ts -o qtcreator_<yours>.ts

1
src/plugins/debugger/gdb/abstractgdbadapter.h
View File

@@ -31,7 +31,6 @@
#define DEBUGGER_ABSTRACT_GDB_ADAPTER #define DEBUGGER_ABSTRACT_GDB_ADAPTER
#include <QtCore/QObject> #include <QtCore/QObject>
#include <QtCore/QProcess>
#include "gdbengine.h" #include "gdbengine.h"

2
src/plugins/debugger/gdb/classicgdbengine.cpp
View File

@@ -441,7 +441,6 @@ void GdbEngine::handleDebuggingHelperValue3Classic(const GdbResponse &response)
out.chop(1); out.chop(1);
QList<QByteArray> list = out.split(' '); QList<QByteArray> list = out.split(' ');
if (list.isEmpty()) { if (list.isEmpty()) {
//: Value for variable
data.setError(WatchData::msgNotInScope()); data.setError(WatchData::msgNotInScope());
data.setAllUnneeded(); data.setAllUnneeded();
insertData(data); insertData(data);
@@ -487,7 +486,6 @@ void GdbEngine::handleDebuggingHelperValue3Classic(const GdbResponse &response)
} }
} }
} else { } else {
//: Value for variable
data.setError(WatchData::msgNotInScope()); data.setError(WatchData::msgNotInScope());
data.setAllUnneeded(); data.setAllUnneeded();
insertData(data); insertData(data);

3
src/plugins/debugger/gdb/gdbengine.cpp
View File

@@ -3525,15 +3525,14 @@ WatchData GdbEngine::localVariable(const GdbMi &item,
WatchData data; WatchData data;
QString nam = _(name); QString nam = _(name);
data.iname = "local." + name + QByteArray::number(n + 1); data.iname = "local." + name + QByteArray::number(n + 1);
//: Variable %1 is the variable name, %2 is a simple count.
data.name = WatchData::shadowedName(nam, n); data.name = WatchData::shadowedName(nam, n);
if (uninitializedVariables.contains(data.name)) { if (uninitializedVariables.contains(data.name)) {
data.setError(WatchData::msgNotInScope()); data.setError(WatchData::msgNotInScope());
return data; return data;
} }
setWatchDataValue(data, item);
//: Type of local variable or parameter shadowed by another //: Type of local variable or parameter shadowed by another
//: variable of the same name in a nested block. //: variable of the same name in a nested block.
setWatchDataValue(data, item);
data.setType(GdbEngine::tr("<shadowed>").toUtf8()); data.setType(GdbEngine::tr("<shadowed>").toUtf8());
data.setHasChildren(false); data.setHasChildren(false);
return data; return data;

28
src/plugins/debugger/snapshothandler.cpp
View File

@@ -70,9 +70,9 @@ QString SnapshotData::toString() const
{ {
QString res; QString res;
QTextStream str(&res); QTextStream str(&res);
str << SnapshotHandler::tr("Function:") << ' ' << function() << ' ' /* str << SnapshotHandler::tr("Function:") << ' ' << function() << ' '
<< SnapshotHandler::tr("File:") << ' ' << m_location << ' ' << SnapshotHandler::tr("File:") << ' ' << m_location << ' '
<< SnapshotHandler::tr("Date:") << ' ' << m_date.toString(); << SnapshotHandler::tr("Date:") << ' ' << m_date.toString(); */
return res; return res;
} }
@@ -81,11 +81,12 @@ QString SnapshotData::toToolTip() const
QString res; QString res;
QTextStream str(&res); QTextStream str(&res);
str << "<html><body><table>" str << "<html><body><table>"
/*
<< "<tr><td>" << SnapshotHandler::tr("Function:") << "<tr><td>" << SnapshotHandler::tr("Function:")
<< "</td><td>" << function() << "</td></tr>" << "</td><td>" << function() << "</td></tr>"
<< "<tr><td>" << SnapshotHandler::tr("File:") << "<tr><td>" << SnapshotHandler::tr("File:")
<< "</td><td>" << QDir::toNativeSeparators(m_location) << "</td></tr>" << "</td><td>" << QDir::toNativeSeparators(m_location) << "</td></tr>"
<< "</table></body></html>"; << "</table></body></html>"; */
return res; return res;
} }
@@ -167,7 +168,8 @@ QVariant SnapshotHandler::data(const QModelIndex &index, int role) const
const DebuggerStartParameters &sp = engine->startParameters(); const DebuggerStartParameters &sp = engine->startParameters();
if (role == Qt::DisplayRole) { switch (role) {
case Qt::DisplayRole:
switch (index.column()) { switch (index.column()) {
case 0: case 0:
return sp.displayName; return sp.displayName;
@@ -175,18 +177,18 @@ QVariant SnapshotHandler::data(const QModelIndex &index, int role) const
return sp.coreFile.isEmpty() ? sp.executable : sp.coreFile; return sp.coreFile.isEmpty() ? sp.executable : sp.coreFile;
} }
return QVariant(); return QVariant();
}
if (role == Qt::ToolTipRole) { case Qt::ToolTipRole:
//: Tooltip for variable return QVariant();
//return snapshot.toToolTip();
}
if (role == Qt::DecorationRole && index.column() == 0) { case Qt::DecorationRole: // Return icon that indicates whether this is the active stack frame
// Return icon that indicates whether this is the active stack frame if (index.column() == 0)
return (index.row() == m_currentIndex) ? m_positionIcon : m_emptyIcon; return (index.row() == m_currentIndex) ? m_positionIcon : m_emptyIcon;
} break;
default:
break;
}
return QVariant(); return QVariant();
} }

2
src/plugins/debugger/snapshothandler.h
View File

@@ -30,8 +30,6 @@
#ifndef DEBUGGER_SNAPSHOTHANDLER_H #ifndef DEBUGGER_SNAPSHOTHANDLER_H
#define DEBUGGER_SNAPSHOTHANDLER_H #define DEBUGGER_SNAPSHOTHANDLER_H
#include "stackframe.h"
#include <QtCore/QAbstractItemModel> #include <QtCore/QAbstractItemModel>
#include <QtCore/QPointer> #include <QtCore/QPointer>

1
src/plugins/debugger/stackhandler.cpp
View File

@@ -130,7 +130,6 @@ QVariant StackHandler::data(const QModelIndex &index, int role) const
if (role == StackFrameAddressRole) if (role == StackFrameAddressRole)
return frame.address; return frame.address;
//: Tooltip for variable
if (role == Qt::ToolTipRole) if (role == Qt::ToolTipRole)
return frame.toToolTip(); return frame.toToolTip();

4
src/plugins/debugger/watchdata.cpp
View File

@@ -244,12 +244,16 @@ QString WatchData::toToolTip() const
QString WatchData::msgNotInScope() QString WatchData::msgNotInScope()
{ {
//: Value of variable in Debugger Locals display for variables out of scope (stopped above initialization).
static const QString rc = QCoreApplication::translate("Debugger::Internal::WatchData", "<not in scope>"); static const QString rc = QCoreApplication::translate("Debugger::Internal::WatchData", "<not in scope>");
return rc; return rc;
} }
const QString &WatchData::shadowedNameFormat() const QString &WatchData::shadowedNameFormat()
{ {
//: Display of variables shadowed by variables of the same name
//: in nested scopes: Variable %1 is the variable name, %2 is a
//: simple count.
static const QString format = QCoreApplication::translate("Debugger::Internal::WatchData", "%1 <shadowed %2>"); static const QString format = QCoreApplication::translate("Debugger::Internal::WatchData", "%1 <shadowed %2>");
return format; return format;
} }

2
src/plugins/designer/formwindowfile.cpp
View File

@@ -58,7 +58,7 @@ FormWindowFile::FormWindowFile(QDesignerFormWindowInterface *form, QObject *pare
this, SLOT(slotFormWindowRemoved(QDesignerFormWindowInterface*))); this, SLOT(slotFormWindowRemoved(QDesignerFormWindowInterface*)));
} }
bool FormWindowFile::save(const QString &name /*= QString()*/) bool FormWindowFile::save(const QString &name /* = QString() */)
{ {
const QString actualName = name.isEmpty() ? fileName() : name; const QString actualName = name.isEmpty() ? fileName() : name;

38
src/plugins/help/filtersettingspage.cpp
View File

@@ -252,23 +252,27 @@ bool FilterSettingsPage::matches(const QString &s) const
return m_searchKeywords.contains(s, Qt::CaseInsensitive); return m_searchKeywords.contains(s, Qt::CaseInsensitive);
} }
QString FilterSettingsPage::msgFilterLabel(const QString &filter) const
{
if (m_filterMap.keys().isEmpty())
return tr("No user defined filters available or no filter selected.");
const QStringList &checkedList = m_filterMap.value(filter);
if (checkedList.isEmpty())
return tr("The filter \"%1\" will show every documentation file"
" available, as no attributes are specified.").arg(filter);
if (checkedList.size() == 1)
return tr("The filter \"%1\" will only show documentation files that"
" have the attribute %2 specified.").
arg(filter, checkedList.first());
return tr("The filter \"%1\" will only show documentation files that"
" have the attributes %2 specified.").
arg(filter, checkedList.join(QLatin1String(", ")));
}
void FilterSettingsPage::updateFilterDescription(const QString &filter) void FilterSettingsPage::updateFilterDescription(const QString &filter)
{ {
const QStringList &checkedList = m_filterMap.value(filter); m_ui.label->setText(msgFilterLabel(filter));
if (!m_filterMap.keys().isEmpty()) {
const QString prefix = tr("The filter \"%1\" will").arg(filter);
if (checkedList.isEmpty()) {
m_ui.label->setText(prefix + tr(" show every documentation file "
"available, as no attributes are specified."));
} else if (checkedList.count() == 1) {
m_ui.label->setText(prefix + tr(" only show documentation files that"
" have the attribute %2 specified.").arg(checkedList.first()));
} else {
m_ui.label->setText(prefix + tr(" only show documentation files that"
" have the attributes %2 specified.").arg(checkedList.join(", ")));
}
} else {
m_ui.label->setText(tr("No user defined filters available or no filter "
"selected."));
}
} }

1
src/plugins/help/filtersettingspage.h
View File

@@ -69,6 +69,7 @@ private:
void updateFilterDescription(const QString &filter); void updateFilterDescription(const QString &filter);
private: private:
QString msgFilterLabel(const QString &filter) const;
Ui::FilterSettingsPage m_ui; Ui::FilterSettingsPage m_ui;
FilterMap m_filterMap; FilterMap m_filterMap;

2
src/plugins/imageviewer/imageviewer.cpp
View File

@@ -202,7 +202,7 @@ QWidget *ImageViewer::toolBar()
void ImageViewer::scaleFactorUpdate(qreal factor) void ImageViewer::scaleFactorUpdate(qreal factor)
{ {
QString info = tr("%1%").arg(QString::number(factor * 100, 'f', 2)); const QString info = QString::number(factor * 100, 'f', 2) + QLatin1Char('%');
d_ptr->ui_toolbar.labelInfo->setText(info); d_ptr->ui_toolbar.labelInfo->setText(info);
} }

2
src/plugins/projectexplorer/buildstepspage.cpp
View File

@@ -259,7 +259,7 @@ void BuildStepListWidget::stepRemove(int pos)
} else { } else {
QMessageBox::warning(Core::ICore::instance()->mainWindow(), QMessageBox::warning(Core::ICore::instance()->mainWindow(),
tr("Removing Step failed"), tr("Removing Step failed"),
tr("Can't remove build step while building"), tr("Cannot remove build step while building"),
QMessageBox::Ok, QMessageBox::Ok); QMessageBox::Ok, QMessageBox::Ok);
} }
} }

10
src/plugins/projectexplorer/projectfilewizardextension.cpp
View File

@@ -255,12 +255,14 @@ void ProjectFileWizardExtension::firstExtensionPageShown(
// Oh we do have someone that deploys it // Oh we do have someone that deploys it
// then the best match is NONE // then the best match is NONE
// We display a label explaining that and rename <None> to // We display a label explaining that and rename <None> to
// <Implictly Add> // <Implicitly Add>
m_context->page->setNoneLabel(tr("<Implictly Add>")); m_context->page->setNoneLabel(tr("<Implicitly Add>"));
QString text = tr("The files are implicitly added to the projects:\n"); QString text = tr("The files are implicitly added to the projects:\n");
foreach (ProjectEntry project, deployingProjects) foreach (const ProjectEntry &project, deployingProjects) {
text += project.fileName + "\n"; text += project.fileName;
text += QLatin1Char('\n');
}
m_context->page->setAdditionalInfo(text); m_context->page->setAdditionalInfo(text);
bestProjectIndex = -1; bestProjectIndex = -1;

2
src/plugins/projectexplorer/runsettingspropertiespage.cpp
View File

@@ -256,7 +256,7 @@ void RunSettingsWidget::removeRunConfiguration()
{ {
RunConfiguration *rc = m_target->activeRunConfiguration(); RunConfiguration *rc = m_target->activeRunConfiguration();
QMessageBox msgBox(QMessageBox::Question, tr("Remove Run Configuration?"), QMessageBox msgBox(QMessageBox::Question, tr("Remove Run Configuration?"),
tr("Do you really want to delete run configuration <b>%1</b>.").arg(rc->displayName()), tr("Do you really want to delete the run configuration <b>%1</b>?").arg(rc->displayName()),
QMessageBox::Yes|QMessageBox::No, this); QMessageBox::Yes|QMessageBox::No, this);
msgBox.setDefaultButton(QMessageBox::No); msgBox.setDefaultButton(QMessageBox::No);
msgBox.setEscapeButton(QMessageBox::No); msgBox.setEscapeButton(QMessageBox::No);

2
src/plugins/qt4projectmanager/librarydetailscontroller.cpp
View File

@@ -888,7 +888,7 @@ void InternalLibraryDetailsController::updateProFile()
if (!configVar.contains(QLatin1String("plugin"))) { if (!configVar.contains(QLatin1String("plugin"))) {
const QString relProFilePath = rootDir.relativeFilePath(proFilePath); const QString relProFilePath = rootDir.relativeFilePath(proFilePath);
TargetInformation targetInfo = proFileNode->targetInformation(); TargetInformation targetInfo = proFileNode->targetInformation();
const QString itemToolTip = tr("%1 (%2)").arg(targetInfo.target).arg(relProFilePath); const QString itemToolTip = QString::fromLatin1("%1 (%2)").arg(targetInfo.target).arg(relProFilePath);
m_proFileNodes.append(proFileNode); m_proFileNodes.append(proFileNode);
libraryDetailsWidget()->libraryComboBox->addItem(targetInfo.target); libraryDetailsWidget()->libraryComboBox->addItem(targetInfo.target);
libraryDetailsWidget()->libraryComboBox->setItemData( libraryDetailsWidget()->libraryComboBox->setItemData(

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

@@ -160,7 +160,7 @@ void MaemoConfigTestDialog::handleMadDeveloperTestProcessFinished(int exitStatus
} else if (m_madDeveloperTestProcess->exitCode() != 0) { } else if (m_madDeveloperTestProcess->exitCode() != 0) {
m_ui->errorLabel->setText(m_ui->errorLabel->text() m_ui->errorLabel->setText(m_ui->errorLabel->text()
+ QLatin1String("<br>") + tr("Mad Developer is not installed.<br>" + QLatin1String("<br>") + tr("Mad Developer is not installed.<br>"
"You will not be able to deploy to this device!")); "You will not be able to deploy to this device."));
} }
if (m_ui->errorLabel->text().isEmpty()) { if (m_ui->errorLabel->text().isEmpty()) {
QPalette palette = m_ui->errorLabel->palette(); QPalette palette = m_ui->errorLabel->palette();

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

@@ -278,7 +278,7 @@ MaemoDeviceConfig MaemoDeployStep::deviceConfig() const
void MaemoDeployStep::start() void MaemoDeployStep::start()
{ {
if (!m_canStart) { if (!m_canStart) {
raiseError(tr("Can't start deployment, haven't cleaned up from last time yet.")); raiseError(tr("Cannot start deployment as the clean-up from the last time has not yet been done."));
return; return;
} }
m_cleanupTimer->stop(); m_cleanupTimer->stop();

5
src/plugins/qt4projectmanager/qt-maemo/maemodeploystepfactory.cpp
View File

@@ -8,6 +8,8 @@
#include <projectexplorer/target.h> #include <projectexplorer/target.h>
#include <qt4projectmanager/qt4projectmanagerconstants.h> #include <qt4projectmanager/qt4projectmanagerconstants.h>
#include <QtCore/QCoreApplication>
using namespace ProjectExplorer; using namespace ProjectExplorer;
namespace Qt4ProjectManager { namespace Qt4ProjectManager {
@@ -30,7 +32,8 @@ QStringList MaemoDeployStepFactory::availableCreationIds(BuildStepList *parent)
QString MaemoDeployStepFactory::displayNameForId(const QString &id) const QString MaemoDeployStepFactory::displayNameForId(const QString &id) const
{ {
if (id == MaemoDeployStep::Id) if (id == MaemoDeployStep::Id)
return(tr("Deploy to device")); return QCoreApplication::translate("Qt4ProjectManager::Internal::MaemoDeployStepFactory",
"Deploy to device");
return QString(); return QString();
} }

5
src/plugins/qt4projectmanager/qt-maemo/maemopackagecreationfactory.cpp
View File

@@ -50,6 +50,8 @@
#include <projectexplorer/target.h> #include <projectexplorer/target.h>
#include <qt4projectmanagerconstants.h> #include <qt4projectmanagerconstants.h>
#include <QtCore/QCoreApplication>
using ProjectExplorer::BuildStepList; using ProjectExplorer::BuildStepList;
using ProjectExplorer::BuildStep; using ProjectExplorer::BuildStep;
@@ -73,7 +75,8 @@ QStringList MaemoPackageCreationFactory::availableCreationIds(ProjectExplorer::B
QString MaemoPackageCreationFactory::displayNameForId(const QString &id) const QString MaemoPackageCreationFactory::displayNameForId(const QString &id) const
{ {
if (id == MaemoPackageCreationStep::CreatePackageId) if (id == MaemoPackageCreationStep::CreatePackageId)
return tr("Create Debian Package"); return QCoreApplication::translate("Qt4ProjectManager::Internal::MaemoPackageCreationFactory",
"Create Debian Package");
return QString(); return QString();
} }

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

@@ -222,7 +222,7 @@ bool MaemoPackageCreationStep::copyDebianFiles()
} }
QDir buildDir(buildDirectory()); QDir buildDir(buildDirectory());
if (!buildDir.mkdir("debian")) { if (!buildDir.mkdir("debian")) {
raiseError(tr("Could not create debian directory '%1'.") raiseError(tr("Could not create Debian directory '%1'.")
.arg(debianDirPath)); .arg(debianDirPath));
return false; return false;
} }

12
src/plugins/qt4projectmanager/qt-maemo/maemorunconfigurationwidget.cpp
View File

@@ -446,18 +446,18 @@ void MaemoRunConfigurationWidget::updateMountWarning()
= m_runConfiguration->remoteMounts()->validMountSpecificationCount(); = m_runConfiguration->remoteMounts()->validMountSpecificationCount();
if (mountDirCount > availablePortCount) { if (mountDirCount > availablePortCount) {
mountWarning = tr("WARNING: You want to mount %1 directories, but " mountWarning = tr("WARNING: You want to mount %1 directories, but "
"your device has only %2 free ports.<br>You will not be able " "your device has only %n free ports.<br>You will not be able "
"to run this configuration.") "to run this configuration.", 0, availablePortCount)
.arg(mountDirCount).arg(availablePortCount); .arg(mountDirCount);
} else if (mountDirCount > 0) { } else if (mountDirCount > 0) {
const int portsLeftByDebuggers const int portsLeftByDebuggers
= availablePortCount - 1 - m_runConfiguration->useQmlDebugger(); = availablePortCount - 1 - m_runConfiguration->useQmlDebugger();
if (mountDirCount > portsLeftByDebuggers) { if (mountDirCount > portsLeftByDebuggers) {
mountWarning = tr("WARNING: You want to mount %1 directories, " mountWarning = tr("WARNING: You want to mount %1 directories, "
"but only %2 ports on the device will be available " "but only %n ports on the device will be available "
"in debug mode. <br>You will not be able to debug your " "in debug mode. <br>You will not be able to debug your "
"application with this configuration."). "application with this configuration.", 0, portsLeftByDebuggers).
arg(mountDirCount).arg(portsLeftByDebuggers); arg(mountDirCount);
} }
} }
} }

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

@@ -481,7 +481,7 @@ void MaemoSettingsWidget::updatePortsWarningLabel()
m_ui->portsWarningLabel->clear(); m_ui->portsWarningLabel->clear();
} else { } else {
m_ui->portsWarningLabel->setText(QLatin1String("<font color=\"red\">") m_ui->portsWarningLabel->setText(QLatin1String("<font color=\"red\">")
+ tr("You'll need at least one port!") + QLatin1String("</font>")); + tr("You will need at least one port.") + QLatin1String("</font>"));
} }
} }

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

@@ -60,7 +60,7 @@ PassphraseForKeyDialog::PassphraseForKeyDialog(const QString &keyName, QWidget *
m_checkBox = new QCheckBox(this); m_checkBox = new QCheckBox(this);
m_checkBox->setText(tr("Save passphrase")); m_checkBox->setText(tr("Save passphrase"));
m_checkBox->setObjectName(QString::fromUtf8("checkBox")); m_checkBox->setObjectName(QString::fromUtf8("checkBox"));
m_checkBox->setToolTip(tr("This is an insecure option. Password will be saved as a plain text!")); m_checkBox->setToolTip(tr("This is an insecure option. The password will be saved as a plain text."));
formLayout->setWidget(1, QFormLayout::LabelRole, m_checkBox); formLayout->setWidget(1, QFormLayout::LabelRole, m_checkBox);

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

@@ -167,7 +167,7 @@ bool S60CreatePackageStep::init()
// Try to detect command in environment // Try to detect command in environment
const QString tmp = buildConfiguration()->environment().searchInPath(m_makeCmd); const QString tmp = buildConfiguration()->environment().searchInPath(m_makeCmd);
if (tmp.isEmpty()) { if (tmp.isEmpty()) {
emit addOutput(tr("Could not find make command: %1 in the build environment").arg(m_makeCmd), BuildStep::ErrorOutput); emit addOutput(tr("Could not find make command '%1' in the build environment").arg(m_makeCmd), BuildStep::ErrorOutput);
return false; return false;
} }
m_makeCmd = tmp; m_makeCmd = tmp;

22
src/plugins/qt4projectmanager/wizards/qmlstandaloneapp.cpp
View File

@@ -33,6 +33,7 @@
#include <QtCore/QFile> #include <QtCore/QFile>
#include <QtCore/QRegExp> #include <QtCore/QRegExp>
#include <QtCore/QTextStream> #include <QtCore/QTextStream>
#include <QtCore/QCoreApplication>
#ifndef CREATORLESSTEST #ifndef CREATORLESSTEST
#include <coreplugin/icore.h> #include <coreplugin/icore.h>
@@ -233,7 +234,9 @@ bool QmlStandaloneApp::setExternalModules(const QStringList &uris,
m_importPaths.clear(); m_importPaths.clear();
foreach (const QFileInfo &importPath, importPaths) { foreach (const QFileInfo &importPath, importPaths) {
if (!importPath.exists()) { if (!importPath.exists()) {
m_error = tr("The Qml import path '%1' cannot be found.") m_error = QCoreApplication::translate(
"Qt4ProjectManager::Internal::QmlStandaloneApp",
"The Qml import path '%1' cannot be found.")
.arg(QDir::toNativeSeparators(importPath.filePath())); .arg(QDir::toNativeSeparators(importPath.filePath()));
return false; return false;
} else { } else {
@@ -255,7 +258,9 @@ bool QmlStandaloneApp::setExternalModules(const QStringList &uris,
} }
} }
if (modulesCount == m_modules.count()) { // no module was added if (modulesCount == m_modules.count()) { // no module was added
m_error = tr("The Qml module '%1' cannot be found.").arg(uri); m_error = QCoreApplication::translate(
"Qt4ProjectManager::Internal::QmlStandaloneApp",
"The Qml module '%1' cannot be found.").arg(uri);
return false; return false;
} }
} }
@@ -455,7 +460,9 @@ bool QmlStandaloneApp::addCppPlugin(const QString &qmldirLine, QmlModule *module
const QStringList qmldirLineElements = const QStringList qmldirLineElements =
qmldirLine.split(QLatin1Char(' '), QString::SkipEmptyParts); qmldirLine.split(QLatin1Char(' '), QString::SkipEmptyParts);
if (qmldirLineElements.count() < 2) { if (qmldirLineElements.count() < 2) {
m_error = tr("Invalid '%1' entry in '%2' of module '%3'.") m_error = QCoreApplication::translate(
"Qt4ProjectManager::Internal::QmlStandaloneApp",
"Invalid '%1' entry in '%2' of module '%3'.")
.arg(qmldir_plugin).arg(qmldir).arg(module->uri); .arg(qmldir_plugin).arg(qmldir).arg(module->uri);
return false; return false;
} }
@@ -482,7 +489,9 @@ bool QmlStandaloneApp::addCppPlugin(const QString &qmldirLine, QmlModule *module
} else if (proFile_guess4.exists()) { } else if (proFile_guess4.exists()) {
foundProFile = proFile_guess4.canonicalFilePath(); foundProFile = proFile_guess4.canonicalFilePath();
} else { } else {
m_error = tr("No .pro file for plugin '%1' cannot be found.").arg(name); m_error = QCoreApplication::translate(
"Qt4ProjectManager::Internal::QmlStandaloneApp",
"No .pro file for plugin '%1' cannot be found.").arg(name);
return false; return false;
} }
QmlCppPlugin *plugin = QmlCppPlugin *plugin =
@@ -700,7 +709,10 @@ bool QmlStandaloneApp::updateFiles(const QList<GeneratedFileInfo> &list, QString
return false; return false;
QFile file(info.fileInfo.absoluteFilePath()); QFile file(info.fileInfo.absoluteFilePath());
if (!file.open(QIODevice::WriteOnly) || file.write(data) == -1) { if (!file.open(QIODevice::WriteOnly) || file.write(data) == -1) {
error = tr("Could not write file '%1'.").arg(QDir::toNativeSeparators(info.fileInfo.canonicalFilePath())); error = QCoreApplication::translate(
"Qt4ProjectManager::Internal::QmlStandaloneApp",
"Could not write file '%1'.").
arg(QDir::toNativeSeparators(info.fileInfo.canonicalFilePath()));
return false; return false;
} }
} }

6
src/plugins/resourceeditor/resourceeditorw.cpp
View File

@@ -107,7 +107,7 @@ bool ResourceEditorW::createNew(const QString &contents)
return rc; return rc;
} }
bool ResourceEditorW::open(const QString &fileName /*= QString()*/) bool ResourceEditorW::open(const QString &fileName /* = QString() */)
{ {
if (debugResourceEditorW) if (debugResourceEditorW)
qDebug() << "ResourceEditorW::open: " << fileName; qDebug() << "ResourceEditorW::open: " << fileName;
@@ -133,10 +133,10 @@ bool ResourceEditorW::open(const QString &fileName /*= QString()*/)
return true; return true;
} }
bool ResourceEditorFile::save(const QString &name /*= QString()*/) bool ResourceEditorFile::save(const QString &name /* = QString() */)
{ {
if (debugResourceEditorW) if (debugResourceEditorW)
qDebug() << ">ResourceEditorW::save: " << name; qDebug(">ResourceEditorW::save: %s", qPrintable(name));
const QString oldFileName = fileName(); const QString oldFileName = fileName();
const QString actualName = name.isEmpty() ? oldFileName : name; const QString actualName = name.isEmpty() ? oldFileName : name;

11
src/plugins/tasklist/stopmonitoringhandler.cpp
View File

@@ -35,6 +35,7 @@
#include <projectexplorer/task.h> #include <projectexplorer/task.h>
#include <QtGui/QAction> #include <QtGui/QAction>
#include <QtCore/QCoreApplication>
using namespace TaskList; using namespace TaskList;
using namespace TaskList::Internal; using namespace TaskList::Internal;
@@ -63,7 +64,13 @@ void StopMonitoringHandler::handle(const ProjectExplorer::Task &task)
QAction *StopMonitoringHandler::createAction(QObject *parent) QAction *StopMonitoringHandler::createAction(QObject *parent)
{ {
QAction *stopMonitoringAction = new QAction(tr("Stop monitoring"), parent); const QString text =
stopMonitoringAction->setToolTip(tr("Stop monitoring task files.")); QCoreApplication::translate("TaskList::Internal::StopMonitoringHandler",
"Stop monitoring");
const QString toolTip =
QCoreApplication::translate("TaskList::Internal::StopMonitoringHandler",
"Stop monitoring task files.");
QAction *stopMonitoringAction = new QAction(text, parent);
stopMonitoringAction->setToolTip(toolTip);
return stopMonitoringAction; return stopMonitoringAction;
} }

2
src/plugins/texteditor/generichighlighter/highlightersettingspage.cpp
View File

@@ -174,7 +174,7 @@ void HighlighterSettingsPage::resetDefinitionsLocation()
const QString &location = findDefinitionsLocation(); const QString &location = findDefinitionsLocation();
if (location.isEmpty()) if (location.isEmpty())
QMessageBox::information(0, tr("Autodetect Definitions"), QMessageBox::information(0, tr("Autodetect Definitions"),
tr("Existent definitions could not be found.")); tr("No existing definitions could be found."));
else else
m_d->m_page.fallbackDefinitionFilesPath->setPath(location); m_d->m_page.fallbackDefinitionFilesPath->setPath(location);
} }

2
src/plugins/welcome/communitywelcomepagewidget.cpp
View File

@@ -93,8 +93,8 @@ CommunityWelcomePageWidget::CommunityWelcomePageWidget(QWidget *parent) :
ui->newsTreeWidget, SLOT(addNewsItem(QString, QString, QString)), Qt::QueuedConnection); ui->newsTreeWidget, SLOT(addNewsItem(QString, QString, QString)), Qt::QueuedConnection);
connect(this, SIGNAL(startRssFetching(QUrl)), m_rssFetcher, SLOT(fetch(QUrl)), Qt::QueuedConnection); connect(this, SIGNAL(startRssFetching(QUrl)), m_rssFetcher, SLOT(fetch(QUrl)), Qt::QueuedConnection);
//: Add localized feed here only if one exists
m_rssFetcher->start(QThread::LowestPriority); m_rssFetcher->start(QThread::LowestPriority);
//: Add localized feed here only if one exists
emit startRssFetching(QUrl(tr("http://labs.trolltech.com/blogs/feed"))); emit startRssFetching(QUrl(tr("http://labs.trolltech.com/blogs/feed")));
populateWelcomeTreeWidget(supportSites, sizeof(supportSites)/sizeof(Site), ui->supportSitesTreeWidget); populateWelcomeTreeWidget(supportSites, sizeof(supportSites)/sizeof(Site), ui->supportSitesTreeWidget);

1
src/shared/symbianutils/trkutils.cpp
View File

@@ -137,7 +137,6 @@ QString Session::deviceDescription(unsigned verbose) const
? QCoreApplication::translate("trk::Session", "big endian") ? QCoreApplication::translate("trk::Session", "big endian")
: QCoreApplication::translate("trk::Session", "little endian"); : QCoreApplication::translate("trk::Session", "little endian");
msg = msg.arg(formatCpu(cpuMajor, cpuMinor)).arg(endianness); msg = msg.arg(formatCpu(cpuMajor, cpuMinor)).arg(endianness);
//: The separator in a list of strings
QString defaultTypeSizeStr; QString defaultTypeSizeStr;
QString fpTypeSizeStr; QString fpTypeSizeStr;
if (verbose && defaultTypeSize) if (verbose && defaultTypeSize)