Merge remote-tracking branch 'origin/4.0' into master

Change-Id: I3d61fa9873ef3f2258fd03091dea94e9e4961c0a

2 files changed, 2 insertions, 2 deletions

diff --git a/src/libs/installer/packagemanagergui.cpp b/src/libs/installer/packagemanagergui.cpp
index 65c3d1611..339079b10 100644
--- a/src/libs/installer/packagemanagergui.cpp
+++ b/src/libs/installer/packagemanagergui.cpp
@@ -467,7 +467,7 @@ void PackageManagerGui::updatePageListWidget()
             item->setFont(currentItemFont);
             // Current item should be always visible on the list
             m_pageListWidget->scrollToItem(item);
-        } else if (!visitedPages().contains(id)) {
+        } else if (id > d->m_currentId) {
             item->setFlags(item->flags() & ~Qt::ItemIsEnabled);
         }
     }
diff --git a/src/libs/installer/settings.cpp b/src/libs/installer/settings.cpp
index 0c54c4014..aeacf7a8e 100644
--- a/src/libs/installer/settings.cpp
+++ b/src/libs/installer/settings.cpp
@@ -922,7 +922,7 @@ void Settings::setSaveDefaultRepositories(bool save)
 QString Settings::repositoryCategoryDisplayName() const
 {
     QString displayName = d->m_data.value(QLatin1String(scRepositoryCategoryDisplayName)).toString();
-    return displayName.isEmpty() ? tr("Select Package Categories") : displayName;
+    return displayName.isEmpty() ? tr("Select Categories") : displayName;
 }
 
 void Settings::setRepositoryCategoryDisplayName(const QString& name)