From 3270c4828f2152abea4076a36fbb5ae6ac749eec Mon Sep 17 00:00:00 2001
From: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Date: Mon, 11 May 2009 14:09:52 +0200
Subject: [PATCH] typo & language fixes

---
 src/plugins/perforce/perforceplugin.cpp         |  2 +-
 src/plugins/projectexplorer/projectexplorer.cpp | 10 +++++-----
 src/plugins/projectexplorer/session.cpp         |  8 ++++----
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/src/plugins/perforce/perforceplugin.cpp b/src/plugins/perforce/perforceplugin.cpp
index eb3bafc0522..1cb25746d2a 100644
--- a/src/plugins/perforce/perforceplugin.cpp
+++ b/src/plugins/perforce/perforceplugin.cpp
@@ -661,7 +661,7 @@ void PerforcePlugin::updateActions()
         m_submitAction->setEnabled(true);
     } else {
         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_diffAllAction->setEnabled(true);
diff --git a/src/plugins/projectexplorer/projectexplorer.cpp b/src/plugins/projectexplorer/projectexplorer.cpp
index 46e8c7568f6..9f4915edaaa 100644
--- a/src/plugins/projectexplorer/projectexplorer.cpp
+++ b/src/plugins/projectexplorer/projectexplorer.cpp
@@ -438,7 +438,7 @@ bool ProjectExplorerPlugin::initialize(const QStringList &arguments, QString *er
         this, SLOT(updateRecentProjectMenu()));
 
     // 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->setAttribute(Core::Command::CA_UpdateText);
     cmd->setDefaultText(m_unloadAction->text());
@@ -446,7 +446,7 @@ bool ProjectExplorerPlugin::initialize(const QStringList &arguments, QString *er
     mproject->addAction(cmd, Constants::G_PROJECT_FILES);
 
     // 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);
     mfile->addAction(cmd, Core::Constants::G_FILE_PROJECT);
     msessionContextMenu->addAction(cmd, Constants::G_SESSION_FILES);
@@ -1028,7 +1028,7 @@ void ProjectExplorerPlugin::restoreSession()
                 sessionToLoad = arg;
                 arguments.removeOne(arg);
                 if (debug)
-                    qDebug()<< "Found session argument, loading session"<<sessionToLoad;
+                    qDebug() << "Found session argument, restoring session" << sessionToLoad;
                 break;
             }
         }
@@ -1246,10 +1246,10 @@ void ProjectExplorerPlugin::updateActions()
 
     m_unloadAction->setEnabled(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"));
     } 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()));
     }
 
diff --git a/src/plugins/projectexplorer/session.cpp b/src/plugins/projectexplorer/session.cpp
index ad09041e9cf..e73fe6e6e40 100644
--- a/src/plugins/projectexplorer/session.cpp
+++ b/src/plugins/projectexplorer/session.cpp
@@ -615,7 +615,7 @@ bool SessionManager::loadImpl(const QString &fileName)
     Q_ASSERT(!fileName.isEmpty());
 
     if (debug)
-        qDebug() << "SessionManager - loading session " << fileName << " ...";
+        qDebug() << "SessionManager - restoring session " << fileName << " ...";
 
     bool success = true;
 
@@ -634,8 +634,8 @@ bool SessionManager::loadImpl(const QString &fileName)
         emit sessionUnloaded();
         m_file = new SessionFile;
         if (!m_file->load(fileName)) {
-            QMessageBox::warning(0, tr("Error while loading session"),
-                                    tr("Could not load session %1").arg(fileName));
+            QMessageBox::warning(0, tr("Error while restoring session"),
+                                    tr("Could not restore session %1").arg(fileName));
             success = false;
         }
         // m_file->load() sets the m_file->startupProject
@@ -653,7 +653,7 @@ bool SessionManager::loadImpl(const QString &fileName)
     }
 
     if (debug)
-        qDebug() << "SessionManager - loading session returned " << success;
+        qDebug() << "SessionManager - restoring session returned " << success;
 
     if (success)
         emit sessionLoaded();