diff --git a/src/plugins/beautifier/abstractsettings.cpp b/src/plugins/beautifier/abstractsettings.cpp index aee799e7edacbc4ccd578bb6bf273419df2eb00f..e7a3810032c0cbf475d3377438c06f0ad131998c 100644 --- a/src/plugins/beautifier/abstractsettings.cpp +++ b/src/plugins/beautifier/abstractsettings.cpp @@ -177,7 +177,7 @@ void AbstractSettings::save() const QString path = m_styleDir.absolutePath(); if (!(m_styleDir.mkpath(path) && m_styleDir.cd(path))) { - BeautifierPlugin::showError(tr("Failed to save styles. %1 does not exist.").arg(path)); + BeautifierPlugin::showError(tr("Cannot save styles. %1 does not exist.").arg(path)); return; } } @@ -197,13 +197,13 @@ void AbstractSettings::save() Utils::FileSaver saver(styleFileName(iStyles.key())); if (saver.hasError()) { - BeautifierPlugin::showError(tr("Could not open file \"%1\": %2.") + BeautifierPlugin::showError(tr("Cannot open file \"%1\": %2.") .arg(saver.fileName()) .arg(saver.errorString())); } else { saver.write(iStyles.value().toLocal8Bit()); if (!saver.finalize()) { - BeautifierPlugin::showError(tr("Error while saving file \"%1\": %2.") + BeautifierPlugin::showError(tr("Cannot save file \"%1\": %2.") .arg(saver.fileName()) .arg(saver.errorString())); } @@ -275,7 +275,7 @@ void AbstractSettings::readDocumentation() createDocumentationFile(); if (!file.open(QIODevice::ReadOnly)) { - BeautifierPlugin::showError(tr("Could not open documentation file \"%1\".").arg(filename)); + BeautifierPlugin::showError(tr("Cannot open documentation file \"%1\".").arg(filename)); return; } @@ -314,7 +314,7 @@ void AbstractSettings::readDocumentation() } if (xml.hasError()) { - BeautifierPlugin::showError(tr("Could not read documentation file \"%1\". Error: %2.") + BeautifierPlugin::showError(tr("Cannot read documentation file \"%1\": %2.") .arg(filename).arg(xml.errorString())); } } diff --git a/src/plugins/beautifier/artisticstyle/artisticstyle.cpp b/src/plugins/beautifier/artisticstyle/artisticstyle.cpp index b104e8d38a7380870288e87d140a1519f6cf047f..69ad3a4aec96616d0e009cc3feab912ac3f226d3 100644 --- a/src/plugins/beautifier/artisticstyle/artisticstyle.cpp +++ b/src/plugins/beautifier/artisticstyle/artisticstyle.cpp @@ -131,7 +131,7 @@ void ArtisticStyle::formatFile() cfgFileName = m_settings->styleFileName(m_settings->customStyle()); if (cfgFileName.isEmpty()) { - BeautifierPlugin::showError(tr("Could not get configuration file for Artistic Style.")); + BeautifierPlugin::showError(tr("Cannot get configuration file for Artistic Style.")); } else { BeautifierPlugin::formatCurrentFile(QStringList() << m_settings->command() diff --git a/src/plugins/beautifier/artisticstyle/artisticstyleoptionspage.ui b/src/plugins/beautifier/artisticstyle/artisticstyleoptionspage.ui index 030e0bac1ada6ea3dd8059c60debd82b99dda695..2dba5d2f329c3097bf0c7f315a9d4eca2fb8a66a 100644 --- a/src/plugins/beautifier/artisticstyle/artisticstyleoptionspage.ui +++ b/src/plugins/beautifier/artisticstyle/artisticstyleoptionspage.ui @@ -58,7 +58,7 @@ <item> <widget class="QCheckBox" name="useCustomStyle"> <property name="text"> - <string>Use selfdefined style:</string> + <string>Use self-defined style:</string> </property> </widget> </item> diff --git a/src/plugins/beautifier/beautifierplugin.cpp b/src/plugins/beautifier/beautifierplugin.cpp index 0f3363b2fa9a536ba5905f6d97fc48e00fe25a3e..dd9c1f185c60b0c0f49bed31cec6ae1705be2ad2 100644 --- a/src/plugins/beautifier/beautifierplugin.cpp +++ b/src/plugins/beautifier/beautifierplugin.cpp @@ -127,7 +127,7 @@ QString BeautifierPlugin::format(const QString &text, QStringList command, const sourceFile.setAutoRemove(true); sourceFile.write(text.toUtf8()); if (!sourceFile.finalize()) { - showError(tr("Couldn't create temporary file %1: %2.") + showError(tr("Cannot create temporary file \"%1\": %2.") .arg(sourceFile.fileName()).arg(sourceFile.errorString())); return QString(); } @@ -138,7 +138,7 @@ QString BeautifierPlugin::format(const QString &text, QStringList command, const const QString processProgram = command.takeFirst(); process.start(processProgram, command); if (!process.waitForFinished()) { - showError(tr("Failed to call %1 or an error occurred.").arg(processProgram)); + showError(tr("Cannot call %1 or some other error occurred.").arg(processProgram)); return QString(); } const QByteArray output = process.readAllStandardError(); @@ -148,7 +148,7 @@ QString BeautifierPlugin::format(const QString &text, QStringList command, const // Read text back Utils::FileReader reader; if (!reader.fetch(sourceFile.fileName(), QIODevice::Text)) { - showError(tr("Couldn't read file %1: %2.") + showError(tr("Cannot read file \"%1\": %2.") .arg(sourceFile.fileName()).arg(reader.errorString())); return QString(); } diff --git a/src/plugins/beautifier/clangformat/clangformatoptionspage.cpp b/src/plugins/beautifier/clangformat/clangformatoptionspage.cpp index 62544a80755bcc451b4051f6efaeb561ff1e1f6d..5ef69a62f4d32eac34f23372707642baeb71b5e1 100644 --- a/src/plugins/beautifier/clangformat/clangformatoptionspage.cpp +++ b/src/plugins/beautifier/clangformat/clangformatoptionspage.cpp @@ -53,7 +53,7 @@ ClangFormatOptionsPageWidget::ClangFormatOptionsPageWidget(ClangFormatSettings * ui->options->setEnabled(false); ui->predefinedStyle->addItems(m_settings->predefinedStyles()); ui->command->setExpectedKind(Utils::PathChooser::ExistingCommand); - ui->command->setPromptDialogTitle(tr("ClangFormat Command")); + ui->command->setPromptDialogTitle(tr("Clang Format Command")); connect(ui->command, SIGNAL(validChanged(bool)), ui->options, SLOT(setEnabled(bool))); ui->configurations->setSettings(m_settings); } @@ -112,7 +112,7 @@ ClangFormatOptionsPage::ClangFormatOptionsPage(ClangFormatSettings *settings, QO m_searchKeywords() { setId(Constants::ClangFormat::OPTION_ID); - setDisplayName(tr("ClangFormat")); + setDisplayName(tr("Clang Format")); setCategory(Constants::OPTION_CATEGORY); setDisplayCategory(QCoreApplication::translate("Beautifier", Constants::OPTION_TR_CATEGORY)); setCategoryIcon(QLatin1String(Constants::OPTION_CATEGORY_ICON)); diff --git a/src/plugins/beautifier/clangformat/clangformatoptionspage.ui b/src/plugins/beautifier/clangformat/clangformatoptionspage.ui index 7a06b29e30a13b0b4b5499edb406f042f483c029..5ba2e1152e6f2da88ec52ef2f45ec1fa630ee8f7 100644 --- a/src/plugins/beautifier/clangformat/clangformatoptionspage.ui +++ b/src/plugins/beautifier/clangformat/clangformatoptionspage.ui @@ -23,7 +23,7 @@ <item> <widget class="QLabel" name="commandLabel"> <property name="text"> - <string>ClangFormat command:</string> + <string>Clang Format command:</string> </property> </widget> </item> @@ -74,7 +74,7 @@ <item row="2" column="0" colspan="2"> <widget class="QCheckBox" name="formatEntireFileFallback"> <property name="text"> - <string>Format entire file if no text was selected. (For action "Format Selected Text")</string> + <string>Format entire file if no text was selected. (For action Format Selected Text)</string> </property> </widget> </item> diff --git a/src/plugins/beautifier/clangformat/clangformatsettings.cpp b/src/plugins/beautifier/clangformat/clangformatsettings.cpp index 795411a5b21d31e0fe16fe5ad68f3f2f6cd295c0..d6aec113e4f6031985af00479165c8a5bd7e7236 100644 --- a/src/plugins/beautifier/clangformat/clangformatsettings.cpp +++ b/src/plugins/beautifier/clangformat/clangformatsettings.cpp @@ -143,7 +143,7 @@ void ClangFormatSettings::createDocumentationFile() const const QString options = line.right(line.size() - firstSpace).trimmed(); const QString text = QLatin1String("<p><span class=\"option\">") + keyword + QLatin1String("</span> <span class=\"param\">") + options - + QLatin1String("</span></p><p>") + tr("Yet no description available.") + + QLatin1String("</span></p><p>") + tr("No description available.") + QLatin1String("</p>"); stream.writeStartElement(QLatin1String(Constants::DOCUMENTATION_XMLENTRY)); stream.writeTextElement(QLatin1String(Constants::DOCUMENTATION_XMLKEY), keyword); diff --git a/src/plugins/beautifier/uncrustify/uncrustify.cpp b/src/plugins/beautifier/uncrustify/uncrustify.cpp index 02774261c72760775486c6c8945192736bbe4d2d..dfcaf3fa44d15922577d6e637c7cd64930380ab4 100644 --- a/src/plugins/beautifier/uncrustify/uncrustify.cpp +++ b/src/plugins/beautifier/uncrustify/uncrustify.cpp @@ -126,7 +126,7 @@ void Uncrustify::formatFile() cfgFileName = m_settings->styleFileName(m_settings->customStyle()); if (cfgFileName.isEmpty()) { - BeautifierPlugin::showError(tr("Could not get configuration file for uncrustify.")); + BeautifierPlugin::showError(tr("Cannot get configuration file for uncrustify.")); } else { BeautifierPlugin::formatCurrentFile(QStringList() << m_settings->command() diff --git a/src/plugins/beautifier/uncrustify/uncrustifyoptionspage.ui b/src/plugins/beautifier/uncrustify/uncrustifyoptionspage.ui index 6dbc77a7102ac48b09521835a323513abb0128f5..7a8c924291195c498a2f72726902e5e22761f25a 100644 --- a/src/plugins/beautifier/uncrustify/uncrustifyoptionspage.ui +++ b/src/plugins/beautifier/uncrustify/uncrustifyoptionspage.ui @@ -58,7 +58,7 @@ <item> <widget class="QCheckBox" name="useCustomStyle"> <property name="text"> - <string>Use selfdefined style:</string> + <string>Use self-defined style:</string> </property> </widget> </item>