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

String improvements

Browse Source 
Change-Id: I45778c9562ba530a36ddaf201f0c61d380d701cf
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@theqtcompany.com>
This commit is contained in:
Robert Loehning
2015-01-05 14:21:59 +01:00
parent 0d9fa1c714
commit 18aa49e7c2
11 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/libs/qmljs/qmljsstaticanalysismessage.cpp
View File

@@ -231,7 +231,7 @@ StaticAnalysisMessages::StaticAnalysisMessages()
newMsg(ErrFunctionsNotSupportedInQmlUi, Error,
tr("Functions are not supported in a Qt Quick UI form."));
newMsg(ErrBlocksNotSupportedInQmlUi, Error,
tr("Java Script blocks are not supported in a Qt Quick UI form."));
tr("JavaScript blocks are not supported in a Qt Quick UI form."));
newMsg(ErrBehavioursNotSupportedInQmlUi, Error,
tr("Behavior type is not supported in a Qt Quick UI form."));
newMsg(ErrStatesOnlyInRootItemInQmlUi, Error,

2
src/libs/timeline/qml/CategoryLabel.qml
View File

@@ -231,7 +231,7 @@ Item {
implicitHeight: txt.height - 1
enabled: expanded || (model && !model.empty)
iconSource: expanded ? "arrow_down.png" : "arrow_right.png"
tooltip: expanded ? qsTr("Collapse category") : qsTr("Expand category.")
tooltip: expanded ? qsTr("Collapse category") : qsTr("Expand category")
onClicked: model.expanded = !expanded
}

2
src/plugins/android/androidbuildapkwidget.ui
View File

@@ -154,7 +154,7 @@
</property>
<property name="text">
<string>Signing an APK that uses &quot;Deploy local Qt libraries&quot; is not allowed.
Deploying local Qt libraries is incompatible with Android 5</string>
Deploying local Qt libraries is incompatible with Android 5.</string>
</property>
</widget>
</item>

2
src/plugins/android/androiddeployqtstep.cpp
View File

@@ -361,7 +361,7 @@ void AndroidDeployQtStep::runCommand(const QString &program, const QStringList &
if (!buildProc.waitForFinished(2 * 60 * 1000)
|| buildProc.error() != QProcess::UnknownError
|| buildProc.exitCode() != 0) {
QString mainMessage = tr("Packaging Error: Command \"%1 %2\" failed.")
QString mainMessage = tr("Packaging error: Command \"%1 %2\" failed.")
.arg(program).arg(arguments.join(QLatin1Char(' ')));
if (buildProc.error() != QProcess::UnknownError)
mainMessage += QLatin1Char(' ') + tr("Reason: %1").arg(buildProc.errorString());

2
src/plugins/perforce/perforceplugin.cpp
View File

@@ -1209,7 +1209,7 @@ IEditor *PerforcePlugin::showOutputInEditor(const QString &title,
const int maxSize = EditorManager::maxTextFileSize() / 2 - 1000; // ~25 MB, 600000 lines
if (content.size() >= maxSize) {
content = content.left(maxSize);
content += QLatin1Char('\n') + tr("[Only %1 MB of output shown]").arg(maxSize / 1024 / 1024);
content += QLatin1Char('\n') + tr("[Only %n MB of output shown]", 0, maxSize / 1024 / 1024);
}
IEditor *editor = EditorManager::openEditorWithContents(id, &s, content.toUtf8());
QTC_ASSERT(editor, return 0);

4
src/plugins/projectexplorer/jsonwizard/jsonwizardfactory.cpp
View File

@@ -153,7 +153,7 @@ static JsonWizardFactory::Page parsePage(const QVariant &value, QString *errorMe
JsonWizardFactory::Page p;
if (value.type() != QVariant::Map) {
*errorMessage = QCoreApplication::translate("ProjectExplorer::JsonWizardFactory", "Page is not a object.");
*errorMessage = QCoreApplication::translate("ProjectExplorer::JsonWizardFactory", "Page is not an object.");
return p;
}
@@ -612,7 +612,7 @@ bool JsonWizardFactory::initialize(const QVariantMap &data, const QDir &baseDir,
m_options.insert(key, value);
}
} else if (optionValue.isValid()) {
*errorMessage = tr("Value for \"options\" is not a list");
*errorMessage = tr("Value for \"options\" is not a list.");
return false;
}

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

@@ -106,7 +106,7 @@ public:
[kit] { return kit->displayName(); },
false);
m_macroExpander.registerVariable(Constants::VAR_CURRENTKIT_FILESYSTEMNAME,
tr("The name of the currently active kit in a filesystem friendly version."),
tr("The name of the currently active kit in a filesystem-friendly version."),
[kit] { return kit->fileSystemFriendlyName(); },
false);
m_macroExpander.registerVariable(Constants::VAR_CURRENTKIT_ID,

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

@@ -415,7 +415,7 @@ KitEnvironmentConfigWidget::KitEnvironmentConfigWidget(Kit *workingCopy, const K
m_editor(0)
{
refresh();
m_manageButton->setText(tr("Change ..."));
m_manageButton->setText(tr("Change..."));
connect(m_manageButton, SIGNAL(clicked()), this, SLOT(editEnvironmentChanges()));
}

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

@@ -1149,7 +1149,7 @@ bool ProjectExplorerPlugin::initialize(const QStringList &arguments, QString *er
});
expander->registerVariable(Constants::VAR_CURRENTKIT_FILESYSTEMNAME,
tr("The name of the currently active kit in a filesystem friendly version."),
tr("The name of the currently active kit in a filesystem-friendly version."),
[]() -> QString {
Kit *kit = currentKit();
return kit ? kit->fileSystemFriendlyName() : QString();

2
src/plugins/qmakeandroidsupport/createandroidmanifestwizard.cpp
View File

@@ -164,7 +164,7 @@ ChooseDirectoryPage::ChooseDirectoryPage(CreateAndroidManifestWizard *wizard)
checkBox->setChecked(true);
connect(checkBox, &QCheckBox::toggled, wizard, &CreateAndroidManifestWizard::setCopyGradle);
checkBox->setText(tr("Copy the Gradle files to Android directory"));
checkBox->setToolTip(tr("It is highly recommended if you are plannig to extend the Java part of your Qt application."));
checkBox->setToolTip(tr("It is highly recommended if you are planning to extend the Java part of your Qt application."));
fl->addRow(checkBox);
}
}

2
src/plugins/qmakeprojectmanager/qmakestep.ui
View File

@@ -156,7 +156,7 @@
<item row="3" column="0">
<widget class="QLabel" name="qtQuickCompilerLabel">
<property name="text">
<string>Use QML compiler</string>
<string>Use QML compiler:</string>
</property>
</widget>
</item>