Commit d207c8cd authored by Friedemann Kleint's avatar Friedemann Kleint
Browse files

L10n: tr()-fixes, message strings, compiler warnings.



Rename 'QML standalone application' to 'QML application'
and the 'old-style' QML applications to
'QML Viewer based applications'.

For the QML renaming:
Rubber-stamped-by: default avatarAlessandro Portale <alessandro.portale@nokia.com>
parent ff3f7e4d
......@@ -493,7 +493,8 @@ void ContextPaneWidget::setLineButton()
m_toolButton->setIcon(style()->standardIcon(QStyle::SP_DockWidgetCloseButton));
m_toolButton->setToolButtonStyle(Qt::ToolButtonIconOnly);
m_toolButton->setFixedSize(20, 20);
m_toolButton->setToolTip(tr("Hides this toolbar. This toolbar can be permantly disabled in the options or in the context menu."));
m_toolButton->setToolTip(tr("Hides this toolbar. This toolbar can be"
" permanently disabled in the options page or in the context menu."));
pinnedChanged(false);
if (m_resetAction) {
......
......@@ -292,7 +292,7 @@ void SftpChannelPrivate::handleCurrentPacket()
default:
throw SshServerException(SSH_DISCONNECT_PROTOCOL_ERROR,
"Unexpected packet.",
tr("Unexpected packet of type %d.").arg(m_incomingPacket.type()));
tr("Unexpected packet of type %1.").arg(m_incomingPacket.type()));
}
}
......@@ -546,7 +546,7 @@ void SftpChannelPrivate::handleGetStatus(const JobMap::Iterator &it,
case SftpDownload::Open:
if (op->statRequested) {
reportRequestError(op, errorMessage(response.errorString,
tr("Failed to stat remote file.")));
tr("Failed retrieve information on the remote file ('stat' failed).")));
sendTransferCloseHandle(op, response.requestId);
} else {
if ((response.status != SSH_FX_EOF || response.requestId != op->eofId)
......@@ -746,7 +746,7 @@ void SftpChannelPrivate::handleAttrs()
if (op->parentJob)
op->parentJob->setError();
reportRequestError(op, tr("Cannot append to remote file: "
"Server does not support file size attribute."));
"Server does not support the file size attribute."));
sendTransferCloseHandle(op, op->jobId);
}
}
......
......@@ -91,7 +91,7 @@ QByteArray SshCapabilities::findBestMatch(const QList<QByteArray> &myCapabilitie
}
throw SshServerException(SSH_DISCONNECT_KEY_EXCHANGE_FAILED,
"Server and client capabilities don't match.",
"Server and client capabilities do not match.",
QCoreApplication::translate("SshConnection",
"Server and client capabilities don't match. "
"Client list was: %1.\nServer list was %2.")
......
......@@ -286,7 +286,7 @@ void SshConnectionPrivate::handleIncomingData()
e.errorString);
} catch (Botan::Exception &e) {
closeConnection(SSH_DISCONNECT_BY_APPLICATION, SshInternalError, "",
tr("Botan exception: %1").arg(e.what()));
tr("Botan library exception: %1").arg(e.what()));
}
}
......
......@@ -103,7 +103,7 @@ bool CeSdkHandler::parse(const QString &vsdir)
}
if (xml.error() && xml.error() != QXmlStreamReader::PrematureEndOfDocumentError) {
qWarning() << "XML ERROR:" << xml.lineNumber() << ": " << xml.errorString();
qWarning("CeSdkHandler::parse(): XML ERROR: %d : %s", int(xml.lineNumber()), qPrintable(xml.errorString()));
return false;
}
return m_list.size() > 0 ? true : false;
......
......@@ -271,7 +271,7 @@ void SubComponentManagerPrivate::parseDirectory(const QString &canonicalDirPath,
}
}
void SubComponentManagerPrivate::parseFile(const QString &canonicalFilePath, bool addToLibrary, const QString& qualification)
void SubComponentManagerPrivate::parseFile(const QString &canonicalFilePath, bool addToLibrary, const QString& /* qualification */)
{
if (debug)
qDebug() << Q_FUNC_INFO << canonicalFilePath;
......
......@@ -17,23 +17,23 @@
<item row="0" column="0">
<widget class="QGroupBox" name="groupBox">
<property name="title">
<string>Quick Toolbars</string>
<string>Qt Quick Toolbars</string>
</property>
<layout class="QHBoxLayout" name="horizontalLayout">
<item>
<widget class="QCheckBox" name="textEditHelperCheckBox">
<property name="text">
<string>Always show Quick Toolbar</string>
<string>Always show Qt Quick Toolbar</string>
</property>
</widget>
</item>
<item>
<widget class="QCheckBox" name="textEditHelperCheckBoxPin">
<property name="toolTip">
<string>If enabled the toolbar will remain pinned to an absolute position.</string>
<string>If enabled, the toolbar will remain pinned to an absolute position.</string>
</property>
<property name="text">
<string>Pin Quick Toolbar</string>
<string>Pin Qt Quick Toolbar</string>
</property>
</widget>
</item>
......
......@@ -67,7 +67,7 @@ AddLibraryWizard::AddLibraryWizard(const QString &fileName, QWidget *parent) :
setPage(SummaryPageId, m_summaryPage);
Utils::WizardProgress *progress = wizardProgress();
Utils::WizardProgressItem *kindItem = progress->addItem(tr("Kind"));
Utils::WizardProgressItem *kindItem = progress->addItem(tr("Type"));
Utils::WizardProgressItem *detailsItem = progress->addItem(tr("Details"));
Utils::WizardProgressItem *summaryItem = progress->addItem(tr("Summary"));
......@@ -105,25 +105,25 @@ QString AddLibraryWizard::snippet() const
LibraryTypePage::LibraryTypePage(AddLibraryWizard *parent)
: QWizardPage(parent)
{
setTitle(tr("Kind of Library"));
setSubTitle(tr("Choose the kind of library which you want to link against"));
setTitle(tr("Library Type"));
setSubTitle(tr("Choose the type of the library which you want to link against"));
QVBoxLayout *layout = new QVBoxLayout(this);
m_systemRadio = new QRadioButton(tr("System Library"), this);
m_systemRadio->setChecked(true);
layout->addWidget(m_systemRadio);
QLabel *systemLabel = new QLabel(tr("Adds linkage against system "
QLabel *systemLabel = new QLabel(tr("Adds linkage against a system "
"library.\nNeither the path to the "
"selected library nor the path to its "
"includes is added to the pro file."));
"include files is added to the pro file."));
systemLabel->setWordWrap(true);
systemLabel->setAttribute(Qt::WA_MacSmallSize, true);
layout->addWidget(systemLabel);
m_externalRadio = new QRadioButton(tr("External Library"), this);
layout->addWidget(m_externalRadio);
QLabel *externalLabel = new QLabel(tr("Adds linkage against external "
QLabel *externalLabel = new QLabel(tr("Adds linkage against an external "
"library which is not a part of your "
"build tree.\nIt also adds the library "
"and include paths to the pro file."));
......@@ -133,7 +133,7 @@ LibraryTypePage::LibraryTypePage(AddLibraryWizard *parent)
m_internalRadio = new QRadioButton(tr("Internal Library"), this);
layout->addWidget(m_internalRadio);
QLabel *internalLabel = new QLabel(tr("Adds linkage against internal "
QLabel *internalLabel = new QLabel(tr("Adds linkage against an internal "
"library which is a part of your build "
"tree.\nIt also adds the library and "
"include paths to the pro file."));
......@@ -201,7 +201,7 @@ void DetailsPage::initializePage()
break;
case AddLibraryWizard::ExternalLibrary:
title = tr("External Library");
subTitle = tr("Specify the library which you want to link against and the includes path");
subTitle = tr("Specify the library which you want to link against and its include path");
m_libraryDetailsController = new ExternalLibraryDetailsController(
m_libraryDetailsWidget, m_libraryWizard->proFile(), this);
break;
......
......@@ -69,7 +69,7 @@ void MaemoDeployStepWidget::handleDeviceUpdate()
QString MaemoDeployStepWidget::summaryText() const
{
return tr("<b>Deploy to device</b>: ") + m_step->deviceConfig().name;
return tr("<b>Deploy to device</b>: %1").arg(m_step->deviceConfig().name);
}
QString MaemoDeployStepWidget::displayName() const
......
......@@ -84,7 +84,7 @@ void MaemoSshRunner::start()
{
// Should not happen.
if (m_shuttingDown) {
emit error(tr("Can't restart yet, haven't shut down properly."));
emit error(tr("Cannot start deployment, as the clean-up from the last time has not finished yet."));
return;
}
......
......@@ -147,7 +147,7 @@ bool MaemoTemplatesManager::createDebianTemplatesIfNecessary(const ProjectExplor
Q_ASSERT_X(qt4Target, Q_FUNC_INFO, "Target ID does not match actual type.");
const MaemoToolChain * const tc
= dynamic_cast<MaemoToolChain *>(qt4Target->activeBuildConfiguration()->toolChain());
Q_ASSERT_X(tc, Q_FUNC_INFO, "Maemo target has no maemo toolchain.");
Q_ASSERT_X(tc, Q_FUNC_INFO, "Maemo target has no Maemo toolchain.");
if (!MaemoPackageCreationStep::preparePackagingProcess(&dh_makeProc, tc,
projectDir.path(), &error)) {
raiseError(error);
......@@ -159,7 +159,7 @@ bool MaemoTemplatesManager::createDebianTemplatesIfNecessary(const ProjectExplor
+ MaemoPackageCreationStep::DefaultVersionNumber;
dh_makeProc.start(MaemoPackageCreationStep::packagingCommand(tc, command));
if (!dh_makeProc.waitForStarted()) {
raiseError(tr("Unable to create debian templates: dh_make failed (%1)")
raiseError(tr("Unable to create Debian templates: dh_make failed (%1)")
.arg(dh_makeProc.errorString()));
return false;
}
......
......@@ -238,7 +238,7 @@ bool QmlStandaloneApp::setExternalModules(const QStringList &uris,
if (!importPath.exists()) {
m_error = QCoreApplication::translate(
"Qt4ProjectManager::Internal::QmlStandaloneApp",
"The Qml import path '%1' cannot be found.")
"The QML import path '%1' cannot be found.")
.arg(QDir::toNativeSeparators(importPath.filePath()));
return false;
} else {
......@@ -262,7 +262,7 @@ bool QmlStandaloneApp::setExternalModules(const QStringList &uris,
if (modulesCount == m_modules.count()) { // no module was added
m_error = QCoreApplication::translate(
"Qt4ProjectManager::Internal::QmlStandaloneApp",
"The Qml module '%1' cannot be found.").arg(uri);
"The QML module '%1' cannot be found.").arg(uri);
return false;
}
}
......
......@@ -71,15 +71,15 @@ QmlStandaloneAppWizardDialog::QmlStandaloneAppWizardDialog(QmlStandaloneAppWizar
, m_type(type)
{
setWindowTitle(m_type == QmlStandaloneAppWizard::NewQmlFile
? tr("New Standalone QML Project")
: tr("Standalone QML Project from existing QML Project"));
? tr("New QML Project")
: tr("QML Project from existing, QML Viewer-based Project"));
setIntroDescription(m_type == QmlStandaloneAppWizard::NewQmlFile
? tr("This wizard generates a Standalone QML application project.")
: tr("This wizard imports an existing QML application and creates a standalone version of it."));
? tr("This wizard generates a QML application project.")
: tr("This wizard imports an existing, QML Viewer-based application and creates a standalone version of it."));
m_qmlSourcesPage = new QmlStandaloneAppWizardSourcesPage;
m_qmlSourcesPage->setMainQmlFileChooserVisible(m_type == QmlStandaloneAppWizard::ImportQmlFile);
const QString qmlSourcesTitle = tr("Qml Sources");
const QString qmlSourcesTitle = tr("QML Sources");
if (m_type == QmlStandaloneAppWizard::ImportQmlFile) {
const int qmlSourcesPagePageId = addPage(m_qmlSourcesPage);
wizardProgress()->item(qmlSourcesPagePageId)->setTitle(qmlSourcesTitle);
......@@ -87,7 +87,7 @@ QmlStandaloneAppWizardDialog::QmlStandaloneAppWizardDialog(QmlStandaloneAppWizar
m_qmlOptionsPage = new QmlStandaloneAppWizardOptionsPage;
const int qmlOptionsPagePageId = addPage(m_qmlOptionsPage);
wizardProgress()->item(qmlOptionsPagePageId)->setTitle(tr("Qml App options"));
wizardProgress()->item(qmlOptionsPagePageId)->setTitle(tr("QML Application options"));
if (m_type == QmlStandaloneAppWizard::NewQmlFile) {
// In case of NewQmlFile, we show that page at the end. Is that useful? Or irritating?
const int qmlSourcesPagePageId = addPage(m_qmlSourcesPage);
......@@ -122,17 +122,17 @@ Core::BaseFileWizardParameters QmlStandaloneAppWizard::parameters(WizardType typ
Core::BaseFileWizardParameters parameters(ProjectWizard);
parameters.setIcon(QIcon(QLatin1String(Constants::ICON_QML_STANDALONE)));
parameters.setDisplayName(type == QmlStandaloneAppWizard::NewQmlFile
? tr("Qt QML New Standalone Application")
: tr("Qt QML Imported Standalone Application"));
? tr("Qt QML New Application")
: tr("Qt QML New Imported Application"));
parameters.setId(QLatin1String(type == QmlStandaloneAppWizard::NewQmlFile
? "QA.QML New Standalone Application"
: "QA.QML Imported Standalone Application"));
? "QA.QMLA New Application"
: "QA.QMLB Imported Application"));
parameters.setDescription(type == QmlStandaloneAppWizard::NewQmlFile
? tr("Creates a standalone, mobile-deployable Qt QML application "
? tr("Creates a mobile-deployable Qt QML application "
"project. A lightweight Qt/C++ application with a QDeclarativeView "
"and a single QML file will be created.")
: tr("Creates a standalone, mobile-deployable Qt QML application "
"project. An existing QML project will be imported and a lightweight "
: tr("Creates a mobile-deployable Qt QML application "
"project. An existing, QML Viewer-based project will be imported and a lightweight "
"Qt/C++ application with a QDeclarativeView will be created for it."));
parameters.setCategory(QLatin1String(Constants::QT_APP_WIZARD_CATEGORY));
parameters.setDisplayCategory(QCoreApplication::translate(Constants::QT_APP_WIZARD_TR_SCOPE,
......
......@@ -17,7 +17,7 @@
<item>
<widget class="QGroupBox" name="mainQmlFileGroupBox">
<property name="title">
<string>Main Qml file</string>
<string>Main QML file</string>
</property>
<layout class="QVBoxLayout" name="verticalLayout_3">
<item>
......@@ -29,7 +29,7 @@
<item>
<widget class="QGroupBox" name="qmlModulesGroupBox">
<property name="title">
<string>Qml Modules</string>
<string>QML Modules</string>
</property>
<layout class="QVBoxLayout" name="verticalLayout">
<item>
......
......@@ -23,11 +23,8 @@
</sizepolicy>
</property>
<property name="text">
<string>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
p, li { white-space: pre-wrap; }
&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'MS Shell Dlg 2'; font-size:8.25pt; font-weight:400; font-style:normal;&quot;&gt;
&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-size:8pt;&quot;&gt;Highlight definitions are provided by the &lt;/span&gt;&lt;a href=&quot;http://kate-editor.org/&quot;&gt;&lt;span style=&quot; font-size:8pt; text-decoration: underline; color:#0000ff;&quot;&gt;Kate Text Editor&lt;/span&gt;&lt;/a&gt;&lt;span style=&quot; font-size:8pt;&quot;&gt;.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
<string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;
&lt;p&gt;Highlight definitions are provided by the &lt;a href=&quot;http://kate-editor.org/&quot;&gt;Kate Text Editor&lt;/a&gt;.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
</property>
<property name="textFormat">
<enum>Qt::RichText</enum>
......
......@@ -79,46 +79,29 @@
</widget>
</item>
<item>
<layout class="QHBoxLayout" name="horizontalLayout_2">
<item>
<spacer name="horizontalSpacer_2">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>298</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
<item>
<widget class="QPushButton" name="closeButton">
<property name="text">
<string>Close</string>
</property>
</widget>
</item>
</layout>
<widget class="QDialogButtonBox" name="buttonBox">
<property name="standardButtons">
<set>QDialogButtonBox::Close</set>
</property>
</widget>
</item>
</layout>
</widget>
<resources/>
<connections>
<connection>
<sender>closeButton</sender>
<signal>clicked()</signal>
<sender>buttonBox</sender>
<signal>rejected()</signal>
<receiver>ManageDefinitionsDialog</receiver>
<slot>close()</slot>
<hints>
<hint type="sourcelabel">
<x>381</x>
<y>294</y>
<x>385</x>
<y>420</y>
</hint>
<hint type="destinationlabel">
<x>306</x>
<y>298</y>
<x>223</x>
<y>222</y>
</hint>
</hints>
</connection>
......
......@@ -219,6 +219,9 @@ void RSSFetcher::parseXml(QIODevice *device)
}
}
if (xmlReader.error() && xmlReader.error() != QXmlStreamReader::PrematureEndOfDocumentError) {
qWarning() << "XML ERROR:" << xmlReader.lineNumber() << ": " << xmlReader.errorString();
qWarning("Welcome::Internal::RSSFetcher: XML ERROR: %d: %s (%s)",
int(xmlReader.lineNumber()),
qPrintable(xmlReader.errorString()),
qPrintable(titleString));
}
}
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