summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJure Repinc <jlp@holodeck1.com>2011-10-05 20:13:49 +0200
committerOswald Buddenhagen <oswald.buddenhagen@nokia.com>2011-10-05 20:14:59 +0200
commitfa4db8d045f0cb9c38a738e4e30e935a9c3345a8 (patch)
tree891c9feaa1091e2efc7b976dd3bb85f1bd281ea0
parentfd4078f9633df169ba82aaf2ec7b971610efe0aa (diff)
downloadqt-creator-fa4db8d045f0cb9c38a738e4e30e935a9c3345a8.tar.gz
Fixed some typos and added some missing ellipises
During translation into Slovenian I noticed some typos in original string. For example some missing ellipsis characters and some incorrectly spelled MeeGo names (as Meego) Change-Id: I48eaa95303f1e82ab9893f713056382e8daaef41 Merge-request: 2200 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
-rw-r--r--src/app/main.cpp2
-rw-r--r--src/plugins/coreplugin/mimetypesettingspage.ui4
-rw-r--r--src/plugins/cpptools/cppfilesettingspage.cpp2
-rw-r--r--src/plugins/debugger/gdb/gdboptionspage.ui2
-rw-r--r--src/plugins/projectexplorer/projectwizardpage.ui2
-rw-r--r--src/plugins/projectexplorer/runsettingspropertiespage.ui4
-rw-r--r--src/plugins/qmlprojectmanager/qmlprojectrunconfigurationwidget.cpp2
-rw-r--r--src/plugins/qt4projectmanager/qt4nodes.cpp2
-rw-r--r--src/plugins/qt4projectmanager/qt4projectconfigwidget.cpp2
-rw-r--r--src/plugins/qt4projectmanager/wizards/abstractmobileappwizard.cpp2
-rw-r--r--src/plugins/qt4projectmanager/wizards/qtquickapp.cpp2
-rw-r--r--src/plugins/qt4projectmanager/wizards/qtquickcomponentsetoptionspage.ui4
-rw-r--r--src/plugins/qtsupport/qtversionmanager.ui2
-rw-r--r--src/plugins/remotelinux/maemodeviceconfigwizardreusekeyscheckpage.ui2
-rw-r--r--src/plugins/remotelinux/maemopackagecreationwidget.ui2
-rw-r--r--src/plugins/remotelinux/maemoqtversion.cpp2
-rw-r--r--src/plugins/remotelinux/qt4maemotarget.cpp2
-rw-r--r--src/plugins/texteditor/generichighlighter/highlightersettingspage.cpp2
-rw-r--r--src/plugins/texteditor/plaintexteditorfactory.cpp2
-rw-r--r--src/plugins/vcsbase/vcsconfigurationpage.ui2
20 files changed, 23 insertions, 23 deletions
diff --git a/src/app/main.cpp b/src/app/main.cpp
index dc3f22ed49..fbed44dac7 100644
--- a/src/app/main.cpp
+++ b/src/app/main.cpp
@@ -146,7 +146,7 @@ static inline QString msgCoreLoadFailure(const QString &why)
static inline int askMsgSendFailed()
{
return QMessageBox::question(0, QApplication::translate("Application","Could not send message"),
- QCoreApplication::translate("Application", "Unable to send command line arguments to the already running instance."
+ QCoreApplication::translate("Application", "Unable to send command line arguments to the already running instance. "
"It appears to be not responding. Do you want to start a new instance of Creator?"),
QMessageBox::Yes | QMessageBox::No | QMessageBox::Retry,
QMessageBox::Retry);
diff --git a/src/plugins/coreplugin/mimetypesettingspage.ui b/src/plugins/coreplugin/mimetypesettingspage.ui
index dce4311631..5006a9dee3 100644
--- a/src/plugins/coreplugin/mimetypesettingspage.ui
+++ b/src/plugins/coreplugin/mimetypesettingspage.ui
@@ -125,14 +125,14 @@
<item>
<widget class="QPushButton" name="addMagicButton">
<property name="text">
- <string>Add</string>
+ <string>Add...</string>
</property>
</widget>
</item>
<item>
<widget class="QPushButton" name="editMagicButton">
<property name="text">
- <string>Edit</string>
+ <string>Edit...</string>
</property>
</widget>
</item>
diff --git a/src/plugins/cpptools/cppfilesettingspage.cpp b/src/plugins/cpptools/cppfilesettingspage.cpp
index 87d533623a..fdac59324c 100644
--- a/src/plugins/cpptools/cppfilesettingspage.cpp
+++ b/src/plugins/cpptools/cppfilesettingspage.cpp
@@ -247,7 +247,7 @@ CppFileSettingsWidget::CppFileSettingsWidget(QWidget *parent) :
foreach (const QString &suffix, headerMt.suffixes())
m_ui->headerSuffixComboBox->addItem(suffix);
m_ui->licenseTemplatePathChooser->setExpectedKind(Utils::PathChooser::File);
- m_ui->licenseTemplatePathChooser->addButton(tr("Edit"), this, SLOT(slotEdit()));
+ m_ui->licenseTemplatePathChooser->addButton(tr("Edit..."), this, SLOT(slotEdit()));
}
CppFileSettingsWidget::~CppFileSettingsWidget()
diff --git a/src/plugins/debugger/gdb/gdboptionspage.ui b/src/plugins/debugger/gdb/gdboptionspage.ui
index f2e21e1e91..5627bfb9ac 100644
--- a/src/plugins/debugger/gdb/gdboptionspage.ui
+++ b/src/plugins/debugger/gdb/gdboptionspage.ui
@@ -139,7 +139,7 @@ on slow machines. In this case, the value should be increased.</string>
<item row="9" column="0" colspan="2">
<widget class="QCheckBox" name="checkBoxEnableReverseDebugging">
<property name="toolTip">
- <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Selecting this enables reverse debugging.&lt;/p&gt;&lt;.p&gt;&lt;b&gt;Note:&lt;/b&gt;This feature is very slow and unstable on the GDB side. It exhibits unpredictable behaviour when going backwards over system calls and is very likely to destroy your debugging session.&lt;/p&gt;&lt;body&gt;&lt;/html&gt;</string>
+ <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Selecting this enables reverse debugging.&lt;/p&gt;&lt;.p&gt;&lt;b&gt;Note:&lt;/b&gt; This feature is very slow and unstable on the GDB side. It exhibits unpredictable behavior when going backwards over system calls and is very likely to destroy your debugging session.&lt;/p&gt;&lt;body&gt;&lt;/html&gt;</string>
</property>
<property name="text">
<string>Enable reverse debugging</string>
diff --git a/src/plugins/projectexplorer/projectwizardpage.ui b/src/plugins/projectexplorer/projectwizardpage.ui
index 7b196f6561..f1b7e421a6 100644
--- a/src/plugins/projectexplorer/projectwizardpage.ui
+++ b/src/plugins/projectexplorer/projectwizardpage.ui
@@ -67,7 +67,7 @@
<item row="2" column="2">
<widget class="QPushButton" name="vcsManageButton">
<property name="text">
- <string>Manage</string>
+ <string>Manage ...</string>
</property>
</widget>
</item>
diff --git a/src/plugins/projectexplorer/runsettingspropertiespage.ui b/src/plugins/projectexplorer/runsettingspropertiespage.ui
index ffaea67ba7..6ae89a239f 100644
--- a/src/plugins/projectexplorer/runsettingspropertiespage.ui
+++ b/src/plugins/projectexplorer/runsettingspropertiespage.ui
@@ -41,7 +41,7 @@
<item row="0" column="4">
<widget class="QPushButton" name="renameDeployButton">
<property name="text">
- <string>Rename</string>
+ <string>Rename ...</string>
</property>
</widget>
</item>
@@ -97,7 +97,7 @@
<item row="2" column="4">
<widget class="QPushButton" name="renameRunButton">
<property name="text">
- <string>Rename</string>
+ <string>Rename ...</string>
</property>
</widget>
</item>
diff --git a/src/plugins/qmlprojectmanager/qmlprojectrunconfigurationwidget.cpp b/src/plugins/qmlprojectmanager/qmlprojectrunconfigurationwidget.cpp
index 25e2c65cc3..a42b0b303b 100644
--- a/src/plugins/qmlprojectmanager/qmlprojectrunconfigurationwidget.cpp
+++ b/src/plugins/qmlprojectmanager/qmlprojectrunconfigurationwidget.cpp
@@ -93,7 +93,7 @@ QmlProjectRunConfigurationWidget::QmlProjectRunConfigurationWidget(QmlProjectRun
this, SLOT(onQtVersionSelectionChanged()));
QPushButton *pushButton = new QPushButton;
- pushButton->setText(tr("Manage Qt versions"));
+ pushButton->setText(tr("Manage Qt versions..."));
connect(pushButton, SIGNAL(clicked()), this, SLOT(manageQtVersions()));
QHBoxLayout *qtVersionLayout = new QHBoxLayout;
diff --git a/src/plugins/qt4projectmanager/qt4nodes.cpp b/src/plugins/qt4projectmanager/qt4nodes.cpp
index ebf2d0bade..39647be14a 100644
--- a/src/plugins/qt4projectmanager/qt4nodes.cpp
+++ b/src/plugins/qt4projectmanager/qt4nodes.cpp
@@ -975,7 +975,7 @@ bool Qt4PriFileNode::priFileWritable(const QString &path)
switch (Core::FileManager::promptReadOnlyFile(path, versionControl, core->mainWindow(), false)) {
case Core::FileManager::RO_OpenVCS:
if (!versionControl->vcsOpen(path)) {
- QMessageBox::warning(core->mainWindow(), tr("Cannot Open File"), tr("Cannot open the file for edit with VCS."));
+ QMessageBox::warning(core->mainWindow(), tr("Cannot Open File"), tr("Cannot open the file for editing with VCS."));
return false;
}
break;
diff --git a/src/plugins/qt4projectmanager/qt4projectconfigwidget.cpp b/src/plugins/qt4projectmanager/qt4projectconfigwidget.cpp
index 2e310ac6ab..28a5dde1f0 100644
--- a/src/plugins/qt4projectmanager/qt4projectconfigwidget.cpp
+++ b/src/plugins/qt4projectmanager/qt4projectconfigwidget.cpp
@@ -402,7 +402,7 @@ void Qt4ProjectConfigWidget::updateImportLabel()
m_ui->problemLabel->setVisible(true);
m_ui->warningLabel->setVisible(true);
m_ui->importLabel->setVisible(false);
- m_ui->problemLabel->setText(tr("An build for a different project exists in %1, which will be overwritten.",
+ m_ui->problemLabel->setText(tr("A build for a different project exists in %1, which will be overwritten.",
"%1 build directory").
arg(m_ui->shadowBuildDirEdit->path()));
} else if (!issues.isEmpty()) {
diff --git a/src/plugins/qt4projectmanager/wizards/abstractmobileappwizard.cpp b/src/plugins/qt4projectmanager/wizards/abstractmobileappwizard.cpp
index 30a09dc2c7..d4d6497548 100644
--- a/src/plugins/qt4projectmanager/wizards/abstractmobileappwizard.cpp
+++ b/src/plugins/qt4projectmanager/wizards/abstractmobileappwizard.cpp
@@ -83,7 +83,7 @@ void AbstractMobileAppWizardDialog::addMobilePages()
m_symbianOptionsPageId = addPageWithTitle(m_symbianOptionsPage,
QLatin1String(" ") + tr("Symbian Specific"));
m_maemoOptionsPageId = addPageWithTitle(m_maemoOptionsPage,
- QLatin1String(" ") + tr("Maemo5 And Meego Specific"));
+ QLatin1String(" ") + tr("Maemo5 And MeeGo Specific"));
m_harmattanOptionsPageId = addPageWithTitle(m_harmattanOptionsPage,
QLatin1String(" ") + tr("Harmattan Specific"));
diff --git a/src/plugins/qt4projectmanager/wizards/qtquickapp.cpp b/src/plugins/qt4projectmanager/wizards/qtquickapp.cpp
index 7756233066..9678887848 100644
--- a/src/plugins/qt4projectmanager/wizards/qtquickapp.cpp
+++ b/src/plugins/qt4projectmanager/wizards/qtquickapp.cpp
@@ -316,7 +316,7 @@ bool QtQuickApp::addCppPlugin(const QString &qmldirLine, QmlModule *module)
} else {
m_error = QCoreApplication::translate(
"Qt4ProjectManager::Internal::QtQuickApp",
- "No .pro file for plugin '%1' cannot be found.").arg(name);
+ "No .pro file for plugin '%1' can be found.").arg(name);
return false;
}
QmlCppPlugin *plugin =
diff --git a/src/plugins/qt4projectmanager/wizards/qtquickcomponentsetoptionspage.ui b/src/plugins/qt4projectmanager/wizards/qtquickcomponentsetoptionspage.ui
index 7060391129..34c825dbc7 100644
--- a/src/plugins/qt4projectmanager/wizards/qtquickcomponentsetoptionspage.ui
+++ b/src/plugins/qt4projectmanager/wizards/qtquickcomponentsetoptionspage.ui
@@ -43,7 +43,7 @@
<item>
<widget class="QRadioButton" name="meego10RadioButton">
<property name="text">
- <string>Qt Quick Components for Meego/Harmattan</string>
+ <string>Qt Quick Components for MeeGo/Harmattan</string>
</property>
<attribute name="buttonGroup">
<string notr="true">buttonGroup</string>
@@ -151,7 +151,7 @@ Requires Qt 4.7.3 or newer, and the component set installed for your Qt version.
<item row="0" column="0">
<widget class="QLabel" name="meego1DescriptionLabel">
<property name="text">
- <string>The Qt Quick Components for Meego/Harmattan are a set of ready-made components that are designed with specific native appearance for the Meego/Harmattan platform.
+ <string>The Qt Quick Components for MeeGo/Harmattan are a set of ready-made components that are designed with specific native appearance for the MeeGo/Harmattan platform.
Requires Qt 4.7.4 or newer, and the component set installed for your Qt version.</string>
</property>
diff --git a/src/plugins/qtsupport/qtversionmanager.ui b/src/plugins/qtsupport/qtversionmanager.ui
index 8ebf7b8439..0e4389e80e 100644
--- a/src/plugins/qtsupport/qtversionmanager.ui
+++ b/src/plugins/qtsupport/qtversionmanager.ui
@@ -50,7 +50,7 @@
</size>
</property>
<property name="text">
- <string>Add</string>
+ <string>Add...</string>
</property>
</widget>
</item>
diff --git a/src/plugins/remotelinux/maemodeviceconfigwizardreusekeyscheckpage.ui b/src/plugins/remotelinux/maemodeviceconfigwizardreusekeyscheckpage.ui
index 8332f17a75..0f4c5bf987 100644
--- a/src/plugins/remotelinux/maemodeviceconfigwizardreusekeyscheckpage.ui
+++ b/src/plugins/remotelinux/maemodeviceconfigwizardreusekeyscheckpage.ui
@@ -17,7 +17,7 @@
<item>
<widget class="QLabel" name="questionLabel">
<property name="text">
- <string>Do wou want to re-use an existing pair of keys or should a new one be created?</string>
+ <string>Do you want to re-use an existing pair of keys or should a new one be created?</string>
</property>
<property name="wordWrap">
<bool>true</bool>
diff --git a/src/plugins/remotelinux/maemopackagecreationwidget.ui b/src/plugins/remotelinux/maemopackagecreationwidget.ui
index b7017f2727..cdadad9388 100644
--- a/src/plugins/remotelinux/maemopackagecreationwidget.ui
+++ b/src/plugins/remotelinux/maemopackagecreationwidget.ui
@@ -229,7 +229,7 @@
<item>
<widget class="QPushButton" name="editDebianFileButton">
<property name="text">
- <string>Edit</string>
+ <string>Edit...</string>
</property>
</widget>
</item>
diff --git a/src/plugins/remotelinux/maemoqtversion.cpp b/src/plugins/remotelinux/maemoqtversion.cpp
index 0484476a8c..132c0c7a2e 100644
--- a/src/plugins/remotelinux/maemoqtversion.cpp
+++ b/src/plugins/remotelinux/maemoqtversion.cpp
@@ -158,7 +158,7 @@ QString MaemoQtVersion::description() const
else if (m_osType == LinuxDeviceConfiguration::HarmattanOsType)
return QCoreApplication::translate("QtVersion", "Harmattan ", "Qt Version is meant for Harmattan");
else if (m_osType == LinuxDeviceConfiguration::MeeGoOsType)
- return QCoreApplication::translate("QtVersion", "Meego", "Qt Version is meant for Meego");
+ return QCoreApplication::translate("QtVersion", "Meego", "Qt Version is meant for MeeGo");
return QString();
}
diff --git a/src/plugins/remotelinux/qt4maemotarget.cpp b/src/plugins/remotelinux/qt4maemotarget.cpp
index 0c79e8d1a6..f11f58f644 100644
--- a/src/plugins/remotelinux/qt4maemotarget.cpp
+++ b/src/plugins/remotelinux/qt4maemotarget.cpp
@@ -1184,7 +1184,7 @@ Qt4MeegoTarget::~Qt4MeegoTarget() {}
QString Qt4MeegoTarget::defaultDisplayName()
{
return QApplication::translate("Qt4ProjectManager::Qt4Target",
- "Meego", "Qt4 Meego target display name");
+ "MeeGo", "Qt4 MeeGo target display name");
}
QString Qt4MeegoTarget::specFileName() const
diff --git a/src/plugins/texteditor/generichighlighter/highlightersettingspage.cpp b/src/plugins/texteditor/generichighlighter/highlightersettingspage.cpp
index d70dedfd2f..0b832f2bb8 100644
--- a/src/plugins/texteditor/generichighlighter/highlightersettingspage.cpp
+++ b/src/plugins/texteditor/generichighlighter/highlightersettingspage.cpp
@@ -97,7 +97,7 @@ QWidget *HighlighterSettingsPage::createPage(QWidget *parent)
m_d->m_page = new Ui::HighlighterSettingsPage;
m_d->m_page->setupUi(w);
m_d->m_page->definitionFilesPath->setExpectedKind(Utils::PathChooser::ExistingDirectory);
- m_d->m_page->definitionFilesPath->addButton(tr("Download Definitions"), this,
+ m_d->m_page->definitionFilesPath->addButton(tr("Download Definitions..."), this,
SLOT(requestAvailableDefinitionsMetaData()));
m_d->m_page->fallbackDefinitionFilesPath->setExpectedKind(Utils::PathChooser::ExistingDirectory);
m_d->m_page->fallbackDefinitionFilesPath->addButton(tr("Autodetect"), this,
diff --git a/src/plugins/texteditor/plaintexteditorfactory.cpp b/src/plugins/texteditor/plaintexteditorfactory.cpp
index 9ee3160bd0..1a9d384b0b 100644
--- a/src/plugins/texteditor/plaintexteditorfactory.cpp
+++ b/src/plugins/texteditor/plaintexteditorfactory.cpp
@@ -107,7 +107,7 @@ void PlainTextEditorFactory::updateEditorInfoBar(Core::IEditor *editor)
Core::InfoBarEntry info(Constants::INFO_SYNTAX_DEFINITION,
tr("A highlight definition was not found for this file. "
"Would you like to try to find one?"));
- info.setCustomButtonInfo(tr("Show highlighter options"),
+ info.setCustomButtonInfo(tr("Show highlighter options..."),
textEditor, SLOT(acceptMissingSyntaxDefinitionInfo()));
info.setCancelButtonInfo(textEditor, SLOT(ignoreMissingSyntaxDefinitionInfo()));
file->infoBar()->addInfo(info);
diff --git a/src/plugins/vcsbase/vcsconfigurationpage.ui b/src/plugins/vcsbase/vcsconfigurationpage.ui
index 2b3eba966c..8488e6fd42 100644
--- a/src/plugins/vcsbase/vcsconfigurationpage.ui
+++ b/src/plugins/vcsbase/vcsconfigurationpage.ui
@@ -14,7 +14,7 @@
<item>
<widget class="QPushButton" name="configureButton">
<property name="text">
- <string>Configure</string>
+ <string>Configure...</string>
</property>
</widget>
</item>