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

typo & language fixes

Browse Source
This commit is contained in:
Oswald Buddenhagen
2009-05-11 14:09:52 +02:00
parent 8457bd6861
commit 3270c4828f
3 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -661,7 +661,7 @@ void PerforcePlugin::updateActions()
m_submitAction->setEnabled(true); m_submitAction->setEnabled(true);
} else { } else {
m_diffProjectAction->setEnabled(false); m_diffProjectAction->setEnabled(false);
m_diffProjectAction->setText(tr("Diff Current Project/Soluion")); m_diffProjectAction->setText(tr("Diff Current Project/Solution"));
m_submitAction->setEnabled(false); m_submitAction->setEnabled(false);
} }
m_diffAllAction->setEnabled(true); m_diffAllAction->setEnabled(true);

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

@@ -438,7 +438,7 @@ bool ProjectExplorerPlugin::initialize(const QStringList &arguments, QString *er
this, SLOT(updateRecentProjectMenu())); this, SLOT(updateRecentProjectMenu()));
// unload action // unload action
m_unloadAction = new QAction(tr("Unload Project"), this); m_unloadAction = new QAction(tr("Close Project"), this);
cmd = am->registerAction(m_unloadAction, Constants::UNLOAD, globalcontext); cmd = am->registerAction(m_unloadAction, Constants::UNLOAD, globalcontext);
cmd->setAttribute(Core::Command::CA_UpdateText); cmd->setAttribute(Core::Command::CA_UpdateText);
cmd->setDefaultText(m_unloadAction->text()); cmd->setDefaultText(m_unloadAction->text());
@@ -446,7 +446,7 @@ bool ProjectExplorerPlugin::initialize(const QStringList &arguments, QString *er
mproject->addAction(cmd, Constants::G_PROJECT_FILES); mproject->addAction(cmd, Constants::G_PROJECT_FILES);
// unload session action // unload session action
m_clearSession = new QAction(tr("Unload All Projects"), this); m_clearSession = new QAction(tr("Close All Projects"), this);
cmd = am->registerAction(m_clearSession, Constants::CLEARSESSION, globalcontext); cmd = am->registerAction(m_clearSession, Constants::CLEARSESSION, globalcontext);
mfile->addAction(cmd, Core::Constants::G_FILE_PROJECT); mfile->addAction(cmd, Core::Constants::G_FILE_PROJECT);
msessionContextMenu->addAction(cmd, Constants::G_SESSION_FILES); msessionContextMenu->addAction(cmd, Constants::G_SESSION_FILES);
@@ -1028,7 +1028,7 @@ void ProjectExplorerPlugin::restoreSession()
sessionToLoad = arg; sessionToLoad = arg;
arguments.removeOne(arg); arguments.removeOne(arg);
if (debug) if (debug)
qDebug()<< "Found session argument, loading session"<<sessionToLoad; qDebug() << "Found session argument, restoring session" << sessionToLoad;
break; break;
} }
} }
@@ -1246,10 +1246,10 @@ void ProjectExplorerPlugin::updateActions()
m_unloadAction->setEnabled(m_currentProject != 0); m_unloadAction->setEnabled(m_currentProject != 0);
if (m_currentProject == 0) { if (m_currentProject == 0) {
m_unloadAction->setText(tr("Unload Project")); m_unloadAction->setText(tr("Close Project"));
m_buildAction->setText(tr("Build Project")); m_buildAction->setText(tr("Build Project"));
} else { } else {
m_unloadAction->setText(tr("Unload Project \"%1\"").arg(m_currentProject->name())); m_unloadAction->setText(tr("Close Project \"%1\"").arg(m_currentProject->name()));
m_buildAction->setText(tr("Build Project \"%1\"").arg(m_currentProject->name())); m_buildAction->setText(tr("Build Project \"%1\"").arg(m_currentProject->name()));
} }

8
src/plugins/projectexplorer/session.cpp
View File

@@ -615,7 +615,7 @@ bool SessionManager::loadImpl(const QString &fileName)
Q_ASSERT(!fileName.isEmpty()); Q_ASSERT(!fileName.isEmpty());
if (debug) if (debug)
qDebug() << "SessionManager - loading session " << fileName << " ..."; qDebug() << "SessionManager - restoring session " << fileName << " ...";
bool success = true; bool success = true;
@@ -634,8 +634,8 @@ bool SessionManager::loadImpl(const QString &fileName)
emit sessionUnloaded(); emit sessionUnloaded();
m_file = new SessionFile; m_file = new SessionFile;
if (!m_file->load(fileName)) { if (!m_file->load(fileName)) {
QMessageBox::warning(0, tr("Error while loading session"), QMessageBox::warning(0, tr("Error while restoring session"),
tr("Could not load session %1").arg(fileName)); tr("Could not restore session %1").arg(fileName));
success = false; success = false;
} }
// m_file->load() sets the m_file->startupProject // m_file->load() sets the m_file->startupProject
@@ -653,7 +653,7 @@ bool SessionManager::loadImpl(const QString &fileName)
} }
if (debug) if (debug)
qDebug() << "SessionManager - loading session returned " << success; qDebug() << "SessionManager - restoring session returned " << success;
if (success) if (success)
emit sessionLoaded(); emit sessionLoaded();