Merge lp:~alecu/unity-scope-click/merge-devel into lp:unity-scope-click

[Alejandro J. Cura]

* New upstream release.
  - Display Ubuntu logo in the header of apps scope. (LP: #1350610)
  - Pass the sha512 hash from the details webservice to download manager.
    (LP: #1330770)
  - Sort departments alphabetically. (LP: #1354044)
  - Exclude empty departments from the departments tree in Apps.
    (LP: #1350609)
  - Provide updated departments to match latest server changes. Bumped
    schema to 3.
  - New script to enable purchases in the scope. (LP: #1356419)
  - Enable QNetworkDiskCache for http GET requests. (LP: #1351212)
  - Query download manager for in-progress downloads. (LP: #1234965)
  - Only show extended info for apps from the store. (LP: #1350571)
  - Don't expand categories by default in the store. (LP: #1355221)
  - Do not use static const strings for translations. (LP: #1354501)
  - Change "All departments" to just "All". (LP: #1351536)
  - Localize the extra department title in the store. (LP: #1358790)
  - Updated translations.

[dobey (dobey)]

review: Approve

[lp:~alecu/unity-scope-click/merge-devel]

267. By Alejandro J. Cura on 2014-08-21

* New upstream release.
  - Display Ubuntu logo in the header of apps scope. (LP: #1350610)
  - Pass the sha512 hash from the details webservice to download manager.
    (LP: #1330770)
  - Sort departments alphabetically. (LP: #1354044)
  - Exclude empty departments from the departments tree in Apps.
    (LP: #1350609)
  - Provide updated departments to match latest server changes. Bumped
    schema to 3.
  - New script to enable purchases in the scope. (LP: #1356419)
  - Enable QNetworkDiskCache for http GET requests. (LP: #1351212)
  - Query download manager for in-progress downloads. (LP: #1234965)
  - Only show extended info for apps from the store. (LP: #1350571)
  - Don't expand categories by default in the store. (LP: #1355221)
  - Do not use static const strings for translations. (LP: #1354501)
  - Change "All departments" to just "All". (LP: #1351536)
  - Localize the extra department title in the store. (LP: #1358790)
  - Updated translations. Fixes: 1333797
Approved by: Rodney Dawes

=== modified file 'HACKING'
--- HACKING	2014-05-16 21:08:36 +0000
+++ HACKING	2014-08-21 20:38:09 +0000
@@ -65,3 +65,8 @@
     $ make coverage-html
 
 The html will be left on the coveragereport directory.
+
+Updating departments db
+-----------------------
+See tools/init-departments/README for details about how to re-create departments database
+file found in data/departments.db.

=== modified file 'bin/CMakeLists.txt'
--- bin/CMakeLists.txt	2014-06-20 20:00:53 +0000
+++ bin/CMakeLists.txt	2014-08-21 20:38:09 +0000
@@ -1,1 +1,1 @@
-install(PROGRAMS install-helper DESTINATION lib/unity-scope-click/)
+install(PROGRAMS install-helper enable-purchases DESTINATION lib/unity-scope-click/)

=== added file 'bin/enable-purchases'
--- bin/enable-purchases	1970-01-01 00:00:00 +0000
+++ bin/enable-purchases	2014-08-21 20:38:09 +0000
@@ -0,0 +1,44 @@
+#!/bin/sh
+#
+# Copyright (C) 2014 Canonical Ltd.
+# 
+# This program is free software: you can redistribute it and/or modify it
+# under the terms of the GNU General Public License version 3, as published
+# by the Free Software Foundation.
+# 
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranties of
+# MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
+# PURPOSE.  See the GNU General Public License for more details.
+# 
+# You should have received a copy of the GNU General Public License along
+# with this program.  If not, see <http://www.gnu.org/licenses/>.
+# 
+# In addition, as a special exception, the copyright holders give
+# permission to link the code of portions of this program with the
+# OpenSSL library under certain conditions as described in each
+# individual source file, and distribute linked combinations
+# including the two.
+# You must obey the GNU General Public License in all respects
+# for all of the code used other than OpenSSL.  If you modify
+# file(s) with this exception, you may extend this exception to your
+# version of the file(s), but you are not obligated to do so.  If you
+# do not wish to do so, delete this exception statement from your
+# version.  If you delete this exception statement from all source
+# files in the program, then also delete it here.
+#
+set -e
+
+CLICK_STORE_ENABLE_PURCHASES=1
+
+/sbin/initctl set-env --global CLICK_STORE_ENABLE_PURCHASES=$CLICK_STORE_ENABLE_PURCHASES
+
+gdbus call --session \
+  --dest org.freedesktop.DBus \
+  --object-path / \
+  --method org.freedesktop.DBus.UpdateActivationEnvironment \
+  "[{'CLICK_STORE_ENABLE_PURCHASES', '$CLICK_STORE_ENABLE_PURCHASES'}]"
+
+/sbin/restart scope-registry
+
+echo "Purchases enabled and scope-registry restarted."

=== modified file 'data/CMakeLists.txt'
--- data/CMakeLists.txt	2014-08-11 19:08:16 +0000
+++ data/CMakeLists.txt	2014-08-21 20:38:09 +0000
@@ -35,7 +35,7 @@
 )
 
 install(
-  FILES clickscope-screenshot.jpg apps-scope.png
+  FILES clickscope-screenshot.jpg apps-scope.png ubuntu-logo.png
   DESTINATION "${APPS_DATA_DIR}"
 )
 

=== modified file 'data/clickscope.ini.in.in'
--- data/clickscope.ini.in.in	2014-08-07 13:30:34 +0000
+++ data/clickscope.ini.in.in	2014-08-21 20:38:09 +0000
@@ -7,4 +7,5 @@
 _SearchHint=Search apps
 
 [Appearance]
+PageHeader.Logo=@APPS_DATA_DIR@/ubuntu-logo.png
 LogoOverlayColor=#ffffffff

=== modified file 'data/departments.db'
Binary files data/departments.db	2014-08-05 17:12:54 +0000 and data/departments.db	2014-08-21 20:38:09 +0000 differ
=== added file 'data/ubuntu-logo.png'
Binary files data/ubuntu-logo.png	1970-01-01 00:00:00 +0000 and data/ubuntu-logo.png	2014-08-21 20:38:09 +0000 differ
=== modified file 'data/update_schema.sh'
--- data/update_schema.sh	2014-08-06 17:31:50 +0000
+++ data/update_schema.sh	2014-08-21 20:38:09 +0000
@@ -52,4 +52,101 @@
     UPDATE meta SET value='2' WHERE name='version';
     END TRANSACTION;
 _UPDATE_TO_VER2
+SCHEMA_VERSION=$(sqlite3 "$DBFILE" "SELECT value FROM meta WHERE name='version'")
+fi
+
+if [ "x$SCHEMA_VERSION" = "x2" ]
+then
+    sqlite3 "$DBFILE" << _UPDATE_TO_VER3
+    BEGIN TRANSACTION;
+    UPDATE pkgmap SET deptid='developer-tools' WHERE deptid='3d';
+    UPDATE pkgmap SET deptid='developer-tools' WHERE deptid='computing-robotics';
+    UPDATE pkgmap SET deptid='developer-tools' WHERE deptid='debugging';
+    UPDATE pkgmap SET deptid='developer-tools' WHERE deptid='electronics';
+    UPDATE pkgmap SET deptid='developer-tools' WHERE deptid='engineering';
+    UPDATE pkgmap SET deptid='developer-tools' WHERE deptid='ides';
+    UPDATE pkgmap SET deptid='developer-tools' WHERE deptid='profiling';
+    UPDATE pkgmap SET deptid='developer-tools' WHERE deptid='version-control';
+    UPDATE pkgmap SET deptid='developer-tools' WHERE deptid='web-development';
+    UPDATE pkgmap SET deptid='science-engineering' WHERE deptid='astronomy';
+    UPDATE pkgmap SET deptid='science-engineering' WHERE deptid='biology';
+    UPDATE pkgmap SET deptid='science-engineering' WHERE deptid='chemistry';
+    UPDATE pkgmap SET deptid='science-engineering' WHERE deptid='geography';
+    UPDATE pkgmap SET deptid='science-engineering' WHERE deptid='geology';
+    UPDATE pkgmap SET deptid='science-engineering' WHERE deptid='mathematics';
+    UPDATE pkgmap SET deptid='science-engineering' WHERE deptid='medicine';
+    UPDATE pkgmap SET deptid='science-engineering' WHERE deptid='physics';
+    UPDATE pkgmap SET deptid='games' WHERE deptid='board-games';
+    UPDATE pkgmap SET deptid='games' WHERE deptid='card-games';
+    UPDATE pkgmap SET deptid='games' WHERE deptid='puzzles';
+    UPDATE pkgmap SET deptid='games' WHERE deptid='role-playing';
+    UPDATE pkgmap SET deptid='books-comics' WHERE deptid='books-magazines';
+    UPDATE pkgmap SET deptid='communication' WHERE deptid='chat';
+    UPDATE pkgmap SET deptid='communication' WHERE deptid='file-sharing';
+    UPDATE pkgmap SET deptid='communication' WHERE deptid='internet';
+    UPDATE pkgmap SET deptid='communication' WHERE deptid='mail';
+    UPDATE pkgmap SET deptid='communication' WHERE deptid='web-browsers';
+    UPDATE pkgmap SET deptid='graphics' WHERE deptid='drawing';
+    UPDATE pkgmap SET deptid='graphics' WHERE deptid='graphic-interface-design';
+    UPDATE pkgmap SET deptid='graphics' WHERE deptid='photography';
+    UPDATE pkgmap SET deptid='graphics' WHERE deptid='publishing';
+    UPDATE pkgmap SET deptid='graphics' WHERE deptid='scanning-ocr';
+    UPDATE pkgmap SET deptid='personalisation' WHERE deptid='localization';
+    UPDATE pkgmap SET deptid='personalisation' WHERE deptid='themes-tweaks';
+    UPDATE pkgmap SET deptid='productivity' WHERE deptid='office';
+    UPDATE pkgmap SET deptid='music-audio' WHERE deptid='sound-video';
+    UPDATE pkgmap SET deptid='universal-accessaccessibility' WHERE deptid='universal-access';
+    UPDATE pkgmap SET deptid='accessories' WHERE deptid='viewers';
+
+    DELETE FROM depts;
+    INSERT INTO depts (deptid,parentid) VALUES ('travel-local', '');
+    INSERT INTO depts (deptid,parentid) VALUES ('productivity', '');
+    INSERT INTO depts (deptid,parentid) VALUES ('finance', '');
+    INSERT INTO depts (deptid,parentid) VALUES ('universal-accessaccessibility', '');
+    INSERT INTO depts (deptid,parentid) VALUES ('entertainment', '');
+    INSERT INTO depts (deptid,parentid) VALUES ('communication', '');
+    INSERT INTO depts (deptid,parentid) VALUES ('graphics', '');
+    INSERT INTO depts (deptid,parentid) VALUES ('science-engineering', '');
+    INSERT INTO depts (deptid,parentid) VALUES ('news-magazines', '');
+    INSERT INTO depts (deptid,parentid) VALUES ('accessories', '');
+    INSERT INTO depts (deptid,parentid) VALUES ('sports', '');
+    INSERT INTO depts (deptid,parentid) VALUES ('developer-tools', '');
+    INSERT INTO depts (deptid,parentid) VALUES ('games', '');
+    INSERT INTO depts (deptid,parentid) VALUES ('books-comics', '');
+    INSERT INTO depts (deptid,parentid) VALUES ('music-audio', '');
+    INSERT INTO depts (deptid,parentid) VALUES ('shopping', '');
+    INSERT INTO depts (deptid,parentid) VALUES ('education', '');
+
+    DELETE FROM deptnames;
+    INSERT INTO deptnames (deptid,locale,name) VALUES ('books-comics','en_US','Books & Comics');
+    INSERT INTO deptnames (deptid,locale,name) VALUES ('business','en_US','Business');
+    INSERT INTO deptnames (deptid,locale,name) VALUES ('communication','en_US','Communication');
+    INSERT INTO deptnames (deptid,locale,name) VALUES ('developer-tools','en_US','Developer Tools');
+    INSERT INTO deptnames (deptid,locale,name) VALUES ('education','en_US','Education');
+    INSERT INTO deptnames (deptid,locale,name) VALUES ('entertainment','en_US','Entertainment');
+    INSERT INTO deptnames (deptid,locale,name) VALUES ('finance','en_US','Finance');
+    INSERT INTO deptnames (deptid,locale,name) VALUES ('food-drink','en_US','Food & Drink');
+    INSERT INTO deptnames (deptid,locale,name) VALUES ('games','en_US','Games');
+    INSERT INTO deptnames (deptid,locale,name) VALUES ('graphics','en_US','Graphics');
+    INSERT INTO deptnames (deptid,locale,name) VALUES ('health-fitness','en_US','Lifestyle');
+    INSERT INTO deptnames (deptid,locale,name) VALUES ('lifestyle','en_US','Health & Fitness');
+    INSERT INTO deptnames (deptid,locale,name) VALUES ('media-video','en_US','Media & Video');
+    INSERT INTO deptnames (deptid,locale,name) VALUES ('medical','en_US','Medical');
+    INSERT INTO deptnames (deptid,locale,name) VALUES ('music-audio','en_US','Music & Audio');
+    INSERT INTO deptnames (deptid,locale,name) VALUES ('news-magazines','en_US','News & Magazines');
+    INSERT INTO deptnames (deptid,locale,name) VALUES ('personalisation','en_US','Personalisation');
+    INSERT INTO deptnames (deptid,locale,name) VALUES ('productivity','en_US','Productivity');
+    INSERT INTO deptnames (deptid,locale,name) VALUES ('reference','en_US','Reference');
+    INSERT INTO deptnames (deptid,locale,name) VALUES ('science-engineering','en_US','Science & Engineering');
+    INSERT INTO deptnames (deptid,locale,name) VALUES ('shopping','en_US','Shopping');
+    INSERT INTO deptnames (deptid,locale,name) VALUES ('social-networking','en_US','Social Networking');
+    INSERT INTO deptnames (deptid,locale,name) VALUES ('sports','en_US','Sports');
+    INSERT INTO deptnames (deptid,locale,name) VALUES ('travel-local','en_US','Travel & Local');
+    INSERT INTO deptnames (deptid,locale,name) VALUES ('universal-accessaccessibility','en_US','Universal Access/Accessibility');
+    INSERT INTO deptnames (deptid,locale,name) VALUES ('weather','en_US','Weather');
+    INSERT INTO deptnames (deptid,locale,name) VALUES ('accessories','en_US','Utilities');
+
+    UPDATE meta SET value='3' WHERE name='version';
+    END TRANSACTION;
+_UPDATE_TO_VER3
 fi

=== modified file 'debian/changelog'
--- debian/changelog	2014-08-15 14:24:40 +0000
+++ debian/changelog	2014-08-21 20:38:09 +0000
@@ -1,3 +1,27 @@
+unity-scope-click (0.1.1+14.10.20140815-0ubuntu2) UNRELEASED; urgency=medium
+
+  * New upstream release.
+    - Display Ubuntu logo in the header of apps scope. (LP: #1350610)
+    - Pass the sha512 hash from the details webservice to download manager.
+      (LP: #1330770)
+    - Sort departments alphabetically. (LP: #1354044)
+    - Exclude empty departments from the departments tree in Apps.
+      (LP: #1350609)
+    - Provide updated departments to match latest server changes. Bumped
+      schema to 3.
+    - New script to enable purchases in the scope during beta. (LP: #1356419)
+    - Add dependency on libglib2.0-bin and upstart-bin for script above.
+    - Enable QNetworkDiskCache for http GET requests. (LP: #1351212)
+    - Query download manager for in-progress downloads. (LP: #1234965)
+    - Only show extended info for apps from the store. (LP: #1350571)
+    - Don't expand categories by default in the store. (LP: #1355221)
+    - Do not use static const strings for translations. (LP: #1354501)
+    - Change "All departments" to just "All". (LP: #1351536)
+    - Localize the extra department title in the store. (LP: #1358790)
+    - Updated translations.
+
+ -- Alejandro J. Cura (alecu) <[e-mail]>  Tue, 19 Aug 2014 17:18:37 -0300
+
 unity-scope-click (0.1.1+14.10.20140815-0ubuntu1) utopic; urgency=low
 
   [ Rodney Dawes ]

=== modified file 'debian/control'
--- debian/control	2014-08-01 15:04:19 +0000
+++ debian/control	2014-08-21 20:38:09 +0000
@@ -30,13 +30,15 @@
 Package: unity-scope-click
 Architecture: armhf i386 amd64
 Depends: account-plugin-ubuntuone,
+         libglib2.0-bin,
+         libsqlite3-0 (>= 3.8.5),
          packagekit-tools,
          pay-service,
          ubuntu-app-launch-tools,
          ubuntu-download-manager,
          ubuntu-sdk-libs,
-         libsqlite3-0 (>= 3.8.5),
          unity-scope-click-departmentsdb (= ${binary:Version}),
+         upstart-bin,
          ${misc:Depends},
          ${shlibs:Depends},
 Breaks: unity (<< 7.0),

=== modified file 'libclickscope/click/application.h'
--- libclickscope/click/application.h	2014-07-18 10:35:52 +0000
+++ libclickscope/click/application.h	2014-08-21 20:38:09 +0000
@@ -43,11 +43,13 @@
                 std::string url,
                 std::string description,
                 std::string main_screenshot,
-                std::string default_department
+                std::string default_department,
+                std::string real_department = ""
                 ) : Package {name, title, price, icon_url, url},
                     description(description),
                     main_screenshot(main_screenshot),
-                    default_department(default_department)
+                    default_department(default_department),
+                    real_department(real_department)
     {
 
     }
@@ -58,6 +60,7 @@
     std::vector<std::string> keywords;
     std::string main_screenshot;
     std::string default_department;
+    std::string real_department;
     time_t installed_time;
 };
 

=== modified file 'libclickscope/click/departments-db.cpp'
--- libclickscope/click/departments-db.cpp	2014-08-05 14:16:26 +0000
+++ libclickscope/click/departments-db.cpp	2014-08-21 20:38:09 +0000
@@ -81,11 +81,14 @@
     insert_dept_id_query_.reset(new QSqlQuery(db_));
     insert_dept_name_query_.reset(new QSqlQuery(db_));
     select_pkgs_by_dept_.reset(new QSqlQuery(db_));
+    select_dept_for_pkg_.reset(new QSqlQuery(db_));
     select_pkg_by_pkgid_.reset(new QSqlQuery(db_));
     select_pkgs_by_dept_recursive_.reset(new QSqlQuery(db_));
+    select_pkgs_count_in_dept_recursive_.reset(new QSqlQuery(db_));
     select_parent_dept_.reset(new QSqlQuery(db_));
     select_children_depts_.reset(new QSqlQuery(db_));
     select_dept_name_.reset(new QSqlQuery(db_));
+    select_is_descendant_of_dept_.reset(new QSqlQuery(db_));
 
     delete_pkgmap_query_->prepare("DELETE FROM pkgmap WHERE pkgid=:pkgid");
     delete_depts_query_->prepare("DELETE FROM depts");
@@ -94,11 +97,14 @@
     insert_dept_id_query_->prepare("INSERT OR REPLACE INTO depts (deptid, parentid) VALUES (:deptid, :parentid)");
     insert_dept_name_query_->prepare("INSERT OR REPLACE INTO deptnames (deptid, locale, name) VALUES (:deptid, :locale, :name)");
     select_pkgs_by_dept_->prepare("SELECT pkgid FROM pkgmap WHERE deptid=:deptid");
-    select_pkgs_by_dept_recursive_->prepare("WITH RECURSIVE recdepts(deptid) AS (SELECT deptid FROM depts WHERE deptid=:deptid UNION SELECT depts.deptid FROM recdepts,depts WHERE recdepts.deptid=depts.parentid) SELECT pkgid FROM pkgmap NATURAL JOIN recdepts");
+    select_pkgs_by_dept_recursive_->prepare("WITH RECURSIVE recdepts(deptid) AS (SELECT deptid FROM depts WHERE deptid=:deptid OR parentid=:deptid UNION SELECT depts.deptid FROM recdepts,depts WHERE recdepts.deptid=depts.parentid) SELECT pkgid FROM pkgmap NATURAL JOIN recdepts");
+    select_dept_for_pkg_->prepare("SELECT deptid from pkgmap WHERE pkgid=:pkgid");
+    select_pkgs_count_in_dept_recursive_->prepare("WITH RECURSIVE recdepts(deptid) AS (SELECT deptid FROM depts WHERE deptid=:deptid OR parentid=:deptid UNION SELECT depts.deptid FROM recdepts,depts WHERE recdepts.deptid=depts.parentid) SELECT COUNT(pkgid) FROM pkgmap NATURAL JOIN recdepts");
     select_pkg_by_pkgid_->prepare("SELECT pkgid FROM pkgmap WHERE pkgid=:pkgid");
     select_children_depts_->prepare("SELECT deptid,(SELECT COUNT(1) from depts AS inner WHERE inner.parentid=outer.deptid) FROM depts AS outer WHERE parentid=:parentid");
     select_parent_dept_->prepare("SELECT parentid FROM depts WHERE deptid=:deptid");
     select_dept_name_->prepare("SELECT name FROM deptnames WHERE deptid=:deptid AND locale=:locale");
+    select_is_descendant_of_dept_->prepare("WITH RECURSIVE recdepts(deptid) AS (SELECT deptid FROM depts WHERE parentid=:parentid UNION SELECT depts.deptid FROM recdepts,depts WHERE recdepts.deptid=depts.parentid) SELECT COUNT(1) FROM recdepts WHERE deptid=:deptid");
 }
 
 DepartmentsDb::~DepartmentsDb()
@@ -150,7 +156,7 @@
     //
     // note: this will fail due to unique constraint, but that's fine; it's expected to succeed only when new database is created; in other
     // cases the version needs to be bumped in the update_schema.sh script.
-    query.exec("INSERT INTO meta (name, value) VALUES ('version', 2)");
+    query.exec("INSERT INTO meta (name, value) VALUES ('version', 3)");
 
     if (!db_.commit())
     {
@@ -205,7 +211,6 @@
 
 std::list<DepartmentsDb::DepartmentInfo> DepartmentsDb::get_children_departments(const std::string& department_id)
 {
-    // FIXME: this should only return departments that have results, and set 'has_children' flag on the same basis.
     select_children_depts_->bindValue(":parentid", QVariant(QString::fromStdString(department_id)));
     if (!select_children_depts_->exec())
     {
@@ -215,14 +220,47 @@
     std::list<DepartmentInfo> depts;
     while (select_children_depts_->next())
     {
-        const DepartmentInfo inf(select_children_depts_->value(0).toString().toStdString(), select_children_depts_->value(1).toBool());
-        depts.push_back(inf);
+        auto const child_id = select_children_depts_->value(0).toString().toStdString();
+        // only return child department if it's not empty
+        if (!is_empty(child_id))
+        {
+            const DepartmentInfo inf(child_id, select_children_depts_->value(1).toBool());
+            depts.push_back(inf);
+        }
     }
 
     select_children_depts_->finish();
+
     return depts;
 }
 
+bool DepartmentsDb::is_descendant_of_department(const std::string& department_id, const std::string& parent_department_id)
+{
+    select_is_descendant_of_dept_->bindValue(":deptid", QVariant(QString::fromStdString(department_id)));
+    select_is_descendant_of_dept_->bindValue(":parentid", QVariant(QString::fromStdString(parent_department_id)));
+
+    if (!select_is_descendant_of_dept_->exec() || !select_is_descendant_of_dept_->next())
+    {
+        report_db_error(select_is_descendant_of_dept_->lastError(), "Failed to query for package count of department " + department_id);
+    }
+    auto cnt = select_is_descendant_of_dept_->value(0).toInt();
+    select_is_descendant_of_dept_->finish();
+
+    return cnt > 0;
+}
+
+bool DepartmentsDb::is_empty(const std::string& department_id)
+{
+    select_pkgs_count_in_dept_recursive_->bindValue(":deptid", QVariant(QString::fromStdString(department_id)));
+    if (!select_pkgs_count_in_dept_recursive_->exec() || !select_pkgs_count_in_dept_recursive_->next())
+    {
+        report_db_error(select_pkgs_count_in_dept_recursive_->lastError(), "Failed to query for package count of department " + department_id);
+    }
+    auto cnt = select_pkgs_count_in_dept_recursive_->value(0).toInt();
+    select_pkgs_count_in_dept_recursive_->finish();
+    return cnt == 0;
+}
+
 std::unordered_set<std::string> DepartmentsDb::get_packages_for_department(const std::string& department_id, bool recursive)
 {
     std::unordered_set<std::string> pkgs;
@@ -240,6 +278,24 @@
     return pkgs;
 }
 
+std::string DepartmentsDb::get_department_for_package(const std::string& package_id)
+{
+    select_dept_for_pkg_->bindValue(":pkgid", QVariant(QString::fromStdString(package_id)));
+    if (!select_dept_for_pkg_->exec())
+    {
+        report_db_error(select_dept_for_pkg_->lastError(), "Failed to query for department of package " + package_id);
+    }
+    if (!select_dept_for_pkg_->next())
+    {
+        select_dept_for_pkg_->finish();
+        throw std::logic_error("Unknown package '" + package_id + "'");
+    }
+    auto const res = select_dept_for_pkg_->value(0).toString().toStdString();
+    select_dept_for_pkg_->finish();
+    return res;
+
+}
+
 bool DepartmentsDb::has_package(const std::string& package_id)
 {
     select_pkg_by_pkgid_->bindValue(":pkgid", QVariant(QString::fromStdString(package_id)));

=== modified file 'libclickscope/click/departments-db.h'
--- libclickscope/click/departments-db.h	2014-07-22 20:07:28 +0000
+++ libclickscope/click/departments-db.h	2014-08-21 20:38:09 +0000
@@ -66,9 +66,12 @@
 
     virtual std::string get_department_name(const std::string& department_id, const std::list<std::string>& locales);
     virtual std::unordered_set<std::string> get_packages_for_department(const std::string& department_id, bool recursive = true);
+    virtual std::string get_department_for_package(const std::string& package_id);
+    virtual bool is_empty(const std::string& department_id);
     virtual bool has_package(const std::string& package_id);
     virtual std::string get_parent_department_id(const std::string& department_id);
     virtual std::list<DepartmentInfo> get_children_departments(const std::string& department_id);
+    virtual bool is_descendant_of_department(const std::string& department_id, const std::string& parent_department_id);
 
     virtual void store_package_mapping(const std::string& package_id, const std::string& department_id);
     virtual void store_department_mapping(const std::string& department_id, const std::string& parent_department_id);
@@ -79,7 +82,7 @@
     virtual int package_count() const;
     virtual int department_name_count() const;
 
-    void store_departments(const click::DepartmentList& depts, const std::string& locale);
+    virtual void store_departments(const click::DepartmentList& depts, const std::string& locale);
 
     static std::unique_ptr<DepartmentsDb> open(bool create = true);
 
@@ -96,11 +99,14 @@
     std::unique_ptr<QSqlQuery> insert_dept_id_query_;
     std::unique_ptr<QSqlQuery> insert_dept_name_query_;
     std::unique_ptr<QSqlQuery> select_pkgs_by_dept_;
+    std::unique_ptr<QSqlQuery> select_dept_for_pkg_;
     std::unique_ptr<QSqlQuery> select_pkg_by_pkgid_;
     std::unique_ptr<QSqlQuery> select_pkgs_by_dept_recursive_;
+    std::unique_ptr<QSqlQuery> select_pkgs_count_in_dept_recursive_;
     std::unique_ptr<QSqlQuery> select_parent_dept_;
     std::unique_ptr<QSqlQuery> select_children_depts_;
     std::unique_ptr<QSqlQuery> select_dept_name_;
+    std::unique_ptr<QSqlQuery> select_is_descendant_of_dept_;
 };
 
 }

=== modified file 'libclickscope/click/download-manager.cpp'
--- libclickscope/click/download-manager.cpp	2014-06-20 03:23:40 +0000
+++ libclickscope/click/download-manager.cpp	2014-08-21 20:38:09 +0000
@@ -43,6 +43,7 @@
 
 namespace udm = Ubuntu::DownloadManager;
 #include <ubuntu/download_manager/download_struct.h>
+#include <ubuntu/download_manager/downloads_list.h>
 #include <ubuntu/download_manager/download.h>
 #include <ubuntu/download_manager/error.h>
 
@@ -54,8 +55,7 @@
 
 static const QString DOWNLOAD_COMMAND = CLICK_INSTALL_HELPER;
 
-static const QString DOWNLOAD_MANAGER_DO_NOT_HASH = "";
-static const QString DOWNLOAD_MANAGER_IGNORE_HASH_ALGORITHM = "";
+static const QString DOWNLOAD_MANAGER_SHA512 = "sha512";
 }
 
 struct click::DownloadManager::Private
@@ -78,6 +78,7 @@
     QSharedPointer<udm::Manager> systemDownloadManager;
     QSharedPointer<click::network::Reply> reply;
     QString downloadUrl;
+    QString download_sha512;
     QString package_name;
 };
 
@@ -121,7 +122,7 @@
 click::DownloadManager::~DownloadManager(){
 }
 
-void click::DownloadManager::startDownload(const QString& downloadUrl, const QString& package_name)
+void click::DownloadManager::startDownload(const QString& downloadUrl, const QString& download_sha512, const QString& package_name)
 {
     impl->package_name = package_name;
 
@@ -133,7 +134,7 @@
     QObject::connect(this, SIGNAL(clickTokenFetchError(QString)),
                      this, SLOT(handleClickTokenFetchError(QString)),
                      Qt::UniqueConnection);
-    fetchClickToken(downloadUrl);
+    fetchClickToken(downloadUrl, download_sha512);
 }
 
 void click::DownloadManager::handleClickTokenFetched(const QString& clickToken)
@@ -149,8 +150,8 @@
     headers[CLICK_TOKEN_HEADER()] = clickToken;
 
     udm::DownloadStruct downloadStruct(impl->downloadUrl,
-                                       DOWNLOAD_MANAGER_DO_NOT_HASH,
-                                       DOWNLOAD_MANAGER_IGNORE_HASH_ALGORITHM,
+                                       impl->download_sha512,
+                                       DOWNLOAD_MANAGER_SHA512,
                                        metadata,
                                        headers);
 
@@ -175,9 +176,10 @@
     }
 }
 
-void click::DownloadManager::fetchClickToken(const QString& downloadUrl)
+void click::DownloadManager::fetchClickToken(const QString& downloadUrl, const QString& download_sha512)
 {
     impl->downloadUrl = downloadUrl;
+    impl->download_sha512 = download_sha512;
     impl->updateCredentialsFromService();
 }
 
@@ -251,6 +253,12 @@
     emit clickTokenFetchError(QString("Network Error"));
 }
 
+void click::DownloadManager::getAllDownloadsWithMetadata(const QString &key, const QString &value,
+                                                         MetadataDownloadsListCb callback,
+                                                         MetadataDownloadsListCb errback)
+{
+    impl->systemDownloadManager->getAllDownloadsWithMetadata(key, value, callback, errback);
+}
 
 // Downloader
 namespace
@@ -280,9 +288,40 @@
 {
 }
 
-void click::Downloader::get_download_progress(std::string /*package_name*/, const std::function<void (std::string)>& /*callback*/)
-{
-    // TODO, unimplemented. see https://bugs.launchpad.net/ubuntu-download-manager/+bug/1277814
+click::Downloader::~Downloader()
+{
+
+}
+
+click::DownloadManager& click::Downloader::getDownloadManager()
+{
+    return downloadManagerInstance(networkAccessManager);
+}
+
+void click::Downloader::get_download_progress(std::string package_name, const std::function<void (std::string)>& callback)
+{
+    auto& dm = getDownloadManager();
+
+    dm.getAllDownloadsWithMetadata(DOWNLOAD_APP_ID_KEY, QString::fromStdString(package_name),
+       [callback, package_name](const QString& /*key*/, const QString& /*value*/, DownloadsList* downloads_list){
+        // got downloads matching metadata
+        std::string object_path;
+        auto downloads = downloads_list->downloads();
+        if (downloads.size() > 0) {
+            auto download = downloads.at(0);
+            object_path = download->id().toStdString();
+        }
+        qDebug() << "Found object path" << QString::fromStdString(object_path)
+                 << "for package" << QString::fromStdString(package_name);
+        if (downloads.size() != 1) {
+            qWarning() << "More than one download with the same object path";
+        }
+        callback(object_path);
+    }, [callback, package_name](const QString& /*key*/, const QString& /*value*/, DownloadsList* /*downloads_list*/){
+        // no downloads found
+        qDebug() << "No object path found for package" << QString::fromStdString(package_name);
+        callback("");
+    });
 }
 
 namespace
@@ -323,10 +362,10 @@
 };
 }
 
-void click::Downloader::startDownload(std::string url, std::string package_name,
+void click::Downloader::startDownload(const std::string& url, const std::string& download_sha512, const std::string& package_name,
                                       const std::function<void (std::pair<std::string, click::InstallError >)>& callback)
 {
-    qt::core::world::enter_with_task([this, callback, url, package_name] ()
+    qt::core::world::enter_with_task([this, callback, url, download_sha512, package_name] ()
     {
         auto& dm = downloadManagerInstance(networkAccessManager);
 
@@ -342,7 +381,7 @@
         QObject::connect(&dm, &click::DownloadManager::downloadError,
                          cb, &Callback::onDownloadError);
 
-        dm.startDownload(QString::fromStdString(url),
+        dm.startDownload(QString::fromStdString(url), QString::fromStdString(download_sha512),
                           QString::fromStdString(package_name));
     });
 }

=== modified file 'libclickscope/click/download-manager.h'
--- libclickscope/click/download-manager.h	2014-06-19 21:22:53 +0000
+++ libclickscope/click/download-manager.h	2014-08-21 20:38:09 +0000
@@ -63,12 +63,16 @@
                     const QSharedPointer<click::CredentialsService>& ssoService,
                     const QSharedPointer<Ubuntu::DownloadManager::Manager>& systemDownloadManager,
                     QObject *parent = 0);
+    DownloadManager();
     virtual ~DownloadManager();
 
 public slots:
-    virtual void startDownload(const QString& downloadUrl, const QString& package_name);
-    virtual void fetchClickToken(const QString& downloadUrl);
-
+    virtual void startDownload(const QString& downloadUrl, const QString& download_sha512, const QString& package_name);
+    virtual void fetchClickToken(const QString& downloadUrl, const QString& download_sha512);
+    virtual void getAllDownloadsWithMetadata(const QString& key,
+                                             const QString& value,
+                                             MetadataDownloadsListCb callback,
+                                             MetadataDownloadsListCb errback);
 signals:
 
     void credentialsNotFound();
@@ -97,9 +101,11 @@
 {
 public:
     Downloader(const QSharedPointer<click::network::AccessManager>& networkAccessManager);
-    void get_download_progress(std::string package_name, const std::function<void (std::string)>& callback);
-    void startDownload(std::string url, std::string package_name,
+    virtual void get_download_progress(std::string package_name, const std::function<void (std::string)>& callback);
+    void startDownload(const std::string& url, const std::string& download_sha512, const std::string& package_name,
                        const std::function<void (std::pair<std::string, InstallError>)>& callback);
+    virtual ~Downloader();
+    virtual click::DownloadManager& getDownloadManager();
 private:
     QSharedPointer<click::network::AccessManager> networkAccessManager;
 };

=== modified file 'libclickscope/click/interface.cpp'
--- libclickscope/click/interface.cpp	2014-07-23 16:22:19 +0000
+++ libclickscope/click/interface.cpp	2014-08-21 20:38:09 +0000
@@ -277,12 +277,13 @@
             || Interface::is_non_click_app(QString::fromStdString(filename))) {
             auto app = load_app_from_desktop(keyFile, filename);
 
+            // app from click package has non-empty name; for non-click apps use desktop filename
+            const std::string department_key = app.name.empty() ? filename : app.name;
+
             // check if apps is present in current department
             if (apply_department_filter)
             {
-                // app from click package has non-empty name; for non-click apps use desktop filename
-                const std::string key = app.name.empty() ? filename : app.name;
-                if (packages_in_department.find(key) == packages_in_department.end())
+                if (packages_in_department.find(department_key) == packages_in_department.end())
                 {
                     if (app.default_department.empty())
                     {
@@ -293,7 +294,7 @@
                     {
                         // default department not empty: check if this app is in a different
                         // department in the db (i.e. got moved from the default department);
-                        if (depts_db->has_package(key))
+                        if (depts_db->has_package(department_key))
                         {
                             // app is now in a different department
                             return;
@@ -303,12 +304,38 @@
                         {
                             return;
                         }
-
                         // else - this package is in current department
                     }
                 }
             }
 
+            //
+            // the packages_in_department set contains packages from
+            // all its subdepartments; we need to find actual department now
+            // to update app.real_department.
+            if (depts_db)
+            {
+                if (depts_db->has_package(department_key))
+                {
+                    try
+                    {
+                        app.real_department = depts_db->get_department_for_package(department_key);
+                    }
+                    catch (const std::exception &e)
+                    {
+                        qWarning() << "Failed to get department of package:" << QString::fromStdString(department_key);
+                    }
+                }
+                else
+                {
+                    app.real_department = app.default_department;
+                    if (app.real_department.empty())
+                    {
+                        qWarning() << "No default department set in the .desktop file and no entry in the database for" << QString::fromStdString(department_key);
+                    }
+                }
+            }
+
             if (search_query.empty()) {
                 result.push_back(app);
             } else {

=== modified file 'libclickscope/click/network_access_manager.cpp'
--- libclickscope/click/network_access_manager.cpp	2014-05-20 19:33:41 +0000
+++ libclickscope/click/network_access_manager.cpp	2014-08-21 20:38:09 +0000
@@ -28,6 +28,8 @@
  */
 
 #include "network_access_manager.h"
+#include <QNetworkDiskCache>
+#include <QStandardPaths>
 
 click::network::Reply::Reply(QNetworkReply* reply) : reply(reply)
 {
@@ -91,6 +93,12 @@
 QNetworkAccessManager& networkAccessManagerInstance()
 {
     static QNetworkAccessManager nam;
+    if (!nam.cache())
+    {
+        QNetworkDiskCache* cache = new QNetworkDiskCache(&nam);
+        cache->setCacheDirectory(QString("%1/unity-scope-click/network").arg(QStandardPaths::writableLocation(QStandardPaths::CacheLocation)));
+        nam.setCache(cache);
+    }
     return nam;
 }
 }

=== modified file 'libclickscope/click/package.cpp'
--- libclickscope/click/package.cpp	2014-08-05 19:00:03 +0000
+++ libclickscope/click/package.cpp	2014-08-21 20:38:09 +0000
@@ -52,6 +52,7 @@
     return lhs.package == rhs.package &&
             lhs.description == rhs.description &&
             lhs.download_url == rhs.download_url &&
+            lhs.download_sha512 == rhs.download_sha512 &&
             lhs.rating == rhs.rating &&
             // TODO: keywords should be a list of strings
             lhs.keywords == rhs.keywords &&
@@ -144,6 +145,9 @@
         }
 
         // Optional details go here.
+        if (root[JsonKeys::download_sha512].isString())
+            details.download_sha512 = root[JsonKeys::download_sha512].asString();
+
         if (root[JsonKeys::version].isString())
             details.version = root[JsonKeys::version].asString();
 
@@ -245,6 +249,7 @@
         << print_string_if_not_empty(details.package.icon_url) << ", "
         << print_string_if_not_empty(details.description) << ", "
         << print_string_if_not_empty(details.download_url) << ", "
+        << print_string_if_not_empty(details.download_sha512) << ", "
         << details.rating << ", "
         << print_string_if_not_empty(details.keywords) << ", "
         << print_string_if_not_empty(details.terms_of_service) << ", "

=== modified file 'libclickscope/click/package.h'
--- libclickscope/click/package.h	2014-08-05 22:30:30 +0000
+++ libclickscope/click/package.h	2014-08-21 20:38:09 +0000
@@ -126,6 +126,7 @@
         constexpr static const char* icon_url{"icon_url"};
         constexpr static const char* description{"description"};
         constexpr static const char* download_url{"download_url"};
+        constexpr static const char* download_sha512{"download_sha512"};
         constexpr static const char* rating{"rating"};
         constexpr static const char* keywords{"keywords"};
 
@@ -155,6 +156,7 @@
 
     std::string description;
     std::string download_url;
+    std::string download_sha512;
     double rating;
     std::string keywords;
 

=== modified file 'libclickscope/click/preview.cpp'
--- libclickscope/click/preview.cpp	2014-07-25 20:25:49 +0000
+++ libclickscope/click/preview.cpp	2014-08-21 20:38:09 +0000
@@ -55,10 +55,6 @@
 
 namespace click {
 
-const std::string PreviewStrategy::INFO_LABEL = _("Info");
-const std::string PreviewStrategy::UPDATES_LABEL = _("Updates");
-const std::string PreviewStrategy::WHATS_NEW_LABEL = _("What's new");
-
 DepartmentUpdater::DepartmentUpdater(const std::shared_ptr<click::DepartmentsDb>& depts)
     : depts(depts)
 {
@@ -95,16 +91,34 @@
 // Preview base class
 
 Preview::Preview(const unity::scopes::Result& result,
-                 const unity::scopes::ActionMetadata& metadata,
-                 const QSharedPointer<click::web::Client>& client,
-                 const QSharedPointer<click::network::AccessManager>& nam,
-                 std::shared_ptr<click::DepartmentsDb> depts)
-    : PreviewQueryBase(result, metadata)
-{
-    strategy.reset(choose_strategy(result, metadata, client, nam, depts));
-}
-
-PreviewStrategy* Preview::choose_strategy(const unity::scopes::Result &result,
+                 const unity::scopes::ActionMetadata& metadata)
+    : PreviewQueryBase(result, metadata), result(result), metadata(metadata)
+{
+}
+
+Preview::~Preview()
+{
+}
+
+void Preview::choose_strategy(const QSharedPointer<web::Client> &client,
+                              const QSharedPointer<click::network::AccessManager>& nam,
+                              std::shared_ptr<click::DepartmentsDb> depts)
+{
+    strategy.reset(build_strategy(result, metadata, client, nam, depts));
+}
+
+PreviewStrategy* Preview::build_installing(const std::string& download_url,
+                                           const std::string& download_sha512,
+                                           const unity::scopes::Result& result,
+                                           const QSharedPointer<click::web::Client>& client,
+                                           const QSharedPointer<click::network::AccessManager>& nam,
+                                           std::shared_ptr<click::DepartmentsDb> depts)
+{
+    return new InstallingPreview(download_url, download_sha512, result, client, nam, depts);
+}
+
+
+PreviewStrategy* Preview::build_strategy(const unity::scopes::Result &result,
                                           const unity::scopes::ActionMetadata &metadata,
                                           const QSharedPointer<web::Client> &client,
                                           const QSharedPointer<click::network::AccessManager>& nam,
@@ -126,22 +140,23 @@
         } else if (metadict.count("action_id") != 0  && metadict.count("download_url") != 0) {
             std::string action_id = metadict["action_id"].get_string();
             std::string download_url = metadict["download_url"].get_string();
+            std::string download_sha512 = metadict["download_sha512"].get_string();
             if (action_id == click::Preview::Actions::INSTALL_CLICK) {
-                return new InstallingPreview(download_url, result, client, nam, depts);
+                return build_installing(download_url, download_sha512, result, client, nam, depts);
             } else {
                 qWarning() << "unexpected action id " << QString::fromStdString(action_id)
                            << " given with download_url" << QString::fromStdString(download_url);
-                return new UninstalledPreview(result, client, depts);
+                return new UninstalledPreview(result, client, depts, nam);
             }
         } else if (metadict.count(click::Preview::Actions::UNINSTALL_CLICK) != 0) {
             return new UninstallConfirmationPreview(result);
         } else if (metadict.count(click::Preview::Actions::CONFIRM_UNINSTALL) != 0) {
-            return new UninstallingPreview(result, client);
+            return new UninstallingPreview(result, client, nam);
         } else if (metadict.count(click::Preview::Actions::RATED) != 0) {
             return new InstalledPreview(result, metadata, client, depts);
         } else {
             qWarning() << "preview() called with unexpected metadata. returning uninstalled preview";
-            return new UninstalledPreview(result, client, depts);
+            return new UninstalledPreview(result, client, depts, nam);
         }
     } else {
         // metadata.scope_data() is Null, so we return an appropriate "default" preview:
@@ -152,7 +167,7 @@
         if (result["installed"].get_bool() == true) {
             return new InstalledPreview(result, metadata, client, depts);
         } else {
-            return new UninstalledPreview(result, client, depts);
+            return new UninstalledPreview(result, client, depts, nam);
         }
     }
 
@@ -330,25 +345,27 @@
     if (!details.description.empty())
     {
         scopes::PreviewWidget summary("summary", "text");
-        summary.add_attribute_value("title", scopes::Variant(INFO_LABEL));
+        summary.add_attribute_value("title", scopes::Variant(_("Info")));
         summary.add_attribute_value("text", scopes::Variant(details.description));
         widgets.push_back(summary);
     }
 
-    scopes::PreviewWidget other_metadata("other_metadata", "text");
-    other_metadata.add_attribute_value("text", scopes::Variant(build_other_metadata(details)));
-    widgets.push_back(other_metadata);
-
-    scopes::PreviewWidget updates("updates", "text");
-    updates.add_attribute_value("title", scopes::Variant(UPDATES_LABEL));
-    updates.add_attribute_value("text", scopes::Variant(build_updates_table(details)));
-    widgets.push_back(updates);
-
-    scopes::PreviewWidget whats_new("whats_new", "text");
-    whats_new.add_attribute_value("title", scopes::Variant(WHATS_NEW_LABEL));
-    whats_new.add_attribute_value("text", scopes::Variant(build_whats_new(details)));
-    widgets.push_back(whats_new);
-
+    if (!details.download_url.empty())
+    {
+        scopes::PreviewWidget other_metadata("other_metadata", "text");
+        other_metadata.add_attribute_value("text", scopes::Variant(build_other_metadata(details)));
+        widgets.push_back(other_metadata);
+
+        scopes::PreviewWidget updates("updates", "text");
+        updates.add_attribute_value("title", scopes::Variant(_("Updates")));
+        updates.add_attribute_value("text", scopes::Variant(build_updates_table(details)));
+        widgets.push_back(updates);
+
+        scopes::PreviewWidget whats_new("whats_new", "text");
+        whats_new.add_attribute_value("title", scopes::Variant(_("What's new")));
+        whats_new.add_attribute_value("text", scopes::Variant(build_whats_new(details)));
+        widgets.push_back(whats_new);
+    }
     return widgets;
 }
 
@@ -447,12 +464,14 @@
 // class InstallingPreview
 
 InstallingPreview::InstallingPreview(const std::string &download_url,
+                                     const std::string &download_sha512,
                                      const unity::scopes::Result &result,
                                      const QSharedPointer<click::web::Client>& client,
                                      const QSharedPointer<click::network::AccessManager> &nam,
                                      std::shared_ptr<click::DepartmentsDb> depts)
     : PreviewStrategy(result, client), DepartmentUpdater(depts),
       download_url(download_url),
+      download_sha512(download_sha512),
       downloader(new click::Downloader(nam)),
       depts_db(depts)
 {
@@ -473,7 +492,8 @@
 
 void InstallingPreview::run(const unity::scopes::PreviewReplyProxy &reply)
 {
-    downloader->startDownload(download_url, result["name"].get_string(),
+    qDebug() << "Starting installation" << QString(download_url.c_str()) << QString(download_sha512.c_str());
+    downloader->startDownload(download_url, download_sha512, result["name"].get_string(),
             [this, reply] (std::pair<std::string, click::InstallError> rc){
               // NOTE: details not needed by fooErrorWidgets, so no need to populateDetails():
               switch (rc.second)
@@ -508,7 +528,7 @@
             });
 }
 
-scopes::PreviewWidgetList InstallingPreview::progressBarWidget(const std::string& object_path)
+scopes::PreviewWidgetList PreviewStrategy::progressBarWidget(const std::string& object_path)
 {
     scopes::PreviewWidgetList widgets;
     scopes::PreviewWidget progress("download", "progress");
@@ -789,11 +809,18 @@
 
 // class UninstalledPreview
 
+click::Downloader* UninstalledPreview::get_downloader(const QSharedPointer<click::network::AccessManager>& nam)
+{
+    static auto downloader = new click::Downloader(nam);
+    return downloader;
+}
+
 UninstalledPreview::UninstalledPreview(const unity::scopes::Result& result,
                                        const QSharedPointer<click::web::Client>& client,
-                                       const std::shared_ptr<click::DepartmentsDb>& depts)
+                                       const std::shared_ptr<click::DepartmentsDb>& depts,
+                                       const QSharedPointer<click::network::AccessManager>& nam)
     : PreviewStrategy(result, client),
-      DepartmentUpdater(depts)
+      DepartmentUpdater(depts), nam(nam)
 {
 }
 
@@ -803,11 +830,20 @@
 
 void UninstalledPreview::run(unity::scopes::PreviewReplyProxy const& reply)
 {
-qDebug() << "in UninstalledPreview::run, about to populate details";
-
+    qDebug() << "in UninstalledPreview::run, about to populate details";
     populateDetails([this, reply](const PackageDetails &details){
             store_department(details);
-            pushPackagePreviewWidgets(reply, details, uninstalledActionButtonWidgets(details));
+            std::string app_name = result["name"].get_string();
+            get_downloader(nam)->get_download_progress(app_name,
+                                              [this, reply, details](std::string object_path){
+                scopes::PreviewWidgetList button_widgets;
+                if(object_path.empty()) {
+                    button_widgets = uninstalledActionButtonWidgets(details);
+                } else {
+                    button_widgets = progressBarWidget(object_path);
+                }
+                pushPackagePreviewWidgets(reply, details, button_widgets);
+            });
         },
         [this, reply](const ReviewList& reviewlist,
                       click::Reviews::Error error) {
@@ -832,6 +868,7 @@
         tuple["price"] = scopes::Variant(details.package.price);
         tuple["store_item_id"] = details.package.name;
         tuple["download_url"] = details.download_url;
+        tuple["download_sha512"] = details.download_sha512;
         payments.add_attribute_value("source", scopes::Variant(tuple));
         widgets.push_back(payments);
     } else {
@@ -841,7 +878,8 @@
             {
                 {"id", scopes::Variant(click::Preview::Actions::INSTALL_CLICK)},
                 {"label", scopes::Variant(_("Install"))},
-                {"download_url", scopes::Variant(details.download_url)}
+                {"download_url", scopes::Variant(details.download_url)},
+                {"download_sha512", scopes::Variant(details.download_sha512)},
             });
         buttons.add_attribute_value("actions", builder.end());
         widgets.push_back(buttons);
@@ -854,10 +892,12 @@
 
 // TODO: this class should be removed once uninstall() is handled elsewhere.
 UninstallingPreview::UninstallingPreview(const unity::scopes::Result& result,
-                                         const QSharedPointer<click::web::Client>& client)
-    : UninstalledPreview(result, client, nullptr)
+                                         const QSharedPointer<click::web::Client>& client,
+                                         const QSharedPointer<click::network::AccessManager>& nam)
+      : UninstalledPreview(result, client, nullptr, nam)
 {
 }
+
 UninstallingPreview::~UninstallingPreview()
 {
 }

=== modified file 'libclickscope/click/preview.h'
--- libclickscope/click/preview.h	2014-07-24 04:25:22 +0000
+++ libclickscope/click/preview.h	2014-08-21 20:38:09 +0000
@@ -42,6 +42,7 @@
 #include <unity/scopes/PreviewWidget.h>
 #include <unity/scopes/Result.h>
 #include <unity/scopes/ScopeBase.h>
+#include <unity/util/DefinesPtrs.h>
 
 namespace scopes = unity::scopes;
 
@@ -67,12 +68,21 @@
 {
 protected:
     std::unique_ptr<PreviewStrategy> strategy;
-    PreviewStrategy* choose_strategy(const unity::scopes::Result& result,
-                                     const unity::scopes::ActionMetadata& metadata,
-                                     const QSharedPointer<web::Client> &client,
-                                     const QSharedPointer<click::network::AccessManager>& nam,
-                                     std::shared_ptr<click::DepartmentsDb> depts);
+    const unity::scopes::Result& result;
+    const unity::scopes::ActionMetadata& metadata;
+    PreviewStrategy* build_strategy(const unity::scopes::Result& result,
+                                    const unity::scopes::ActionMetadata& metadata,
+                                    const QSharedPointer<web::Client> &client,
+                                    const QSharedPointer<click::network::AccessManager>& nam,
+                                    std::shared_ptr<click::DepartmentsDb> depts);
+    virtual PreviewStrategy* build_installing(const std::string& download_url,
+                                              const std::string& download_sha512,
+                                              const unity::scopes::Result& result,
+                                              const QSharedPointer<click::web::Client>& client,
+                                              const QSharedPointer<click::network::AccessManager>& nam,
+                                              std::shared_ptr<click::DepartmentsDb> depts);
 public:
+    UNITY_DEFINES_PTRS(Preview);
     struct Actions
     {
         Actions() = delete;
@@ -94,10 +104,11 @@
 
     Preview(const unity::scopes::Result& result);
     Preview(const unity::scopes::Result& result,
-            const unity::scopes::ActionMetadata& metadata,
-            const QSharedPointer<click::web::Client>& client,
-            const QSharedPointer<click::network::AccessManager>& nam,
-            std::shared_ptr<click::DepartmentsDb> depts);
+            const unity::scopes::ActionMetadata& metadata);
+    virtual ~Preview();
+    void choose_strategy(const QSharedPointer<web::Client> &client,
+                         const QSharedPointer<click::network::AccessManager>& nam,
+                         std::shared_ptr<click::DepartmentsDb> depts);
     // From unity::scopes::PreviewQuery
     void cancelled() override;
     virtual void run(unity::scopes::PreviewReplyProxy const& reply) override;
@@ -115,9 +126,6 @@
 
     virtual void cancelled();
     virtual void run(unity::scopes::PreviewReplyProxy const& reply) = 0;
-    static const std::string INFO_LABEL;
-    static const std::string UPDATES_LABEL;
-    static const std::string WHATS_NEW_LABEL;
 protected:
     virtual void populateDetails(std::function<void(const PackageDetails &)> details_callback,
                                  std::function<void(const click::ReviewList&,
@@ -125,6 +133,7 @@
     virtual scopes::PreviewWidgetList headerWidgets(const PackageDetails &details);
     virtual scopes::PreviewWidgetList screenshotsWidgets(const PackageDetails &details);
     virtual scopes::PreviewWidgetList descriptionWidgets(const PackageDetails &details);
+    virtual scopes::PreviewWidgetList progressBarWidget(const std::string& object_path);
     virtual scopes::PreviewWidgetList reviewsWidgets(const click::ReviewList &reviewlist);
     virtual scopes::PreviewWidgetList downloadErrorWidgets();
     virtual scopes::PreviewWidgetList loginErrorWidgets();
@@ -163,7 +172,8 @@
 {
 public:
     InstallingPreview(const unity::scopes::Result& result) : PreviewStrategy(result) {}
-    InstallingPreview(std::string const& download_url,
+    InstallingPreview(const std::string& download_url,
+                      const std::string& download_sha512,
                       const unity::scopes::Result& result,
                       const QSharedPointer<click::web::Client>& client,
                       const QSharedPointer<click::network::AccessManager>& nam,
@@ -174,8 +184,8 @@
     void run(unity::scopes::PreviewReplyProxy const& reply) override;
 
 protected:
-    virtual scopes::PreviewWidgetList progressBarWidget(const std::string& object_path);
     std::string download_url;
+    std::string download_sha512;
     QSharedPointer<click::Downloader> downloader;
     std::shared_ptr<click::DepartmentsDb> depts_db;
     void startLauncherAnimation(const PackageDetails& details);
@@ -235,15 +245,18 @@
 
 class UninstalledPreview : public PreviewStrategy, public DepartmentUpdater
 {
+    const QSharedPointer<click::network::AccessManager>& nam;
 public:
     UninstalledPreview(const unity::scopes::Result& result,
                        const QSharedPointer<click::web::Client>& client,
-                       const std::shared_ptr<click::DepartmentsDb>& depts);
+                       const std::shared_ptr<click::DepartmentsDb>& depts,
+                       const QSharedPointer<click::network::AccessManager>& nam);
 
     virtual ~UninstalledPreview();
 
     void run(unity::scopes::PreviewReplyProxy const& reply) override;
 protected:
+    virtual click::Downloader* get_downloader(const QSharedPointer<click::network::AccessManager>& nam);
     virtual scopes::PreviewWidgetList uninstalledActionButtonWidgets(const PackageDetails &details);
 };
 
@@ -253,7 +266,8 @@
 {
 public:
     UninstallingPreview(const unity::scopes::Result& result,
-                        const QSharedPointer<click::web::Client>& client);
+                        const QSharedPointer<click::web::Client>& client,
+                        const QSharedPointer<click::network::AccessManager>& nam);
 
     virtual ~UninstallingPreview();
 

=== modified file 'libclickscope/click/webclient.cpp'
--- libclickscope/click/webclient.cpp	2014-06-17 13:56:26 +0000
+++ libclickscope/click/webclient.cpp	2014-08-21 20:38:09 +0000
@@ -99,6 +99,8 @@
     request->setRawHeader(ACCEPT_LANGUAGE_HEADER.c_str(),
                           Configuration().get_accept_languages().c_str());
 
+    request->setAttribute(QNetworkRequest::CacheLoadControlAttribute, QNetworkRequest::PreferCache);
+
     for (const auto& kv : headers) {
         QByteArray header_name(kv.first.c_str(), kv.first.length());
         QByteArray header_value(kv.second.c_str(), kv.second.length());
@@ -109,9 +111,11 @@
 
     auto doConnect = [=]() {
         QByteArray verb(method.c_str(), method.length());
-        auto reply = impl->network_access_manager->sendCustomRequest(*request,
-                                                                verb,
-                                                                buffer.data());
+        //
+        // for 'get' use get method of access manager explicitly as sendCustomRequest disables the use of cache.
+        auto reply = (method == "GET" && buffer->size() == 0) ?
+            impl->network_access_manager->get(*request) :
+            impl->network_access_manager->sendCustomRequest(*request, verb, buffer.data());
         responsePtr->setReply(reply);
     };
 

=== modified file 'libclickscope/tests/fake_json.cpp'
--- libclickscope/tests/fake_json.cpp	2014-08-05 19:00:03 +0000
+++ libclickscope/tests/fake_json.cpp	2014-08-21 20:38:09 +0000
@@ -194,6 +194,7 @@
         "title": "\u1F4A9 Weather",
         "description": "\u1F4A9 Weather\nA weather application.",
         "download_url": "https://public.apps.staging.ubuntu.com/download/ar.com.beuno/wheather-touch/ar.com.beuno.wheather-touch-0.2",
+        "download_sha512": "fake_sha512",
         "rating": 3.5,
         "keywords": "these, are, key, words",
 
@@ -224,6 +225,16 @@
     }
 )foo";
 
+const std::string FAKE_JSON_PACKAGE_DETAILS_DEB = R"foo(
+    {
+        "name": "weather-app",
+        "icon_url": "theme://weather-app",
+        "title": "\u1F4A9 Weather",
+        "description": "A weather application.",
+        "keywords": "these, are, key, words"
+    }
+)foo";
+
 const std::string FAKE_JSON_BOOTSTRAP = R"(
       {
           "_embedded": {

=== modified file 'libclickscope/tests/fake_json.h'
--- libclickscope/tests/fake_json.h	2014-08-05 19:00:03 +0000
+++ libclickscope/tests/fake_json.h	2014-08-21 20:38:09 +0000
@@ -39,6 +39,7 @@
 extern const std::string FAKE_JSON_SEARCH_RESULT_MANY;
 extern const std::string FAKE_JSON_SEARCH_RESULT_RECOMMENDS;
 extern const std::string FAKE_JSON_PACKAGE_DETAILS;
+extern const std::string FAKE_JSON_PACKAGE_DETAILS_DEB;
 extern const std::string FAKE_JSON_BOOTSTRAP;
 extern const std::string FAKE_JSON_BROKEN_BOOTSTRAP;
 extern const std::string FAKE_JSON_DEPARTMENTS_ONLY;

=== modified file 'libclickscope/tests/test_departments-db.cpp'
--- libclickscope/tests/test_departments-db.cpp	2014-08-05 14:16:26 +0000
+++ libclickscope/tests/test_departments-db.cpp	2014-08-21 20:38:09 +0000
@@ -53,10 +53,13 @@
         EXPECT_FALSE(insert_dept_name_query_->isActive());
         EXPECT_FALSE(select_pkgs_by_dept_->isActive());
         EXPECT_FALSE(select_pkgs_by_dept_recursive_->isActive());
+        EXPECT_FALSE(select_dept_for_pkg_->isActive());
+        EXPECT_FALSE(select_pkgs_count_in_dept_recursive_->isActive());
         EXPECT_FALSE(select_pkg_by_pkgid_->isActive());
         EXPECT_FALSE(select_parent_dept_->isActive());
         EXPECT_FALSE(select_children_depts_->isActive());
         EXPECT_FALSE(select_dept_name_->isActive());
+        EXPECT_FALSE(select_is_descendant_of_dept_->isActive());
     }
 };
 
@@ -112,6 +115,35 @@
     }
 }
 
+TEST_F(DepartmentsDbTest, testDepartmentForPackageLookup)
+{
+    EXPECT_EQ("rpg", db->get_department_for_package("game1"));
+    EXPECT_EQ("fps", db->get_department_for_package("game2"));
+    EXPECT_EQ("office", db->get_department_for_package("app2"));
+    EXPECT_EQ("tools", db->get_department_for_package("app1"));
+    EXPECT_THROW(db->get_department_for_package("foobar"), std::logic_error);
+}
+
+TEST_F(DepartmentsDbTest, testIsDepartmentEmpty)
+{
+    EXPECT_TRUE(db->is_empty("card"));
+    EXPECT_FALSE(db->is_empty(""));
+    EXPECT_FALSE(db->is_empty("games"));
+    EXPECT_FALSE(db->is_empty("office"));
+    EXPECT_FALSE(db->is_empty("tools"));
+}
+
+TEST_F(DepartmentsDbTest, testIsDescendantOfDepartment)
+{
+    EXPECT_TRUE(db->is_descendant_of_department("rpg", "games"));
+    EXPECT_TRUE(db->is_descendant_of_department("office", "tools"));
+    EXPECT_TRUE(db->is_descendant_of_department("office", ""));
+    EXPECT_TRUE(db->is_descendant_of_department("rpg", ""));
+    EXPECT_TRUE(db->is_descendant_of_department("games", ""));
+    EXPECT_FALSE(db->is_descendant_of_department("games", "office"));
+    EXPECT_FALSE(db->is_descendant_of_department("", "games"));
+}
+
 TEST_F(DepartmentsDbTest, testDepartmentNameUpdates)
 {
     {
@@ -156,10 +188,10 @@
     }
     {
         auto depts = db->get_children_departments("games");
-        EXPECT_EQ(3u, depts.size());
+        EXPECT_EQ(2u, depts.size());
         EXPECT_TRUE(std::find(depts.begin(), depts.end(), DepartmentsDb::DepartmentInfo("rpg", false)) != depts.end());
         EXPECT_TRUE(std::find(depts.begin(), depts.end(), DepartmentsDb::DepartmentInfo("fps", false)) != depts.end());
-        EXPECT_TRUE(std::find(depts.begin(), depts.end(), DepartmentsDb::DepartmentInfo("card", false)) != depts.end());
+        EXPECT_FALSE(std::find(depts.begin(), depts.end(), DepartmentsDb::DepartmentInfo("card", false)) != depts.end());
     }
 }
 

=== modified file 'libclickscope/tests/test_download_manager.cpp'
--- libclickscope/tests/test_download_manager.cpp	2014-06-19 21:22:53 +0000
+++ libclickscope/tests/test_download_manager.cpp	2014-08-21 20:38:09 +0000
@@ -47,6 +47,8 @@
 
 #include "mock_ubuntu_download_manager.h"
 
+using namespace ::testing;
+
 namespace udm = Ubuntu::DownloadManager;
 #include <ubuntu/download_manager/download_struct.h>
 
@@ -58,6 +60,7 @@
 namespace
 {
 const QString TEST_URL("http://test.local/");
+const QString TEST_SHA512("fake_hash");
 const QString TEST_HEADER_VALUE("test header value");
 const QString TEST_APP_ID("test_app_id");
 const QString TEST_CLICK_TOKEN_VALUE("test token value");
@@ -326,7 +329,7 @@
     QTimer timer;
     timer.setSingleShot(true);
     QObject::connect(&timer, &QTimer::timeout, [&dm]() {
-            dm.fetchClickToken(TEST_URL);
+            dm.fetchClickToken(TEST_URL, TEST_SHA512);
         } );
     timer.start(0);
 
@@ -382,13 +385,13 @@
 
     std::function<void()> clickTokenSignalFunc;
     if (p.clickTokenFetchSignalsError) {
-        clickTokenSignalFunc = std::function<void()>([&](){ 
+        clickTokenSignalFunc = std::function<void()>([&](){
                 dm.clickTokenFetchError(TEST_DOWNLOADERROR_STRING);
             });
         EXPECT_CALL(*mockSystemDownloadManager, createDownload(_)).Times(0);
 
     } else {
-        clickTokenSignalFunc = std::function<void()>([&](){ 
+        clickTokenSignalFunc = std::function<void()>([&](){
                 dm.clickTokenFetched(TEST_CLICK_TOKEN_VALUE);
             });
 
@@ -466,7 +469,7 @@
     QTimer timer;
     timer.setSingleShot(true);
     QObject::connect(&timer, &QTimer::timeout, [&dm]() {
-            dm.startDownload(TEST_URL, TEST_APP_ID);
+            dm.startDownload(TEST_URL, TEST_SHA512, TEST_APP_ID);
         } );
     timer.start(0);
 

=== modified file 'libclickscope/tests/test_index.cpp'
--- libclickscope/tests/test_index.cpp	2014-08-05 19:00:03 +0000
+++ libclickscope/tests/test_index.cpp	2014-08-21 20:38:09 +0000
@@ -342,6 +342,7 @@
         },
         "\u1F4A9 Weather\nA weather application.",
         "https://public.apps.staging.ubuntu.com/download/ar.com.beuno/wheather-touch/ar.com.beuno.wheather-touch-0.2",
+        "fake_sha512",
         3.5,
         "these, are, key, words",
 
@@ -407,6 +408,7 @@
         },
         (std::string("\u1F4A9 ") + std::string(appname_utf8.constData()) + "\nA weather application.").c_str(),
         "https://public.apps.staging.ubuntu.com/download/ar.com.beuno/wheather-touch/ar.com.beuno.wheather-touch-0.2",
+        "fake_sha512",
         3.5,
         "these, are, key, words",
 

=== modified file 'libclickscope/tests/test_preview.cpp'
--- libclickscope/tests/test_preview.cpp	2014-07-24 04:25:22 +0000
+++ libclickscope/tests/test_preview.cpp	2014-08-21 20:38:09 +0000
@@ -28,6 +28,7 @@
  */
 
 #include <unity/scopes/testing/MockPreviewReply.h>
+#include <unity/scopes/testing/Result.h>
 
 #include <gtest/gtest.h>
 #include <click/preview.h>
@@ -110,10 +111,8 @@
     click::PackageDetails details;
     unity::scopes::PreviewWidgetList widgets;
 
-    PreviewStrategyDescriptionTest() : details(click::PackageDetails::from_json(FAKE_JSON_PACKAGE_DETAILS))
+    PreviewStrategyDescriptionTest()
     {
-        widgets = preview.descriptionWidgets(details);
-
     }
     void assertWidgetAttribute(int n, std::string attribute_name, std::string expected_value)
     {
@@ -124,21 +123,41 @@
     }
 };
 
-TEST_F(PreviewStrategyDescriptionTest, testDescriptionWidgets)
+TEST_F(PreviewStrategyDescriptionTest, testDescriptionWidgetsFull)
 {
-    assertWidgetAttribute(0, "title", click::PreviewStrategy::INFO_LABEL);
+    details = click::PackageDetails::from_json(FAKE_JSON_PACKAGE_DETAILS);
+    widgets = preview.descriptionWidgets(details);
+
+    assertWidgetAttribute(0, "title", "Info");
     assertWidgetAttribute(0, "text", details.description);
 
     assertWidgetAttribute(1, "text", preview.build_other_metadata(details));
 
-    assertWidgetAttribute(2, "title", click::PreviewStrategy::UPDATES_LABEL);
+    assertWidgetAttribute(2, "title", "Updates");
     assertWidgetAttribute(2, "text", preview.build_updates_table(details));
 
-    assertWidgetAttribute(3, "title", click::PreviewStrategy::WHATS_NEW_LABEL);
+    assertWidgetAttribute(3, "title", "What's new");
     assertWidgetAttribute(3, "text", preview.build_whats_new(details));
 
 }
 
+TEST_F(PreviewStrategyDescriptionTest, testDescriptionWidgetsMinimal)
+{
+    details = click::PackageDetails::from_json(FAKE_JSON_PACKAGE_DETAILS_DEB);
+    widgets = preview.descriptionWidgets(details);
+
+    ASSERT_EQ(1, widgets.size());
+
+    assertWidgetAttribute(0, "title", "Info");
+    assertWidgetAttribute(0, "text", details.description);
+}
+
+TEST_F(PreviewStrategyDescriptionTest, testDescriptionWidgetsNone)
+{
+    widgets = preview.descriptionWidgets(details);
+    ASSERT_EQ(0, widgets.size());
+}
+
 class FakePreviewStrategy :  public click::PreviewStrategy
 {
 public:
@@ -171,3 +190,119 @@
     std::vector<std::string> expected_order {"header", "screenshots"};
     ASSERT_EQ(expected_order, preview.call_order);
 }
+
+class StrategyChooserTest : public Test {
+protected:
+    unity::scopes::testing::Result result;
+    unity::scopes::ActionMetadata metadata;
+    unity::scopes::VariantMap metadict;
+    QSharedPointer<click::web::Client> client;
+    QSharedPointer<click::network::AccessManager> nam;
+    std::shared_ptr<click::DepartmentsDb> depts;
+    const std::string FAKE_SHA512 = "FAKE_SHA512";
+
+public:
+    StrategyChooserTest() : metadata("en_EN", "phone") {
+    }
+};
+
+class MockablePreview : public click::Preview {
+public:
+    MockablePreview(const unity::scopes::Result& result, const unity::scopes::ActionMetadata& metadata) :
+        click::Preview(result, metadata)
+    {
+
+    }
+
+    MOCK_METHOD6(build_installing, click::PreviewStrategy*(const std::string&, const std::string&,
+                const unity::scopes::Result&, const QSharedPointer<click::web::Client>&,
+                const QSharedPointer<click::network::AccessManager>&, std::shared_ptr<click::DepartmentsDb>));
+};
+
+TEST_F(StrategyChooserTest, testSha512IsUsed) {
+    metadict["action_id"] = click::Preview::Actions::INSTALL_CLICK;
+    metadict["download_url"] = "fake_download_url";
+    metadict["download_sha512"] = FAKE_SHA512;
+    metadata.set_scope_data(unity::scopes::Variant(metadict));
+    MockablePreview preview(result, metadata);
+    EXPECT_CALL(preview, build_installing(_, FAKE_SHA512, _, _, _, _));
+    preview.choose_strategy(client, nam, depts);
+}
+
+
+class UninstalledPreviewTest : public PreviewsBaseTest {
+public:
+    FakeResult result{vm};
+    click::PackageDetails details;
+    unity::scopes::PreviewWidgetList widgets;
+    QSharedPointer<click::web::Client> client;
+    QSharedPointer<click::network::AccessManager> nam;
+    std::shared_ptr<click::DepartmentsDb> depts;
+    unity::scopes::testing::MockPreviewReply reply;
+    std::shared_ptr<unity::scopes::testing::MockPreviewReply> replyptr{&reply, [](unity::scopes::testing::MockPreviewReply*){}};
+};
+
+class FakeDownloader : public click::Downloader {
+    std::string object_path;
+public:
+    FakeDownloader(const std::string& object_path, const QSharedPointer<click::network::AccessManager>& networkAccessManager)
+        : click::Downloader(networkAccessManager), object_path(object_path)
+    {
+
+    }
+    void get_download_progress(std::string /*package_name*/, const std::function<void (std::string)> &callback)
+    {
+        callback(object_path);
+    }
+};
+
+class FakeUninstalledPreview : public click::UninstalledPreview {
+    std::string object_path;
+public:
+    FakeUninstalledPreview(const std::string& object_path,
+                           const unity::scopes::Result& result,
+                           const QSharedPointer<click::web::Client>& client,
+                           const std::shared_ptr<click::DepartmentsDb>& depts,
+                           const QSharedPointer<click::network::AccessManager>& nam)
+        : click::UninstalledPreview(result, client, depts, nam), object_path(object_path)
+    {
+
+    }
+
+    virtual click::Downloader* get_downloader(const QSharedPointer<click::network::AccessManager> &nam)
+    {
+        return new FakeDownloader(object_path, nam);
+    }
+
+    void populateDetails(std::function<void (const click::PackageDetails &)> details_callback,
+                         std::function<void (const click::ReviewList &, click::Reviews::Error)> /*reviews_callback*/) {
+        click::PackageDetails details;
+        details_callback(details);
+    }
+    MOCK_METHOD1(uninstalledActionButtonWidgets, scopes::PreviewWidgetList (const click::PackageDetails &details));
+    MOCK_METHOD1(progressBarWidget, scopes::PreviewWidgetList(const std::string& object_path));
+};
+
+TEST_F(UninstalledPreviewTest, testDownloadInProgress) {
+    std::string fake_object_path = "/fake/object/path";
+
+    result["name"] = "fake_app_name";
+    scopes::PreviewWidgetList response;
+    FakeUninstalledPreview preview(fake_object_path, result, client, depts, nam);
+    EXPECT_CALL(preview, progressBarWidget(_))
+            .Times(1)
+            .WillOnce(Return(response));
+    preview.run(replyptr);
+}
+
+TEST_F(UninstalledPreviewTest, testNoDownloadProgress) {
+    std::string fake_object_path = "";
+
+    result["name"] = "fake_app_name";
+    scopes::PreviewWidgetList response;
+    FakeUninstalledPreview preview(fake_object_path, result, client, depts, nam);
+    EXPECT_CALL(preview, uninstalledActionButtonWidgets(_))
+            .Times(1)
+            .WillOnce(Return(response));
+    preview.run(replyptr);
+}

=== modified file 'libclickscope/tests/test_webclient.cpp'
--- libclickscope/tests/test_webclient.cpp	2014-05-23 18:45:01 +0000
+++ libclickscope/tests/test_webclient.cpp	2014-08-21 20:38:09 +0000
@@ -95,7 +95,7 @@
 
     click::web::Client wc(namPtr);
 
-    EXPECT_CALL(nam, sendCustomRequest(IsCorrectUrl(QString("http://fake-server/fake/api/path")), _, _))
+    EXPECT_CALL(nam, get(IsCorrectUrl(QString("http://fake-server/fake/api/path"))))
             .Times(1)
             .WillOnce(Return(replyPtr));
 
@@ -116,7 +116,7 @@
     params.add("a", "1");
     params.add("b", "2");
 
-    EXPECT_CALL(nam, sendCustomRequest(IsCorrectUrl(QString("http://fake-server/fake/api/path?a=1&b=2")), _, _))
+    EXPECT_CALL(nam, get(IsCorrectUrl(QString("http://fake-server/fake/api/path?a=1&b=2"))))
             .Times(1)
             .WillOnce(Return(replyPtr));
 
@@ -163,7 +163,7 @@
 
     click::web::Client wc(namPtr);
 
-    EXPECT_CALL(nam, sendCustomRequest(IsCorrectCookieHeader("CookieCookieCookie"), _, _))
+    EXPECT_CALL(nam, get(IsCorrectCookieHeader("CookieCookieCookie")))
             .Times(1)
             .WillOnce(Return(replyPtr));
 
@@ -287,7 +287,7 @@
 
     click::web::Client wc(namPtr);
 
-    EXPECT_CALL(nam, sendCustomRequest(_, _, _))
+    EXPECT_CALL(nam, get(_))
             .Times(1)
             .WillOnce(Return(replyPtr));
 
@@ -306,7 +306,7 @@
 
     click::web::Client wc(namPtr);
 
-    EXPECT_CALL(nam, sendCustomRequest(_, _, _))
+    EXPECT_CALL(nam, get(_))
             .Times(1)
             .WillOnce(Return(replyPtr));
     EXPECT_CALL(*reply, errorString())
@@ -335,7 +335,7 @@
 
     click::web::Client wc(namPtr);
 
-    EXPECT_CALL(nam, sendCustomRequest(_, _, _))
+    EXPECT_CALL(nam, get(_))
             .Times(1)
             .WillOnce(Return(replyPtr));
 
@@ -357,7 +357,7 @@
 
     ASSERT_EQ(setenv(click::Configuration::LANGUAGE_ENVVAR,
                      "en_US.UTF-8", 1), 0);
-    EXPECT_CALL(nam, sendCustomRequest(IsCorrectAcceptLanguageHeader("en-US, en"), _, _))
+    EXPECT_CALL(nam, get(IsCorrectAcceptLanguageHeader("en-US, en")))
             .Times(1)
             .WillOnce(Return(replyPtr));
 

=== modified file 'po/am.po'
--- po/am.po	2014-08-06 23:12:02 +0000
+++ po/am.po	2014-08-21 20:38:09 +0000
@@ -6,21 +6,20 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: unity-scope-click\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-07-28 17:25-0400\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2014-08-19 17:19-0400\n"
 "PO-Revision-Date: 2014-08-04 20:24+0000\n"
 "Last-Translator: samson <Unknown>\n"
 "Language-Team: Amharic <[e-mail]>\n"
-"Language: am\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n > 1;\n"
-"X-Launchpad-Export-Date: 2014-08-05 06:47+0000\n"
-"X-Generator: Launchpad (build 17147)\n"
+"X-Launchpad-Export-Date: 2014-08-20 06:26+0000\n"
+"X-Generator: Launchpad (build 17163)\n"
 
 #: ../data/com.canonical.scopes.clickstore.ini.in.in.h:1
-#: ../scope/clickapps/apps-query.cpp:259
+#: ../scope/clickapps/apps-query.cpp:261
 msgid "Ubuntu Store"
 msgstr "የ ኡቡንቱ ሱቅ"
 
@@ -32,7 +31,8 @@
 msgid "Search store"
 msgstr "ሱቅ መፈለጊያ"
 
-#: ../data/clickscope.ini.in.in.h:1 ../scope/clickapps/apps-query.cpp:157
+#: ../data/clickscope.ini.in.in.h:1 ../libclickscope/click/highlights.cpp:116
+#: ../scope/clickapps/apps-query.cpp:159
 msgid "Apps"
 msgstr "መተግበሪያዎች"
 
@@ -44,6 +44,10 @@
 msgid "Search apps"
 msgstr "መተግበሪያ መፈለጊያ"
 
+#: ../libclickscope/click/highlights.cpp:119
+msgid "Scopes"
+msgstr ""
+
 #: ../libclickscope/click/preview.cpp:58
 msgid "Info"
 msgstr "መረጃ"
@@ -56,104 +60,104 @@
 msgid "What's new"
 msgstr "ምን አዲስ ነገር አለ"
 
-#: ../libclickscope/click/preview.cpp:210
+#: ../libclickscope/click/preview.cpp:229
 msgid "Publisher/Creator"
 msgstr "አታሚው/ፈጣሪው"
 
-#: ../libclickscope/click/preview.cpp:211
+#: ../libclickscope/click/preview.cpp:230
 msgid "Seller"
 msgstr "ሻጩ"
 
-#: ../libclickscope/click/preview.cpp:212
+#: ../libclickscope/click/preview.cpp:231
 msgid "Website"
 msgstr "ድህረ ገጽ"
 
-#: ../libclickscope/click/preview.cpp:213
+#: ../libclickscope/click/preview.cpp:232
 msgid "Contact"
 msgstr "ግንኙነት"
 
-#: ../libclickscope/click/preview.cpp:214
+#: ../libclickscope/click/preview.cpp:233
 msgid "License"
 msgstr "ፍቃድ"
 
-#: ../libclickscope/click/preview.cpp:222
+#: ../libclickscope/click/preview.cpp:241
 msgid "Version number"
 msgstr "የእትም ቁጥር"
 
-#: ../libclickscope/click/preview.cpp:223
+#: ../libclickscope/click/preview.cpp:242
 msgid "Last updated"
 msgstr "መጨረሻ የተሻሻለው"
 
-#: ../libclickscope/click/preview.cpp:224
+#: ../libclickscope/click/preview.cpp:243
 msgid "First released"
 msgstr "መጀመሪያ የተለቀቀው"
 
-#: ../libclickscope/click/preview.cpp:225
+#: ../libclickscope/click/preview.cpp:244
 msgid "Size"
 msgstr "መጠን"
 
-#: ../libclickscope/click/preview.cpp:233
+#: ../libclickscope/click/preview.cpp:252
 msgid "Version"
 msgstr "እትም"
 
-#: ../libclickscope/click/preview.cpp:364
+#: ../libclickscope/click/preview.cpp:383
 msgid "Reviews"
 msgstr "ግምገማው"
 
-#: ../libclickscope/click/preview.cpp:383
+#: ../libclickscope/click/preview.cpp:402
 msgid "Download Error"
 msgstr "የማውረድ ስህተት"
 
-#: ../libclickscope/click/preview.cpp:384
+#: ../libclickscope/click/preview.cpp:403
 msgid "Download or install failed. Please try again."
 msgstr "ማውረድ ወይንም መግጠም አልተሳካም፡ እባክዎን እንደገና ይሞክሩ"
 
 #. TODO see bug LP: #1289434
-#: ../libclickscope/click/preview.cpp:386
+#: ../libclickscope/click/preview.cpp:405
 msgid "Close"
 msgstr "መዝጊያ"
 
-#: ../libclickscope/click/preview.cpp:391
+#: ../libclickscope/click/preview.cpp:410
 msgid "Login Error"
 msgstr "የመግቢያ ስህተት"
 
-#: ../libclickscope/click/preview.cpp:392
+#: ../libclickscope/click/preview.cpp:411
 msgid "Please log in to your Ubuntu One account."
 msgstr "እባክዎን ወደ ኡቡንቱ ዋን መግለጫዎ ይግቡ"
 
-#: ../libclickscope/click/preview.cpp:394
+#: ../libclickscope/click/preview.cpp:413
 msgid "Go to Accounts"
 msgstr "ወደ መግለጫ መሄጃ"
 
-#: ../libclickscope/click/preview.cpp:624
+#: ../libclickscope/click/preview.cpp:646
 msgid "Open"
 msgstr "መክፈቻ"
 
-#: ../libclickscope/click/preview.cpp:627
-#: ../libclickscope/click/preview.cpp:711
+#: ../libclickscope/click/preview.cpp:649
+#: ../libclickscope/click/preview.cpp:733
 msgid "Search"
 msgstr "መፈለጊያ"
 
-#: ../libclickscope/click/preview.cpp:645
-#: ../libclickscope/click/preview.cpp:782
+#: ../libclickscope/click/preview.cpp:667
+#: ../libclickscope/click/preview.cpp:804
 msgid "Uninstall"
 msgstr "ማጥፊያ"
 
-#: ../libclickscope/click/preview.cpp:766
+#: ../libclickscope/click/preview.cpp:788
 msgid "Confirmation"
 msgstr "ማረጋገጫ"
 
 #. TRANSLATORS: Do NOT translate ${title} here.
-#: ../libclickscope/click/preview.cpp:769
+#: ../libclickscope/click/preview.cpp:791
 msgid "Uninstall ${title}?"
 msgstr "ማጥፊያ ${title}?"
 
 #. TODO: see bug LP: #1289434
-#: ../libclickscope/click/preview.cpp:778
+#: ../libclickscope/click/preview.cpp:800
 msgid "Cancel"
 msgstr "መሰረዣ"
 
-#: ../libclickscope/click/preview.cpp:843
+#: ../libclickscope/click/preview.cpp:866
 msgid "Install"
 msgstr "መግጠሚያ"
 
@@ -163,48 +167,49 @@
 msgstr[0] "{1} ባይት"
 msgstr[1] "{1} ባይትስ"
 
-#: ../scope/clickapps/apps-query.cpp:260
+#: ../scope/clickapps/apps-query.cpp:262
 msgid "Get more apps from the store"
 msgstr "ተጨማሪ መተግበሪያ በ ሱቅ ውስጥ መፈለጊያ"
 
-#: ../scope/clickapps/apps-query.cpp:266
+#: ../scope/clickapps/apps-query.cpp:268
 #, c-format
 msgid "Search for '%s' in the store"
 msgstr "መፈለጊያ በ  '%s' ሱቅ ውስጥ"
 
-#: ../scope/clickapps/apps-query.cpp:273
+#: ../scope/clickapps/apps-query.cpp:275
 msgid "Get more apps like this from the Store"
 msgstr "እንደዚህ ያለ ተጨማሪ መተግበሪያ በ ሱቅ ውስጥ መፈለጊያ"
 
-#: ../scope/clickapps/apps-query.cpp:302
-#: ../scope/clickstore/store-query.cpp:236
-#: ../scope/clickstore/store-query.cpp:247
-msgid "All departments"
-msgstr "በ ሁሉም ክፍሎች ውስጥ"
+#: ../scope/clickapps/apps-query.cpp:315
+#: ../scope/clickstore/store-query.cpp:244
+#: ../scope/clickstore/store-query.cpp:255
+#: ../scope/clickstore/store-query.cpp:467
+msgid "All"
+msgstr ""
 
-#: ../scope/clickstore/store-query.cpp:285
+#: ../scope/clickstore/store-query.cpp:297
 msgid "✔ INSTALLED"
 msgstr "✔ ተገጥሟል"
 
-#: ../scope/clickstore/store-query.cpp:290
+#: ../scope/clickstore/store-query.cpp:302
 msgid "✔ PURCHASED"
 msgstr "✔ ተገዝቷል"
 
-#: ../scope/clickstore/store-query.cpp:298
+#: ../scope/clickstore/store-query.cpp:310
 msgid "FREE"
 msgstr "ነፃ"
 
-#: ../scope/clickstore/store-query.cpp:415
+#: ../scope/clickstore/store-query.cpp:427
 msgid "Available"
 msgstr "ዝግጁ"
 
-#: ../scope/clickstore/store-query.cpp:421
+#: ../scope/clickstore/store-query.cpp:433
 #, c-format
 msgid "%u result in Ubuntu Store"
 msgid_plural "%u results in Ubuntu Store"
 msgstr[0] "%u ውጤት ከ ኡቡንቱ ሱቅ ውስጥ"
 msgstr[1] "%u ውጤቶች ከ ኡቡንቱ ሱቅ ውስጥ"
 
-#: ../scope/clickstore/store-query.cpp:431
+#: ../scope/clickstore/store-query.cpp:443
 msgid "Recommended"
 msgstr "የተጠቆመው"

=== modified file 'po/ar.po'
--- po/ar.po	2014-07-30 07:11:20 +0000
+++ po/ar.po	2014-08-21 20:38:09 +0000
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: unity-scope-click\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2014-07-28 17:25-0400\n"
+"POT-Creation-Date: 2014-08-19 17:19-0400\n"
 "PO-Revision-Date: 2014-05-16 23:33+0000\n"
 "Last-Translator: Ibrahim Saed <[e-mail]>\n"
 "Language-Team: Arabic <[e-mail]>\n"
@@ -16,11 +16,11 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n % 100 >= "
 "3 && n % 100 <= 10 ? 3 : n % 100 >= 11 && n % 100 <= 99 ? 4 : 5;\n"
-"X-Launchpad-Export-Date: 2014-07-30 07:10+0000\n"
-"X-Generator: Launchpad (build 17131)\n"
+"X-Launchpad-Export-Date: 2014-08-20 06:26+0000\n"
+"X-Generator: Launchpad (build 17163)\n"
 
 #: ../data/com.canonical.scopes.clickstore.ini.in.in.h:1
-#: ../scope/clickapps/apps-query.cpp:259
+#: ../scope/clickapps/apps-query.cpp:261
 msgid "Ubuntu Store"
 msgstr ""
 
@@ -32,7 +32,8 @@
 msgid "Search store"
 msgstr ""
 
-#: ../data/clickscope.ini.in.in.h:1 ../scope/clickapps/apps-query.cpp:157
+#: ../data/clickscope.ini.in.in.h:1 ../libclickscope/click/highlights.cpp:116
+#: ../scope/clickapps/apps-query.cpp:159
 msgid "Apps"
 msgstr "التطبيقات"
 
@@ -44,6 +45,10 @@
 msgid "Search apps"
 msgstr ""
 
+#: ../libclickscope/click/highlights.cpp:119
+msgid "Scopes"
+msgstr ""
+
 #: ../libclickscope/click/preview.cpp:58
 msgid "Info"
 msgstr ""
@@ -56,104 +61,104 @@
 msgid "What's new"
 msgstr ""
 
-#: ../libclickscope/click/preview.cpp:210
+#: ../libclickscope/click/preview.cpp:229
 msgid "Publisher/Creator"
 msgstr ""
 
-#: ../libclickscope/click/preview.cpp:211
+#: ../libclickscope/click/preview.cpp:230
 msgid "Seller"
 msgstr ""
 
-#: ../libclickscope/click/preview.cpp:212
+#: ../libclickscope/click/preview.cpp:231
 msgid "Website"
 msgstr ""
 
-#: ../libclickscope/click/preview.cpp:213
+#: ../libclickscope/click/preview.cpp:232
 msgid "Contact"
 msgstr ""
 
-#: ../libclickscope/click/preview.cpp:214
+#: ../libclickscope/click/preview.cpp:233
 msgid "License"
 msgstr ""
 
-#: ../libclickscope/click/preview.cpp:222
+#: ../libclickscope/click/preview.cpp:241
 msgid "Version number"
 msgstr ""
 
-#: ../libclickscope/click/preview.cpp:223
+#: ../libclickscope/click/preview.cpp:242
 msgid "Last updated"
 msgstr ""
 
-#: ../libclickscope/click/preview.cpp:224
+#: ../libclickscope/click/preview.cpp:243
 msgid "First released"
 msgstr ""
 
-#: ../libclickscope/click/preview.cpp:225
+#: ../libclickscope/click/preview.cpp:244
 msgid "Size"
 msgstr ""
 
-#: ../libclickscope/click/preview.cpp:233
+#: ../libclickscope/click/preview.cpp:252
 msgid "Version"
 msgstr ""
 
-#: ../libclickscope/click/preview.cpp:364
+#: ../libclickscope/click/preview.cpp:383
 msgid "Reviews"
 msgstr ""
 
-#: ../libclickscope/click/preview.cpp:383
+#: ../libclickscope/click/preview.cpp:402
 msgid "Download Error"
 msgstr "خطأ في التنزيل"
 
-#: ../libclickscope/click/preview.cpp:384
+#: ../libclickscope/click/preview.cpp:403
 msgid "Download or install failed. Please try again."
 msgstr "فشل في التنزيل أو التثبيت. يرجى المحاولة مجددًا."
 
 #. TODO see bug LP: #1289434
-#: ../libclickscope/click/preview.cpp:386
+#: ../libclickscope/click/preview.cpp:405
 msgid "Close"
 msgstr "إغلاق"
 
-#: ../libclickscope/click/preview.cpp:391
+#: ../libclickscope/click/preview.cpp:410
 msgid "Login Error"
 msgstr "خطأ في الولوج"
 
-#: ../libclickscope/click/preview.cpp:392
+#: ../libclickscope/click/preview.cpp:411
 msgid "Please log in to your Ubuntu One account."
 msgstr "يرجى الولوج إلى حساب أوبونتو ون خاصتك."
 
-#: ../libclickscope/click/preview.cpp:394
+#: ../libclickscope/click/preview.cpp:413
 msgid "Go to Accounts"
 msgstr "انتقل إلى الحسابات"
 
-#: ../libclickscope/click/preview.cpp:624
+#: ../libclickscope/click/preview.cpp:646
 msgid "Open"
 msgstr "فتح"
 
-#: ../libclickscope/click/preview.cpp:627
-#: ../libclickscope/click/preview.cpp:711
+#: ../libclickscope/click/preview.cpp:649
+#: ../libclickscope/click/preview.cpp:733
 msgid "Search"
 msgstr ""
 
-#: ../libclickscope/click/preview.cpp:645
-#: ../libclickscope/click/preview.cpp:782
+#: ../libclickscope/click/preview.cpp:667
+#: ../libclickscope/click/preview.cpp:804
 msgid "Uninstall"
 msgstr "إزالة التثبيت"
 
-#: ../libclickscope/click/preview.cpp:766
+#: ../libclickscope/click/preview.cpp:788
 msgid "Confirmation"
 msgstr "التأكيد"
 
 #. TRANSLATORS: Do NOT translate ${title} here.
-#: ../libclickscope/click/preview.cpp:769
+#: ../libclickscope/click/preview.cpp:791
 msgid "Uninstall ${title}?"
 msgstr "إزالة تثبيت ${title}؟"
 
 #. TODO: see bug LP: #1289434
-#: ../libclickscope/click/preview.cpp:778
+#: ../libclickscope/click/preview.cpp:800
 msgid "Cancel"
 msgstr "إلغاء"
 
-#: ../libclickscope/click/preview.cpp:843
+#: ../libclickscope/click/preview.cpp:866
 msgid "Install"
 msgstr "تثبيت"
 
@@ -163,48 +168,49 @@
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../scope/clickapps/apps-query.cpp:260
+#: ../scope/clickapps/apps-query.cpp:262
 msgid "Get more apps from the store"
 msgstr ""
 
-#: ../scope/clickapps/apps-query.cpp:266
+#: ../scope/clickapps/apps-query.cpp:268
 #, c-format
 msgid "Search for '%s' in the store"
 msgstr ""
 
-#: ../scope/clickapps/apps-query.cpp:273
+#: ../scope/clickapps/apps-query.cpp:275
 msgid "Get more apps like this from the Store"
 msgstr ""
 
-#: ../scope/clickapps/apps-query.cpp:302
-#: ../scope/clickstore/store-query.cpp:236
-#: ../scope/clickstore/store-query.cpp:247
-msgid "All departments"
+#: ../scope/clickapps/apps-query.cpp:315
+#: ../scope/clickstore/store-query.cpp:244
+#: ../scope/clickstore/store-query.cpp:255
+#: ../scope/clickstore/store-query.cpp:467
+msgid "All"
 msgstr ""
 
-#: ../scope/clickstore/store-query.cpp:285
+#: ../scope/clickstore/store-query.cpp:297
 msgid "✔ INSTALLED"
 msgstr ""
 
-#: ../scope/clickstore/store-query.cpp:290
+#: ../scope/clickstore/store-query.cpp:302
 msgid "✔ PURCHASED"
 msgstr ""
 
-#: ../scope/clickstore/store-query.cpp:298
+#: ../scope/clickstore/store-query.cpp:310
 msgid "FREE"
 msgstr ""
 
-#: ../scope/clickstore/store-query.cpp:415
+#: ../scope/clickstore/store-query.cpp:427
 msgid "Available"
 msgstr "متوفر"
 
-#: ../scope/clickstore/store-query.cpp:421
+#: ../scope/clickstore/store-query.cpp:433
 #, c-format
 msgid "%u result in Ubuntu Store"
 msgid_plural "%u results in Ubuntu Store"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../scope/clickstore/store-query.cpp:431
+#: ../scope/clickstore/store-query.cpp:443
 msgid "Recommended"
 msgstr ""

=== modified file 'po/ast.po'
--- po/ast.po	2014-08-02 06:42:45 +0000
+++ po/ast.po	2014-08-21 20:38:09 +0000
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: unity-scope-click\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2014-07-28 17:25-0400\n"
+"POT-Creation-Date: 2014-08-19 17:19-0400\n"
 "PO-Revision-Date: 2014-08-01 07:56+0000\n"
 "Last-Translator: ivarela <[e-mail]>\n"
 "Language-Team: Asturian <[e-mail]>\n"
@@ -15,11 +15,11 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2014-08-02 06:42+0000\n"
-"X-Generator: Launchpad (build 17147)\n"
+"X-Launchpad-Export-Date: 2014-08-20 06:26+0000\n"
+"X-Generator: Launchpad (build 17163)\n"
 
 #: ../data/com.canonical.scopes.clickstore.ini.in.in.h:1
-#: ../scope/clickapps/apps-query.cpp:259
+#: ../scope/clickapps/apps-query.cpp:261
 msgid "Ubuntu Store"
 msgstr "Tienda Ubuntu"
 
@@ -31,7 +31,8 @@
 msgid "Search store"
 msgstr "Guetar na tienda"
 
-#: ../data/clickscope.ini.in.in.h:1 ../scope/clickapps/apps-query.cpp:157
+#: ../data/clickscope.ini.in.in.h:1 ../libclickscope/click/highlights.cpp:116
+#: ../scope/clickapps/apps-query.cpp:159
 msgid "Apps"
 msgstr "Apps"
 
@@ -43,6 +44,10 @@
 msgid "Search apps"
 msgstr "Guetar apps"
 
+#: ../libclickscope/click/highlights.cpp:119
+msgid "Scopes"
+msgstr ""
+
 #: ../libclickscope/click/preview.cpp:58
 msgid "Info"
 msgstr "Info"
@@ -55,104 +60,104 @@
 msgid "What's new"
 msgstr "Qué hai nuevo"
 
-#: ../libclickscope/click/preview.cpp:210
+#: ../libclickscope/click/preview.cpp:229
 msgid "Publisher/Creator"
 msgstr "Espublizador/Creador"
 
-#: ../libclickscope/click/preview.cpp:211
+#: ../libclickscope/click/preview.cpp:230
 msgid "Seller"
 msgstr "Vendedor"
 
-#: ../libclickscope/click/preview.cpp:212
+#: ../libclickscope/click/preview.cpp:231
 msgid "Website"
 msgstr "Sitiu web"
 
-#: ../libclickscope/click/preview.cpp:213
+#: ../libclickscope/click/preview.cpp:232
 msgid "Contact"
 msgstr "Contautu"
 
-#: ../libclickscope/click/preview.cpp:214
+#: ../libclickscope/click/preview.cpp:233
 msgid "License"
 msgstr "Llicencia"
 
-#: ../libclickscope/click/preview.cpp:222
+#: ../libclickscope/click/preview.cpp:241
 msgid "Version number"
 msgstr "Númberu de versión"
 
-#: ../libclickscope/click/preview.cpp:223
+#: ../libclickscope/click/preview.cpp:242
 msgid "Last updated"
 msgstr "Caberu anovamientu"
 
-#: ../libclickscope/click/preview.cpp:224
+#: ../libclickscope/click/preview.cpp:243
 msgid "First released"
 msgstr "Primera espublización"
 
-#: ../libclickscope/click/preview.cpp:225
+#: ../libclickscope/click/preview.cpp:244
 msgid "Size"
 msgstr "Tamañu"
 
-#: ../libclickscope/click/preview.cpp:233
+#: ../libclickscope/click/preview.cpp:252
 msgid "Version"
 msgstr "Versión"
 
-#: ../libclickscope/click/preview.cpp:364
+#: ../libclickscope/click/preview.cpp:383
 msgid "Reviews"
 msgstr "Revisiones"
 
-#: ../libclickscope/click/preview.cpp:383
+#: ../libclickscope/click/preview.cpp:402
 msgid "Download Error"
 msgstr "Fallu de descarga"
 
-#: ../libclickscope/click/preview.cpp:384
+#: ../libclickscope/click/preview.cpp:403
 msgid "Download or install failed. Please try again."
 msgstr "La descarga o la instalación fallaron. Inténtalo de nueves."
 
 #. TODO see bug LP: #1289434
-#: ../libclickscope/click/preview.cpp:386
+#: ../libclickscope/click/preview.cpp:405
 msgid "Close"
 msgstr "Zarrar"
 
-#: ../libclickscope/click/preview.cpp:391
+#: ../libclickscope/click/preview.cpp:410
 msgid "Login Error"
 msgstr "Fallu de rexistru"
 
-#: ../libclickscope/click/preview.cpp:392
+#: ../libclickscope/click/preview.cpp:411
 msgid "Please log in to your Ubuntu One account."
 msgstr "Accedi a la to cuenta d'Ubuntu One."
 
-#: ../libclickscope/click/preview.cpp:394
+#: ../libclickscope/click/preview.cpp:413
 msgid "Go to Accounts"
 msgstr "Dir a Cuentes"
 
-#: ../libclickscope/click/preview.cpp:624
+#: ../libclickscope/click/preview.cpp:646
 msgid "Open"
 msgstr "Abrir"
 
-#: ../libclickscope/click/preview.cpp:627
-#: ../libclickscope/click/preview.cpp:711
+#: ../libclickscope/click/preview.cpp:649
+#: ../libclickscope/click/preview.cpp:733
 msgid "Search"
 msgstr "Guetar"
 
-#: ../libclickscope/click/preview.cpp:645
-#: ../libclickscope/click/preview.cpp:782
+#: ../libclickscope/click/preview.cpp:667
+#: ../libclickscope/click/preview.cpp:804
 msgid "Uninstall"
 msgstr "Desinstalar"
 
-#: ../libclickscope/click/preview.cpp:766
+#: ../libclickscope/click/preview.cpp:788
 msgid "Confirmation"
 msgstr "Confirmación"
 
 #. TRANSLATORS: Do NOT translate ${title} here.
-#: ../libclickscope/click/preview.cpp:769
+#: ../libclickscope/click/preview.cpp:791
 msgid "Uninstall ${title}?"
 msgstr "Desinstalar ${title}?"
 
 #. TODO: see bug LP: #1289434
-#: ../libclickscope/click/preview.cpp:778
+#: ../libclickscope/click/preview.cpp:800
 msgid "Cancel"
 msgstr "Encaboxar"
 
-#: ../libclickscope/click/preview.cpp:843
+#: ../libclickscope/click/preview.cpp:866
 msgid "Install"
 msgstr "Instalar"
 
@@ -162,48 +167,49 @@
 msgstr[0] "{1} byte"
 msgstr[1] "{1} bytes"
 
-#: ../scope/clickapps/apps-query.cpp:260
+#: ../scope/clickapps/apps-query.cpp:262
 msgid "Get more apps from the store"
 msgstr "Consigui más aplicaciones na tienda"
 
-#: ../scope/clickapps/apps-query.cpp:266
+#: ../scope/clickapps/apps-query.cpp:268
 #, c-format
 msgid "Search for '%s' in the store"
 msgstr "Guetar «%s» na tienda"
 
-#: ../scope/clickapps/apps-query.cpp:273
+#: ../scope/clickapps/apps-query.cpp:275
 msgid "Get more apps like this from the Store"
 msgstr "Más aplicaciones como esta na Tienda"
 
-#: ../scope/clickapps/apps-query.cpp:302
-#: ../scope/clickstore/store-query.cpp:236
-#: ../scope/clickstore/store-query.cpp:247
-msgid "All departments"
-msgstr "Tolos departamentos"
+#: ../scope/clickapps/apps-query.cpp:315
+#: ../scope/clickstore/store-query.cpp:244
+#: ../scope/clickstore/store-query.cpp:255
+#: ../scope/clickstore/store-query.cpp:467
+msgid "All"
+msgstr ""
 
-#: ../scope/clickstore/store-query.cpp:285
+#: ../scope/clickstore/store-query.cpp:297
 msgid "✔ INSTALLED"
 msgstr "✔ INSTALÓSE"
 
-#: ../scope/clickstore/store-query.cpp:290
+#: ../scope/clickstore/store-query.cpp:302
 msgid "✔ PURCHASED"
 msgstr "✔ MERCADA"
 
-#: ../scope/clickstore/store-query.cpp:298
+#: ../scope/clickstore/store-query.cpp:310
 msgid "FREE"
 msgstr "LLIBRE"
 
-#: ../scope/clickstore/store-query.cpp:415
+#: ../scope/clickstore/store-query.cpp:427
 msgid "Available"
 msgstr "Disponible"
 
-#: ../scope/clickstore/store-query.cpp:421
+#: ../scope/clickstore/store-query.cpp:433
 #, c-format
 msgid "%u result in Ubuntu Store"
 msgid_plural "%u results in Ubuntu Store"
 msgstr[0] "%u resultáu na Tienda d'Ubuntu"
 msgstr[1] "%u resultaos na Tienda d'Ubuntu"
 
-#: ../scope/clickstore/store-query.cpp:431
+#: ../scope/clickstore/store-query.cpp:443
 msgid "Recommended"
 msgstr "Recomendaes"

=== modified file 'po/br.po'
--- po/br.po	2014-07-30 07:11:20 +0000
+++ po/br.po	2014-08-21 20:38:09 +0000
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: unity-scope-click\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2014-07-28 17:25-0400\n"
+"POT-Creation-Date: 2014-08-19 17:19-0400\n"
 "PO-Revision-Date: 2014-07-25 06:55+0000\n"
 "Last-Translator: Fohanno Thierry <[e-mail]>\n"
 "Language-Team: Breton <[e-mail]>\n"
@@ -15,11 +15,11 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n > 1;\n"
-"X-Launchpad-Export-Date: 2014-07-30 07:10+0000\n"
-"X-Generator: Launchpad (build 17131)\n"
+"X-Launchpad-Export-Date: 2014-08-20 06:26+0000\n"
+"X-Generator: Launchpad (build 17163)\n"
 
 #: ../data/com.canonical.scopes.clickstore.ini.in.in.h:1
-#: ../scope/clickapps/apps-query.cpp:259
+#: ../scope/clickapps/apps-query.cpp:261
 msgid "Ubuntu Store"
 msgstr "Stal Ubuntu"
 
@@ -31,7 +31,8 @@
 msgid "Search store"
 msgstr ""
 
-#: ../data/clickscope.ini.in.in.h:1 ../scope/clickapps/apps-query.cpp:157
+#: ../data/clickscope.ini.in.in.h:1 ../libclickscope/click/highlights.cpp:116
+#: ../scope/clickapps/apps-query.cpp:159
 msgid "Apps"
 msgstr "Arloadoù"
 
@@ -43,6 +44,10 @@
 msgid "Search apps"
 msgstr ""
 
+#: ../libclickscope/click/highlights.cpp:119
+msgid "Scopes"
+msgstr ""
+
 #: ../libclickscope/click/preview.cpp:58
 msgid "Info"
 msgstr ""
@@ -55,104 +60,104 @@
 msgid "What's new"
 msgstr ""
 
-#: ../libclickscope/click/preview.cpp:210
+#: ../libclickscope/click/preview.cpp:229
 msgid "Publisher/Creator"
 msgstr ""
 
-#: ../libclickscope/click/preview.cpp:211
+#: ../libclickscope/click/preview.cpp:230
 msgid "Seller"
 msgstr ""
 
-#: ../libclickscope/click/preview.cpp:212
+#: ../libclickscope/click/preview.cpp:231
 msgid "Website"
 msgstr ""
 
-#: ../libclickscope/click/preview.cpp:213
+#: ../libclickscope/click/preview.cpp:232
 msgid "Contact"
 msgstr ""
 
-#: ../libclickscope/click/preview.cpp:214
+#: ../libclickscope/click/preview.cpp:233
 msgid "License"
 msgstr ""
 
-#: ../libclickscope/click/preview.cpp:222
+#: ../libclickscope/click/preview.cpp:241
 msgid "Version number"
 msgstr ""
 
-#: ../libclickscope/click/preview.cpp:223
+#: ../libclickscope/click/preview.cpp:242
 msgid "Last updated"
 msgstr ""
 
-#: ../libclickscope/click/preview.cpp:224
+#: ../libclickscope/click/preview.cpp:243
 msgid "First released"
 msgstr ""
 
-#: ../libclickscope/click/preview.cpp:225
+#: ../libclickscope/click/preview.cpp:244
 msgid "Size"
 msgstr ""
 
-#: ../libclickscope/click/preview.cpp:233
+#: ../libclickscope/click/preview.cpp:252
 msgid "Version"
 msgstr ""
 
-#: ../libclickscope/click/preview.cpp:364
+#: ../libclickscope/click/preview.cpp:383
 msgid "Reviews"
 msgstr ""
 
-#: ../libclickscope/click/preview.cpp:383
+#: ../libclickscope/click/preview.cpp:402
 msgid "Download Error"
 msgstr "Fazi pellgargañ"
 
-#: ../libclickscope/click/preview.cpp:384
+#: ../libclickscope/click/preview.cpp:403
 msgid "Download or install failed. Please try again."
 msgstr "C'hwitet eo ar pellgargañ pe ar staliañ. Esaeit en-dro, mar plij."
 
 #. TODO see bug LP: #1289434
-#: ../libclickscope/click/preview.cpp:386
+#: ../libclickscope/click/preview.cpp:405
 msgid "Close"
 msgstr "Serriñ"
 
-#: ../libclickscope/click/preview.cpp:391
+#: ../libclickscope/click/preview.cpp:410
 msgid "Login Error"
 msgstr "Fazi kevreañ"
 
-#: ../libclickscope/click/preview.cpp:392
+#: ../libclickscope/click/preview.cpp:411
 msgid "Please log in to your Ubuntu One account."
 msgstr "Kevreit ouzh ho kont Ubuntu One, mar plij."
 
-#: ../libclickscope/click/preview.cpp:394
+#: ../libclickscope/click/preview.cpp:413
 msgid "Go to Accounts"
 msgstr "Mont d'ar c'hontoù."
 
-#: ../libclickscope/click/preview.cpp:624
+#: ../libclickscope/click/preview.cpp:646
 msgid "Open"
 msgstr "Digeriñ"
 
-#: ../libclickscope/click/preview.cpp:627
-#: ../libclickscope/click/preview.cpp:711
+#: ../libclickscope/click/preview.cpp:649
+#: ../libclickscope/click/preview.cpp:733
 msgid "Search"
 msgstr "Klask"
 
-#: ../libclickscope/click/preview.cpp:645
-#: ../libclickscope/click/preview.cpp:782
+#: ../libclickscope/click/preview.cpp:667
+#: ../libclickscope/click/preview.cpp:804
 msgid "Uninstall"
 msgstr "Distaliañ"
 
-#: ../libclickscope/click/preview.cpp:766
+#: ../libclickscope/click/preview.cpp:788
 msgid "Confirmation"
 msgstr "Kadarnadur"
 
 #. TRANSLATORS: Do NOT translate ${title} here.
-#: ../libclickscope/click/preview.cpp:769
+#: ../libclickscope/click/preview.cpp:791
 msgid "Uninstall ${title}?"
 msgstr "Distaliañ ${title} ?"
 
 #. TODO: see bug LP: #1289434
-#: ../libclickscope/click/preview.cpp:778
+#: ../libclickscope/click/preview.cpp:800
 msgid "Cancel"
 msgstr "Nullañ"
 
-#: ../libclickscope/click/preview.cpp:843
+#: ../libclickscope/click/preview.cpp:866
 msgid "Install"
 msgstr "Staliañ"
 
@@ -162,48 +167,49 @@
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../scope/clickapps/apps-query.cpp:260
+#: ../scope/clickapps/apps-query.cpp:262
 msgid "Get more apps from the store"
 msgstr "Tapout muioc'h a arloadoù er stal"
 
-#: ../scope/clickapps/apps-query.cpp:266
+#: ../scope/clickapps/apps-query.cpp:268
 #, c-format
 msgid "Search for '%s' in the store"
 msgstr "Klask '%s' er stal"
 
-#: ../scope/clickapps/apps-query.cpp:273
+#: ../scope/clickapps/apps-query.cpp:275
 msgid "Get more apps like this from the Store"
 msgstr "Tapout muioc'h a arloadoù evel hemañ er Stal"
 
-#: ../scope/clickapps/apps-query.cpp:302
-#: ../scope/clickstore/store-query.cpp:236
-#: ../scope/clickstore/store-query.cpp:247
-msgid "All departments"
-msgstr "An holl rannoù"
+#: ../scope/clickapps/apps-query.cpp:315
+#: ../scope/clickstore/store-query.cpp:244
+#: ../scope/clickstore/store-query.cpp:255
+#: ../scope/clickstore/store-query.cpp:467
+msgid "All"
+msgstr ""
 
-#: ../scope/clickstore/store-query.cpp:285
+#: ../scope/clickstore/store-query.cpp:297
 msgid "✔ INSTALLED"
 msgstr "✔ STALIET"
 
-#: ../scope/clickstore/store-query.cpp:290
+#: ../scope/clickstore/store-query.cpp:302
 msgid "✔ PURCHASED"
 msgstr "PRENET"
 
-#: ../scope/clickstore/store-query.cpp:298
+#: ../scope/clickstore/store-query.cpp:310
 msgid "FREE"
 msgstr "DIGOUST"
 
-#: ../scope/clickstore/store-query.cpp:415
+#: ../scope/clickstore/store-query.cpp:427
 msgid "Available"
 msgstr "A c'haller kaout"
 
-#: ../scope/clickstore/store-query.cpp:421
+#: ../scope/clickstore/store-query.cpp:433
 #, c-format
 msgid "%u result in Ubuntu Store"
 msgid_plural "%u results in Ubuntu Store"
 msgstr[0] "%u disoc'h e stal Ubuntu"
 msgstr[1] "%u results in Ubuntu Store"
 
-#: ../scope/clickstore/store-query.cpp:431
+#: ../scope/clickstore/store-query.cpp:443
 msgid "Recommended"
 msgstr "Erbedet"

=== modified file 'po/ca.po'
--- po/ca.po	2014-07-31 08:14:29 +0000
+++ po/ca.po	2014-08-21 20:38:09 +0000
@@ -7,19 +7,19 @@
 msgstr ""
 "Project-Id-Version: unity-scope-click\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2014-07-28 17:25-0400\n"
-"PO-Revision-Date: 2014-07-30 12:09+0000\n"
-"Last-Translator: David Planella <[e-mail]>\n"
+"POT-Creation-Date: 2014-08-19 17:19-0400\n"
+"PO-Revision-Date: 2014-08-17 03:57+0000\n"
+"Last-Translator: Adolfo Jayme <[e-mail]>\n"
 "Language-Team: Catalan <[e-mail]>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2014-07-31 08:14+0000\n"
-"X-Generator: Launchpad (build 17131)\n"
+"X-Launchpad-Export-Date: 2014-08-20 06:26+0000\n"
+"X-Generator: Launchpad (build 17163)\n"
 
 #: ../data/com.canonical.scopes.clickstore.ini.in.in.h:1
-#: ../scope/clickapps/apps-query.cpp:259
+#: ../scope/clickapps/apps-query.cpp:261
 msgid "Ubuntu Store"
 msgstr "Botiga de l'Ubuntu"
 
@@ -31,7 +31,8 @@
 msgid "Search store"
 msgstr "Cerca a la botiga"
 
-#: ../data/clickscope.ini.in.in.h:1 ../scope/clickapps/apps-query.cpp:157
+#: ../data/clickscope.ini.in.in.h:1 ../libclickscope/click/highlights.cpp:116
+#: ../scope/clickapps/apps-query.cpp:159
 msgid "Apps"
 msgstr "Aplicacions"
 
@@ -43,6 +44,10 @@
 msgid "Search apps"
 msgstr "Cerca aplicacions"
 
+#: ../libclickscope/click/highlights.cpp:119
+msgid "Scopes"
+msgstr ""
+
 #: ../libclickscope/click/preview.cpp:58
 msgid "Info"
 msgstr "Informació"
@@ -55,155 +60,156 @@
 msgid "What's new"
 msgstr "Novetats"
 
-#: ../libclickscope/click/preview.cpp:210
+#: ../libclickscope/click/preview.cpp:229
 msgid "Publisher/Creator"
 msgstr "Creador"
 
-#: ../libclickscope/click/preview.cpp:211
+#: ../libclickscope/click/preview.cpp:230
 msgid "Seller"
 msgstr "Venedor"
 
-#: ../libclickscope/click/preview.cpp:212
+#: ../libclickscope/click/preview.cpp:231
 msgid "Website"
 msgstr "Lloc web"
 
-#: ../libclickscope/click/preview.cpp:213
+#: ../libclickscope/click/preview.cpp:232
 msgid "Contact"
 msgstr "Contacte"
 
-#: ../libclickscope/click/preview.cpp:214
+#: ../libclickscope/click/preview.cpp:233
 msgid "License"
 msgstr "Llicència"
 
-#: ../libclickscope/click/preview.cpp:222
+#: ../libclickscope/click/preview.cpp:241
 msgid "Version number"
-msgstr ""
+msgstr "Número de versió"
 
-#: ../libclickscope/click/preview.cpp:223
+#: ../libclickscope/click/preview.cpp:242
 msgid "Last updated"
-msgstr ""
+msgstr "Darrera actualització"
 
-#: ../libclickscope/click/preview.cpp:224
+#: ../libclickscope/click/preview.cpp:243
 msgid "First released"
-msgstr ""
+msgstr "Primera publicació"
 
-#: ../libclickscope/click/preview.cpp:225
+#: ../libclickscope/click/preview.cpp:244
 msgid "Size"
-msgstr ""
+msgstr "Mida"
 
-#: ../libclickscope/click/preview.cpp:233
+#: ../libclickscope/click/preview.cpp:252
 msgid "Version"
-msgstr ""
+msgstr "Versió"
 
-#: ../libclickscope/click/preview.cpp:364
+#: ../libclickscope/click/preview.cpp:383
 msgid "Reviews"
-msgstr ""
+msgstr "Ressenyes"
 
-#: ../libclickscope/click/preview.cpp:383
+#: ../libclickscope/click/preview.cpp:402
 msgid "Download Error"
 msgstr "Error de baixada"
 
-#: ../libclickscope/click/preview.cpp:384
+#: ../libclickscope/click/preview.cpp:403
 msgid "Download or install failed. Please try again."
 msgstr "Ha fallat la baixada o la instal·lació. Torneu-ho a provar."
 
 #. TODO see bug LP: #1289434
-#: ../libclickscope/click/preview.cpp:386
+#: ../libclickscope/click/preview.cpp:405
 msgid "Close"
 msgstr "Tanca"
 
-#: ../libclickscope/click/preview.cpp:391
+#: ../libclickscope/click/preview.cpp:410
 msgid "Login Error"
 msgstr "Error d'inici de sessió"
 
-#: ../libclickscope/click/preview.cpp:392
+#: ../libclickscope/click/preview.cpp:411
 msgid "Please log in to your Ubuntu One account."
 msgstr "Inicieu la sessió amb el vostre compte de l'Ubuntu One."
 
-#: ../libclickscope/click/preview.cpp:394
+#: ../libclickscope/click/preview.cpp:413
 msgid "Go to Accounts"
 msgstr "Vés als comptes"
 
-#: ../libclickscope/click/preview.cpp:624
+#: ../libclickscope/click/preview.cpp:646
 msgid "Open"
 msgstr "Obre-la"
 
-#: ../libclickscope/click/preview.cpp:627
-#: ../libclickscope/click/preview.cpp:711
+#: ../libclickscope/click/preview.cpp:649
+#: ../libclickscope/click/preview.cpp:733
 msgid "Search"
 msgstr "Cerca"
 
-#: ../libclickscope/click/preview.cpp:645
-#: ../libclickscope/click/preview.cpp:782
+#: ../libclickscope/click/preview.cpp:667
+#: ../libclickscope/click/preview.cpp:804
 msgid "Uninstall"
 msgstr "Suprimeix-la"
 
-#: ../libclickscope/click/preview.cpp:766
+#: ../libclickscope/click/preview.cpp:788
 msgid "Confirmation"
 msgstr "Confirmació"
 
 #. TRANSLATORS: Do NOT translate ${title} here.
-#: ../libclickscope/click/preview.cpp:769
+#: ../libclickscope/click/preview.cpp:791
 msgid "Uninstall ${title}?"
 msgstr "Voleu suprimir ${title}?"
 
 #. TODO: see bug LP: #1289434
-#: ../libclickscope/click/preview.cpp:778
+#: ../libclickscope/click/preview.cpp:800
 msgid "Cancel"
 msgstr "Cancel·la"
 
-#: ../libclickscope/click/preview.cpp:843
+#: ../libclickscope/click/preview.cpp:866
 msgid "Install"
 msgstr "Instal·la-la"
 
 #: ../libclickscope/click/utils.cpp:54
 msgid "{1} byte"
 msgid_plural "{1} bytes"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "{1} byte"
+msgstr[1] "{1} bytes"
 
-#: ../scope/clickapps/apps-query.cpp:260
+#: ../scope/clickapps/apps-query.cpp:262
 msgid "Get more apps from the store"
 msgstr "Obtén més aplicacions a la botiga"
 
-#: ../scope/clickapps/apps-query.cpp:266
+#: ../scope/clickapps/apps-query.cpp:268
 #, c-format
 msgid "Search for '%s' in the store"
 msgstr "Cerca «%s» a la botiga"
 
-#: ../scope/clickapps/apps-query.cpp:273
+#: ../scope/clickapps/apps-query.cpp:275
 msgid "Get more apps like this from the Store"
 msgstr "Obtén aplicacions similars de la botiga de l'Ubuntu"
 
-#: ../scope/clickapps/apps-query.cpp:302
-#: ../scope/clickstore/store-query.cpp:236
-#: ../scope/clickstore/store-query.cpp:247
-msgid "All departments"
-msgstr "Tots els departaments"
+#: ../scope/clickapps/apps-query.cpp:315
+#: ../scope/clickstore/store-query.cpp:244
+#: ../scope/clickstore/store-query.cpp:255
+#: ../scope/clickstore/store-query.cpp:467
+msgid "All"
+msgstr ""
 
-#: ../scope/clickstore/store-query.cpp:285
+#: ../scope/clickstore/store-query.cpp:297
 msgid "✔ INSTALLED"
 msgstr "✔ INSTAL·LADA"
 
-#: ../scope/clickstore/store-query.cpp:290
+#: ../scope/clickstore/store-query.cpp:302
 msgid "✔ PURCHASED"
 msgstr "✔ COMPRADA"
 
-#: ../scope/clickstore/store-query.cpp:298
+#: ../scope/clickstore/store-query.cpp:310
 msgid "FREE"
 msgstr "GRATUÏTA"
 
-#: ../scope/clickstore/store-query.cpp:415
+#: ../scope/clickstore/store-query.cpp:427
 msgid "Available"
 msgstr "Disponibles"
 
-#: ../scope/clickstore/store-query.cpp:421
+#: ../scope/clickstore/store-query.cpp:433
 #, c-format
 msgid "%u result in Ubuntu Store"
 msgid_plural "%u results in Ubuntu Store"
 msgstr[0] "%u resultat a la botiga de l'Ubuntu"
 msgstr[1] "%u resultats a la botiga de l'Ubuntu"
 
-#: ../scope/clickstore/store-query.cpp:431
+#: ../scope/clickstore/store-query.cpp:443
 msgid "Recommended"
 msgstr "Recomanades"

=== modified file 'po/da.po'
--- po/da.po	2014-07-31 08:14:29 +0000
+++ po/da.po	2014-08-21 20:38:09 +0000
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: unity-scope-click\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2014-07-28 17:25-0400\n"
+"POT-Creation-Date: 2014-08-19 17:19-0400\n"
 "PO-Revision-Date: 2014-07-30 16:53+0000\n"
 "Last-Translator: Ask Hjorth Larsen <[e-mail]>\n"
 "Language-Team: Danish <[e-mail]>\n"
@@ -16,11 +16,11 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2014-07-31 08:14+0000\n"
-"X-Generator: Launchpad (build 17131)\n"
+"X-Launchpad-Export-Date: 2014-08-20 06:26+0000\n"
+"X-Generator: Launchpad (build 17163)\n"
 
 #: ../data/com.canonical.scopes.clickstore.ini.in.in.h:1
-#: ../scope/clickapps/apps-query.cpp:259
+#: ../scope/clickapps/apps-query.cpp:261
 msgid "Ubuntu Store"
 msgstr "Ubuntu-butikken"
 
@@ -32,7 +32,8 @@
 msgid "Search store"
 msgstr "Søg i butikken"
 
-#: ../data/clickscope.ini.in.in.h:1 ../scope/clickapps/apps-query.cpp:157
+#: ../data/clickscope.ini.in.in.h:1 ../libclickscope/click/highlights.cpp:116
+#: ../scope/clickapps/apps-query.cpp:159
 msgid "Apps"
 msgstr "Apps"
 
@@ -44,6 +45,10 @@
 msgid "Search apps"
 msgstr "Søg efter apps"
 
+#: ../libclickscope/click/highlights.cpp:119
+msgid "Scopes"
+msgstr ""
+
 #: ../libclickscope/click/preview.cpp:58
 msgid "Info"
 msgstr "Info"
@@ -56,104 +61,104 @@
 msgid "What's new"
 msgstr "Nyheder"
 
-#: ../libclickscope/click/preview.cpp:210
+#: ../libclickscope/click/preview.cpp:229
 msgid "Publisher/Creator"
 msgstr "Udgiver/forfatter"
 
-#: ../libclickscope/click/preview.cpp:211
+#: ../libclickscope/click/preview.cpp:230
 msgid "Seller"
 msgstr "Sælger"
 
-#: ../libclickscope/click/preview.cpp:212
+#: ../libclickscope/click/preview.cpp:231
 msgid "Website"
 msgstr "Websted"
 
-#: ../libclickscope/click/preview.cpp:213
+#: ../libclickscope/click/preview.cpp:232
 msgid "Contact"
 msgstr "Kontaktperson"
 
-#: ../libclickscope/click/preview.cpp:214
+#: ../libclickscope/click/preview.cpp:233
 msgid "License"
 msgstr "Licens"
 
-#: ../libclickscope/click/preview.cpp:222
+#: ../libclickscope/click/preview.cpp:241
 msgid "Version number"
 msgstr "Versionsnummer"
 
-#: ../libclickscope/click/preview.cpp:223
+#: ../libclickscope/click/preview.cpp:242
 msgid "Last updated"
 msgstr "Sidst opdateret"
 
-#: ../libclickscope/click/preview.cpp:224
+#: ../libclickscope/click/preview.cpp:243
 msgid "First released"
 msgstr "Først udgivet"
 
-#: ../libclickscope/click/preview.cpp:225
+#: ../libclickscope/click/preview.cpp:244
 msgid "Size"
 msgstr "Størrelse"
 
-#: ../libclickscope/click/preview.cpp:233
+#: ../libclickscope/click/preview.cpp:252
 msgid "Version"
 msgstr "Version"
 
-#: ../libclickscope/click/preview.cpp:364
+#: ../libclickscope/click/preview.cpp:383
 msgid "Reviews"
 msgstr "Anmeldelser"
 
-#: ../libclickscope/click/preview.cpp:383
+#: ../libclickscope/click/preview.cpp:402
 msgid "Download Error"
 msgstr "Overførselsfejl"
 
-#: ../libclickscope/click/preview.cpp:384
+#: ../libclickscope/click/preview.cpp:403
 msgid "Download or install failed. Please try again."
 msgstr "Overførsel eller installation mislykkedes. Prøv venligst igen."
 
 #. TODO see bug LP: #1289434
-#: ../libclickscope/click/preview.cpp:386
+#: ../libclickscope/click/preview.cpp:405
 msgid "Close"
 msgstr "Luk"
 
-#: ../libclickscope/click/preview.cpp:391
+#: ../libclickscope/click/preview.cpp:410
 msgid "Login Error"
 msgstr "Logindfejl"
 
-#: ../libclickscope/click/preview.cpp:392
+#: ../libclickscope/click/preview.cpp:411
 msgid "Please log in to your Ubuntu One account."
 msgstr "Log venligst ind med din Ubuntu One-konto."
 
-#: ../libclickscope/click/preview.cpp:394
+#: ../libclickscope/click/preview.cpp:413
 msgid "Go to Accounts"
 msgstr "Gå til konti"
 
-#: ../libclickscope/click/preview.cpp:624
+#: ../libclickscope/click/preview.cpp:646
 msgid "Open"
 msgstr "Åbn"
 
-#: ../libclickscope/click/preview.cpp:627
-#: ../libclickscope/click/preview.cpp:711
+#: ../libclickscope/click/preview.cpp:649
+#: ../libclickscope/click/preview.cpp:733
 msgid "Search"
 msgstr "Søg"
 
-#: ../libclickscope/click/preview.cpp:645
-#: ../libclickscope/click/preview.cpp:782
+#: ../libclickscope/click/preview.cpp:667
+#: ../libclickscope/click/preview.cpp:804
 msgid "Uninstall"
 msgstr "Afinstallér"
 
-#: ../libclickscope/click/preview.cpp:766
+#: ../libclickscope/click/preview.cpp:788
 msgid "Confirmation"
 msgstr "Bekræftelse"
 
 #. TRANSLATORS: Do NOT translate ${title} here.
-#: ../libclickscope/click/preview.cpp:769
+#: ../libclickscope/click/preview.cpp:791
 msgid "Uninstall ${title}?"
 msgstr "Afinstaller ${title}?"
 
 #. TODO: see bug LP: #1289434
-#: ../libclickscope/click/preview.cpp:778
+#: ../libclickscope/click/preview.cpp:800
 msgid "Cancel"
 msgstr "Annullér"
 
-#: ../libclickscope/click/preview.cpp:843
+#: ../libclickscope/click/preview.cpp:866
 msgid "Install"
 msgstr "Installér"
 
@@ -163,48 +168,49 @@
 msgstr[0] "{1} byte"
 msgstr[1] "{1} byte"
 
-#: ../scope/clickapps/apps-query.cpp:260
+#: ../scope/clickapps/apps-query.cpp:262
 msgid "Get more apps from the store"
 msgstr "Hent flere apps fra butikken"
 
-#: ../scope/clickapps/apps-query.cpp:266
+#: ../scope/clickapps/apps-query.cpp:268
 #, c-format
 msgid "Search for '%s' in the store"
 msgstr "Søg efter \"%s\" i butikken"
 
-#: ../scope/clickapps/apps-query.cpp:273
+#: ../scope/clickapps/apps-query.cpp:275
 msgid "Get more apps like this from the Store"
 msgstr "Find flere apps som denne fra butikken"
 
-#: ../scope/clickapps/apps-query.cpp:302
-#: ../scope/clickstore/store-query.cpp:236
-#: ../scope/clickstore/store-query.cpp:247
-msgid "All departments"
-msgstr "Alle afdelinger"
+#: ../scope/clickapps/apps-query.cpp:315
+#: ../scope/clickstore/store-query.cpp:244
+#: ../scope/clickstore/store-query.cpp:255
+#: ../scope/clickstore/store-query.cpp:467
+msgid "All"
+msgstr ""
 
-#: ../scope/clickstore/store-query.cpp:285
+#: ../scope/clickstore/store-query.cpp:297
 msgid "✔ INSTALLED"
 msgstr "✔ INSTALLERET"
 
-#: ../scope/clickstore/store-query.cpp:290
+#: ../scope/clickstore/store-query.cpp:302
 msgid "✔ PURCHASED"
 msgstr "✔ KØBT"
 
-#: ../scope/clickstore/store-query.cpp:298
+#: ../scope/clickstore/store-query.cpp:310
 msgid "FREE"
 msgstr "GRATIS"
 
-#: ../scope/clickstore/store-query.cpp:415
+#: ../scope/clickstore/store-query.cpp:427
 msgid "Available"
 msgstr "Tilgængelig"
 
-#: ../scope/clickstore/store-query.cpp:421
+#: ../scope/clickstore/store-query.cpp:433
 #, c-format
 msgid "%u result in Ubuntu Store"
 msgid_plural "%u results in Ubuntu Store"
 msgstr[0] "%u resultat i Ubuntu-butikken"
 msgstr[1] "%u resultater i Ubuntu-butikken"
 
-#: ../scope/clickstore/store-query.cpp:431
+#: ../scope/clickstore/store-query.cpp:443
 msgid "Recommended"
 msgstr "Anbefalet"

=== modified file 'po/de.po'
--- po/de.po	2014-07-30 07:11:20 +0000
+++ po/de.po	2014-08-21 20:38:09 +0000
@@ -7,19 +7,19 @@
 msgstr ""
 "Project-Id-Version: unity-scope-click\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2014-07-28 17:25-0400\n"
-"PO-Revision-Date: 2014-07-16 13:21+0000\n"
+"POT-Creation-Date: 2014-08-19 17:19-0400\n"
+"PO-Revision-Date: 2014-08-17 18:03+0000\n"
 "Last-Translator: Phillip Sz <Unknown>\n"
 "Language-Team: German <[e-mail]>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2014-07-30 07:10+0000\n"
-"X-Generator: Launchpad (build 17131)\n"
+"X-Launchpad-Export-Date: 2014-08-20 06:26+0000\n"
+"X-Generator: Launchpad (build 17163)\n"
 
 #: ../data/com.canonical.scopes.clickstore.ini.in.in.h:1
-#: ../scope/clickapps/apps-query.cpp:259
+#: ../scope/clickapps/apps-query.cpp:261
 msgid "Ubuntu Store"
 msgstr "Ubuntu Store"
 
@@ -29,9 +29,10 @@
 
 #: ../data/com.canonical.scopes.clickstore.ini.in.in.h:3
 msgid "Search store"
-msgstr ""
+msgstr "Store durchsuchen"
 
-#: ../data/clickscope.ini.in.in.h:1 ../scope/clickapps/apps-query.cpp:157
+#: ../data/clickscope.ini.in.in.h:1 ../libclickscope/click/highlights.cpp:116
+#: ../scope/clickapps/apps-query.cpp:159
 msgid "Apps"
 msgstr "Anwendungen"
 
@@ -41,120 +42,124 @@
 
 #: ../data/clickscope.ini.in.in.h:3
 msgid "Search apps"
+msgstr "Apps suchen"
+
+#: ../libclickscope/click/highlights.cpp:119
+msgid "Scopes"
 msgstr ""
 
 #: ../libclickscope/click/preview.cpp:58
 msgid "Info"
-msgstr ""
+msgstr "Info"
 
 #: ../libclickscope/click/preview.cpp:59
 msgid "Updates"
-msgstr ""
+msgstr "Aktualisierungen"
 
 #: ../libclickscope/click/preview.cpp:60
 msgid "What's new"
-msgstr ""
+msgstr "Was ist neu"
 
-#: ../libclickscope/click/preview.cpp:210
+#: ../libclickscope/click/preview.cpp:229
 msgid "Publisher/Creator"
 msgstr ""
 
-#: ../libclickscope/click/preview.cpp:211
+#: ../libclickscope/click/preview.cpp:230
 msgid "Seller"
-msgstr ""
+msgstr "Verkäufer"
 
-#: ../libclickscope/click/preview.cpp:212
+#: ../libclickscope/click/preview.cpp:231
 msgid "Website"
-msgstr ""
+msgstr "Webseite"
 
-#: ../libclickscope/click/preview.cpp:213
+#: ../libclickscope/click/preview.cpp:232
 msgid "Contact"
-msgstr ""
+msgstr "Kontakt"
 
-#: ../libclickscope/click/preview.cpp:214
+#: ../libclickscope/click/preview.cpp:233
 msgid "License"
-msgstr ""
+msgstr "Lizenz"
 
-#: ../libclickscope/click/preview.cpp:222
+#: ../libclickscope/click/preview.cpp:241
 msgid "Version number"
-msgstr ""
+msgstr "Versionsnummer"
 
-#: ../libclickscope/click/preview.cpp:223
+#: ../libclickscope/click/preview.cpp:242
 msgid "Last updated"
-msgstr ""
+msgstr "Letzte Aktualisierung"
 
-#: ../libclickscope/click/preview.cpp:224
+#: ../libclickscope/click/preview.cpp:243
 msgid "First released"
 msgstr ""
 
-#: ../libclickscope/click/preview.cpp:225
+#: ../libclickscope/click/preview.cpp:244
 msgid "Size"
-msgstr ""
+msgstr "Größe"
 
-#: ../libclickscope/click/preview.cpp:233
+#: ../libclickscope/click/preview.cpp:252
 msgid "Version"
-msgstr ""
+msgstr "Version"
 
-#: ../libclickscope/click/preview.cpp:364
+#: ../libclickscope/click/preview.cpp:383
 msgid "Reviews"
-msgstr ""
+msgstr "Bewertungen"
 
-#: ../libclickscope/click/preview.cpp:383
+#: ../libclickscope/click/preview.cpp:402
 msgid "Download Error"
 msgstr "Fehler beim Herunterladen"
 
-#: ../libclickscope/click/preview.cpp:384
+#: ../libclickscope/click/preview.cpp:403
 msgid "Download or install failed. Please try again."
 msgstr ""
 "Herunterladen oder installieren ist fehlgeschlagen. Bitte versuchen Sie es "
 "erneut."
 
 #. TODO see bug LP: #1289434
-#: ../libclickscope/click/preview.cpp:386
+#: ../libclickscope/click/preview.cpp:405
 msgid "Close"
 msgstr "Schließen"
 
-#: ../libclickscope/click/preview.cpp:391
+#: ../libclickscope/click/preview.cpp:410
 msgid "Login Error"
 msgstr "Anmeldefehler"
 
-#: ../libclickscope/click/preview.cpp:392
+#: ../libclickscope/click/preview.cpp:411
 msgid "Please log in to your Ubuntu One account."
 msgstr "Bitte melden Sie sich mit Ihrem »Ubuntu One«-Konto an."
 
-#: ../libclickscope/click/preview.cpp:394
+#: ../libclickscope/click/preview.cpp:413
 msgid "Go to Accounts"
 msgstr "Gehen Sie zu Konten"
 
-#: ../libclickscope/click/preview.cpp:624
+#: ../libclickscope/click/preview.cpp:646
 msgid "Open"
 msgstr "Öffnen"
 
-#: ../libclickscope/click/preview.cpp:627
-#: ../libclickscope/click/preview.cpp:711
+#: ../libclickscope/click/preview.cpp:649
+#: ../libclickscope/click/preview.cpp:733
 msgid "Search"
 msgstr "Suchen"
 
-#: ../libclickscope/click/preview.cpp:645
-#: ../libclickscope/click/preview.cpp:782
+#: ../libclickscope/click/preview.cpp:667
+#: ../libclickscope/click/preview.cpp:804
 msgid "Uninstall"
 msgstr "Entfernen"
 
-#: ../libclickscope/click/preview.cpp:766
+#: ../libclickscope/click/preview.cpp:788
 msgid "Confirmation"
 msgstr "Bestätigung"
 
 #. TRANSLATORS: Do NOT translate ${title} here.
-#: ../libclickscope/click/preview.cpp:769
+#: ../libclickscope/click/preview.cpp:791
 msgid "Uninstall ${title}?"
 msgstr "Entferne ${title}?"
 
 #. TODO: see bug LP: #1289434
-#: ../libclickscope/click/preview.cpp:778
+#: ../libclickscope/click/preview.cpp:800
 msgid "Cancel"
 msgstr "Abbrechen"
 
-#: ../libclickscope/click/preview.cpp:843
+#: ../libclickscope/click/preview.cpp:866
 msgid "Install"
 msgstr "Installieren"
 
@@ -164,48 +169,49 @@
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../scope/clickapps/apps-query.cpp:260
+#: ../scope/clickapps/apps-query.cpp:262
 msgid "Get more apps from the store"
-msgstr ""
+msgstr "Erhalten Sie mehr Anwendungen aus dem Store"
 
-#: ../scope/clickapps/apps-query.cpp:266
+#: ../scope/clickapps/apps-query.cpp:268
 #, c-format
 msgid "Search for '%s' in the store"
-msgstr ""
+msgstr "Suche nach »%s« im Store"
 
-#: ../scope/clickapps/apps-query.cpp:273
+#: ../scope/clickapps/apps-query.cpp:275
 msgid "Get more apps like this from the Store"
+msgstr "Erhalten Sie mehr Anwendungen wie diese aus dem Store"
+
+#: ../scope/clickapps/apps-query.cpp:315
+#: ../scope/clickstore/store-query.cpp:244
+#: ../scope/clickstore/store-query.cpp:255
+#: ../scope/clickstore/store-query.cpp:467
+msgid "All"
 msgstr ""
 
-#: ../scope/clickapps/apps-query.cpp:302
-#: ../scope/clickstore/store-query.cpp:236
-#: ../scope/clickstore/store-query.cpp:247
-msgid "All departments"
-msgstr "Alle Abteilungen"
-
-#: ../scope/clickstore/store-query.cpp:285
+#: ../scope/clickstore/store-query.cpp:297
 msgid "✔ INSTALLED"
 msgstr "✔ INSTALLIERT"
 
-#: ../scope/clickstore/store-query.cpp:290
+#: ../scope/clickstore/store-query.cpp:302
 msgid "✔ PURCHASED"
-msgstr ""
+msgstr "✔ GEKAUFT"
 
-#: ../scope/clickstore/store-query.cpp:298
+#: ../scope/clickstore/store-query.cpp:310
 msgid "FREE"
 msgstr "KOSTENLOS"
 
-#: ../scope/clickstore/store-query.cpp:415
+#: ../scope/clickstore/store-query.cpp:427
 msgid "Available"
 msgstr "Verfügbar"
 
-#: ../scope/clickstore/store-query.cpp:421
+#: ../scope/clickstore/store-query.cpp:433
 #, c-format
 msgid "%u result in Ubuntu Store"
 msgid_plural "%u results in Ubuntu Store"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "%u Ergebnis im »Ubuntu Store«"
+msgstr[1] "%u Ergebnisse im »Ubuntu Store«"
 
-#: ../scope/clickstore/store-query.cpp:431
+#: ../scope/clickstore/store-query.cpp:443
 msgid "Recommended"
 msgstr "Empfohlen"

=== modified file 'po/el.po'
--- po/el.po	2014-07-30 07:11:20 +0000
+++ po/el.po	2014-08-21 20:38:09 +0000
@@ -7,21 +7,21 @@
 msgstr ""
 "Project-Id-Version: unity-scope-click\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2014-07-28 17:25-0400\n"
-"PO-Revision-Date: 2014-06-21 23:02+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2014-08-19 17:19-0400\n"
+"PO-Revision-Date: 2014-08-20 17:31+0000\n"
+"Last-Translator: Simos Xenitellis <Unknown>\n"
 "Language-Team: Greek <[e-mail]>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2014-07-30 07:11+0000\n"
-"X-Generator: Launchpad (build 17131)\n"
+"X-Launchpad-Export-Date: 2014-08-21 06:50+0000\n"
+"X-Generator: Launchpad (build 17163)\n"
 
 #: ../data/com.canonical.scopes.clickstore.ini.in.in.h:1
-#: ../scope/clickapps/apps-query.cpp:259
+#: ../scope/clickapps/apps-query.cpp:261
 msgid "Ubuntu Store"
-msgstr ""
+msgstr "Κατάστημα Ubuntu"
 
 #: ../data/com.canonical.scopes.clickstore.ini.in.in.h:2
 msgid "Scope for searching the click app store"
@@ -31,9 +31,10 @@
 msgid "Search store"
 msgstr ""
 
-#: ../data/clickscope.ini.in.in.h:1 ../scope/clickapps/apps-query.cpp:157
+#: ../data/clickscope.ini.in.in.h:1 ../libclickscope/click/highlights.cpp:116
+#: ../scope/clickapps/apps-query.cpp:159
 msgid "Apps"
-msgstr ""
+msgstr "Εφαρμογές"
 
 #: ../data/clickscope.ini.in.in.h:2
 msgid "Scope for searching the installed click apps"
@@ -43,116 +44,120 @@
 msgid "Search apps"
 msgstr ""
 
+#: ../libclickscope/click/highlights.cpp:119
+msgid "Scopes"
+msgstr ""
+
 #: ../libclickscope/click/preview.cpp:58
 msgid "Info"
-msgstr ""
+msgstr "Πληροφορίες"
 
 #: ../libclickscope/click/preview.cpp:59
 msgid "Updates"
-msgstr ""
+msgstr "Ενημερώσεις"
 
 #: ../libclickscope/click/preview.cpp:60
 msgid "What's new"
 msgstr ""
 
-#: ../libclickscope/click/preview.cpp:210
+#: ../libclickscope/click/preview.cpp:229
 msgid "Publisher/Creator"
 msgstr ""
 
-#: ../libclickscope/click/preview.cpp:211
+#: ../libclickscope/click/preview.cpp:230
 msgid "Seller"
 msgstr ""
 
-#: ../libclickscope/click/preview.cpp:212
+#: ../libclickscope/click/preview.cpp:231
 msgid "Website"
-msgstr ""
+msgstr "Ιστότοπος"
 
-#: ../libclickscope/click/preview.cpp:213
+#: ../libclickscope/click/preview.cpp:232
 msgid "Contact"
-msgstr ""
+msgstr "Επαφή"
 
-#: ../libclickscope/click/preview.cpp:214
+#: ../libclickscope/click/preview.cpp:233
 msgid "License"
-msgstr ""
+msgstr "Άδεια χρήσης"
 
-#: ../libclickscope/click/preview.cpp:222
+#: ../libclickscope/click/preview.cpp:241
 msgid "Version number"
-msgstr ""
+msgstr "Αριθμός έκδοσης"
 
-#: ../libclickscope/click/preview.cpp:223
+#: ../libclickscope/click/preview.cpp:242
 msgid "Last updated"
-msgstr ""
+msgstr "Τελευταία ενημέρωση"
 
-#: ../libclickscope/click/preview.cpp:224
+#: ../libclickscope/click/preview.cpp:243
 msgid "First released"
 msgstr ""
 
-#: ../libclickscope/click/preview.cpp:225
+#: ../libclickscope/click/preview.cpp:244
 msgid "Size"
-msgstr ""
+msgstr "Μέγεθος"
 
-#: ../libclickscope/click/preview.cpp:233
+#: ../libclickscope/click/preview.cpp:252
 msgid "Version"
-msgstr ""
+msgstr "Έκδοση"
 
-#: ../libclickscope/click/preview.cpp:364
+#: ../libclickscope/click/preview.cpp:383
 msgid "Reviews"
 msgstr ""
 
-#: ../libclickscope/click/preview.cpp:383
+#: ../libclickscope/click/preview.cpp:402
 msgid "Download Error"
 msgstr ""
 
-#: ../libclickscope/click/preview.cpp:384
+#: ../libclickscope/click/preview.cpp:403
 msgid "Download or install failed. Please try again."
 msgstr ""
 
 #. TODO see bug LP: #1289434
-#: ../libclickscope/click/preview.cpp:386
+#: ../libclickscope/click/preview.cpp:405
 msgid "Close"
 msgstr ""
 
-#: ../libclickscope/click/preview.cpp:391
+#: ../libclickscope/click/preview.cpp:410
 msgid "Login Error"
 msgstr ""
 
-#: ../libclickscope/click/preview.cpp:392
+#: ../libclickscope/click/preview.cpp:411
 msgid "Please log in to your Ubuntu One account."
 msgstr ""
 
-#: ../libclickscope/click/preview.cpp:394
+#: ../libclickscope/click/preview.cpp:413
 msgid "Go to Accounts"
 msgstr ""
 
-#: ../libclickscope/click/preview.cpp:624
+#: ../libclickscope/click/preview.cpp:646
 msgid "Open"
 msgstr ""
 
-#: ../libclickscope/click/preview.cpp:627
-#: ../libclickscope/click/preview.cpp:711
+#: ../libclickscope/click/preview.cpp:649
+#: ../libclickscope/click/preview.cpp:733
 msgid "Search"
 msgstr ""
 
-#: ../libclickscope/click/preview.cpp:645
-#: ../libclickscope/click/preview.cpp:782
+#: ../libclickscope/click/preview.cpp:667
+#: ../libclickscope/click/preview.cpp:804
 msgid "Uninstall"
 msgstr ""
 
-#: ../libclickscope/click/preview.cpp:766
+#: ../libclickscope/click/preview.cpp:788
 msgid "Confirmation"
 msgstr ""
 
 #. TRANSLATORS: Do NOT translate ${title} here.
-#: ../libclickscope/click/preview.cpp:769
+#: ../libclickscope/click/preview.cpp:791
 msgid "Uninstall ${title}?"
 msgstr ""
 
 #. TODO: see bug LP: #1289434
-#: ../libclickscope/click/preview.cpp:778
+#: ../libclickscope/click/preview.cpp:800
 msgid "Cancel"
 msgstr ""
 
-#: ../libclickscope/click/preview.cpp:843
+#: ../libclickscope/click/preview.cpp:866
 msgid "Install"
 msgstr ""
 
@@ -162,48 +167,49 @@
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../scope/clickapps/apps-query.cpp:260
+#: ../scope/clickapps/apps-query.cpp:262
 msgid "Get more apps from the store"
 msgstr ""
 
-#: ../scope/clickapps/apps-query.cpp:266
+#: ../scope/clickapps/apps-query.cpp:268
 #, c-format
 msgid "Search for '%s' in the store"
 msgstr ""
 
-#: ../scope/clickapps/apps-query.cpp:273
+#: ../scope/clickapps/apps-query.cpp:275
 msgid "Get more apps like this from the Store"
 msgstr ""
 
-#: ../scope/clickapps/apps-query.cpp:302
-#: ../scope/clickstore/store-query.cpp:236
-#: ../scope/clickstore/store-query.cpp:247
-msgid "All departments"
+#: ../scope/clickapps/apps-query.cpp:315
+#: ../scope/clickstore/store-query.cpp:244
+#: ../scope/clickstore/store-query.cpp:255
+#: ../scope/clickstore/store-query.cpp:467
+msgid "All"
 msgstr ""
 
-#: ../scope/clickstore/store-query.cpp:285
+#: ../scope/clickstore/store-query.cpp:297
 msgid "✔ INSTALLED"
 msgstr ""
 
-#: ../scope/clickstore/store-query.cpp:290
+#: ../scope/clickstore/store-query.cpp:302
 msgid "✔ PURCHASED"
 msgstr ""
 
-#: ../scope/clickstore/store-query.cpp:298
+#: ../scope/clickstore/store-query.cpp:310
 msgid "FREE"
 msgstr ""
 
-#: ../scope/clickstore/store-query.cpp:415
+#: ../scope/clickstore/store-query.cpp:427
 msgid "Available"
 msgstr ""
 
-#: ../scope/clickstore/store-query.cpp:421
+#: ../scope/clickstore/store-query.cpp:433
 #, c-format
 msgid "%u result in Ubuntu Store"
 msgid_plural "%u results in Ubuntu Store"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../scope/clickstore/store-query.cpp:431
+#: ../scope/clickstore/store-query.cpp:443
 msgid "Recommended"
 msgstr ""

=== modified file 'po/en_AU.po'
--- po/en_AU.po	2014-07-31 08:14:29 +0000
+++ po/en_AU.po	2014-08-21 20:38:09 +0000
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: unity-scope-click\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2014-07-28 17:25-0400\n"
+"POT-Creation-Date: 2014-08-19 17:19-0400\n"
 "PO-Revision-Date: 2014-07-30 12:46+0000\n"
 "Last-Translator: Joel Addison <[e-mail]>\n"
 "Language-Team: English (Australia) <[e-mail]>\n"
@@ -15,11 +15,11 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2014-07-31 08:14+0000\n"
-"X-Generator: Launchpad (build 17131)\n"
+"X-Launchpad-Export-Date: 2014-08-20 06:26+0000\n"
+"X-Generator: Launchpad (build 17163)\n"
 
 #: ../data/com.canonical.scopes.clickstore.ini.in.in.h:1
-#: ../scope/clickapps/apps-query.cpp:259
+#: ../scope/clickapps/apps-query.cpp:261
 msgid "Ubuntu Store"
 msgstr "Ubuntu Store"
 
@@ -31,7 +31,8 @@
 msgid "Search store"
 msgstr "Search store"
 
-#: ../data/clickscope.ini.in.in.h:1 ../scope/clickapps/apps-query.cpp:157
+#: ../data/clickscope.ini.in.in.h:1 ../libclickscope/click/highlights.cpp:116
+#: ../scope/clickapps/apps-query.cpp:159
 msgid "Apps"
 msgstr "Apps"
 
@@ -43,6 +44,10 @@
 msgid "Search apps"
 msgstr "Search apps"
 
+#: ../libclickscope/click/highlights.cpp:119
+msgid "Scopes"
+msgstr ""
+
 #: ../libclickscope/click/preview.cpp:58
 msgid "Info"
 msgstr "Info"
@@ -55,104 +60,104 @@
 msgid "What's new"
 msgstr "What's new"
 
-#: ../libclickscope/click/preview.cpp:210
+#: ../libclickscope/click/preview.cpp:229
 msgid "Publisher/Creator"
 msgstr "Publisher/Creator"
 
-#: ../libclickscope/click/preview.cpp:211
+#: ../libclickscope/click/preview.cpp:230
 msgid "Seller"
 msgstr "Seller"
 
-#: ../libclickscope/click/preview.cpp:212
+#: ../libclickscope/click/preview.cpp:231
 msgid "Website"
 msgstr "Website"
 
-#: ../libclickscope/click/preview.cpp:213
+#: ../libclickscope/click/preview.cpp:232
 msgid "Contact"
 msgstr "Contact"
 
-#: ../libclickscope/click/preview.cpp:214
+#: ../libclickscope/click/preview.cpp:233
 msgid "License"
 msgstr "Licence"
 
-#: ../libclickscope/click/preview.cpp:222
+#: ../libclickscope/click/preview.cpp:241
 msgid "Version number"
 msgstr "Version number"
 
-#: ../libclickscope/click/preview.cpp:223
+#: ../libclickscope/click/preview.cpp:242
 msgid "Last updated"
 msgstr "Last updated"
 
-#: ../libclickscope/click/preview.cpp:224
+#: ../libclickscope/click/preview.cpp:243
 msgid "First released"
 msgstr "First released"
 
-#: ../libclickscope/click/preview.cpp:225
+#: ../libclickscope/click/preview.cpp:244
 msgid "Size"
 msgstr "Size"
 
-#: ../libclickscope/click/preview.cpp:233
+#: ../libclickscope/click/preview.cpp:252
 msgid "Version"
 msgstr "Version"
 
-#: ../libclickscope/click/preview.cpp:364
+#: ../libclickscope/click/preview.cpp:383
 msgid "Reviews"
 msgstr "Reviews"
 
-#: ../libclickscope/click/preview.cpp:383
+#: ../libclickscope/click/preview.cpp:402
 msgid "Download Error"
 msgstr "Download Error"
 
-#: ../libclickscope/click/preview.cpp:384
+#: ../libclickscope/click/preview.cpp:403
 msgid "Download or install failed. Please try again."
 msgstr "Download or install failed. Please try again."
 
 #. TODO see bug LP: #1289434
-#: ../libclickscope/click/preview.cpp:386
+#: ../libclickscope/click/preview.cpp:405
 msgid "Close"
 msgstr "Close"
 
-#: ../libclickscope/click/preview.cpp:391
+#: ../libclickscope/click/preview.cpp:410
 msgid "Login Error"
 msgstr "Login Error"
 
-#: ../libclickscope/click/preview.cpp:392
+#: ../libclickscope/click/preview.cpp:411
 msgid "Please log in to your Ubuntu One account."
 msgstr "Please log in to your Ubuntu One account."
 
-#: ../libclickscope/click/preview.cpp:394
+#: ../libclickscope/click/preview.cpp:413
 msgid "Go to Accounts"
 msgstr "Go to Accounts"
 
-#: ../libclickscope/click/preview.cpp:624
+#: ../libclickscope/click/preview.cpp:646
 msgid "Open"
 msgstr "Open"
 
-#: ../libclickscope/click/preview.cpp:627
-#: ../libclickscope/click/preview.cpp:711
+#: ../libclickscope/click/preview.cpp:649
+#: ../libclickscope/click/preview.cpp:733
 msgid "Search"
 msgstr "Search"
 
-#: ../libclickscope/click/preview.cpp:645
-#: ../libclickscope/click/preview.cpp:782
+#: ../libclickscope/click/preview.cpp:667
+#: ../libclickscope/click/preview.cpp:804
 msgid "Uninstall"
 msgstr "Uninstall"
 
-#: ../libclickscope/click/preview.cpp:766
+#: ../libclickscope/click/preview.cpp:788
 msgid "Confirmation"
 msgstr "Confirmation"
 
 #. TRANSLATORS: Do NOT translate ${title} here.
-#: ../libclickscope/click/preview.cpp:769
+#: ../libclickscope/click/preview.cpp:791
 msgid "Uninstall ${title}?"
 msgstr "Uninstall ${title}?"
 
 #. TODO: see bug LP: #1289434
-#: ../libclickscope/click/preview.cpp:778
+#: ../libclickscope/click/preview.cpp:800
 msgid "Cancel"
 msgstr "Cancel"
 
-#: ../libclickscope/click/preview.cpp:843
+#: ../libclickscope/click/preview.cpp:866
 msgid "Install"
 msgstr "Install"
 
@@ -162,48 +167,49 @@
 msgstr[0] "{1} byte"
 msgstr[1] "{1} bytes"
 
-#: ../scope/clickapps/apps-query.cpp:260
+#: ../scope/clickapps/apps-query.cpp:262
 msgid "Get more apps from the store"
 msgstr "Get more apps from the store"
 
-#: ../scope/clickapps/apps-query.cpp:266
+#: ../scope/clickapps/apps-query.cpp:268
 #, c-format
 msgid "Search for '%s' in the store"
 msgstr "Search for '%s' in the store"
 
-#: ../scope/clickapps/apps-query.cpp:273
+#: ../scope/clickapps/apps-query.cpp:275
 msgid "Get more apps like this from the Store"
 msgstr "Get more apps like this from the Store"
 
-#: ../scope/clickapps/apps-query.cpp:302
-#: ../scope/clickstore/store-query.cpp:236
-#: ../scope/clickstore/store-query.cpp:247
-msgid "All departments"
-msgstr "All departments"
+#: ../scope/clickapps/apps-query.cpp:315
+#: ../scope/clickstore/store-query.cpp:244
+#: ../scope/clickstore/store-query.cpp:255
+#: ../scope/clickstore/store-query.cpp:467
+msgid "All"
+msgstr ""
 
-#: ../scope/clickstore/store-query.cpp:285
+#: ../scope/clickstore/store-query.cpp:297
 msgid "✔ INSTALLED"
 msgstr "✔ INSTALLED"
 
-#: ../scope/clickstore/store-query.cpp:290
+#: ../scope/clickstore/store-query.cpp:302
 msgid "✔ PURCHASED"
 msgstr "✔ PURCHASED"
 
-#: ../scope/clickstore/store-query.cpp:298
+#: ../scope/clickstore/store-query.cpp:310
 msgid "FREE"
 msgstr "FREE"
 
-#: ../scope/clickstore/store-query.cpp:415
+#: ../scope/clickstore/store-query.cpp:427
 msgid "Available"
 msgstr "Available"
 
-#: ../scope/clickstore/store-query.cpp:421
+#: ../scope/clickstore/store-query.cpp:433
 #, c-format
 msgid "%u result in Ubuntu Store"
 msgid_plural "%u results in Ubuntu Store"
 msgstr[0] "%u result in Ubuntu Store"
 msgstr[1] "%u results in Ubuntu Store"
 
-#: ../scope/clickstore/store-query.cpp:431
+#: ../scope/clickstore/store-query.cpp:443
 msgid "Recommended"
 msgstr "Recommended"

=== modified file 'po/en_GB.po'
--- po/en_GB.po	2014-07-31 08:14:29 +0000
+++ po/en_GB.po	2014-08-21 20:38:09 +0000
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: unity-scope-click\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2014-07-28 17:25-0400\n"
+"POT-Creation-Date: 2014-08-19 17:19-0400\n"
 "PO-Revision-Date: 2014-07-30 17:38+0000\n"
 "Last-Translator: Alan Pope ㋛ <[e-mail]>\n"
 "Language-Team: English (United Kingdom) <[e-mail]>\n"
@@ -15,11 +15,11 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2014-07-31 08:14+0000\n"
-"X-Generator: Launchpad (build 17131)\n"
+"X-Launchpad-Export-Date: 2014-08-20 06:26+0000\n"
+"X-Generator: Launchpad (build 17163)\n"
 
 #: ../data/com.canonical.scopes.clickstore.ini.in.in.h:1
-#: ../scope/clickapps/apps-query.cpp:259
+#: ../scope/clickapps/apps-query.cpp:261
 msgid "Ubuntu Store"
 msgstr "Ubuntu Store"
 
@@ -31,7 +31,8 @@
 msgid "Search store"
 msgstr "Search store"
 
-#: ../data/clickscope.ini.in.in.h:1 ../scope/clickapps/apps-query.cpp:157
+#: ../data/clickscope.ini.in.in.h:1 ../libclickscope/click/highlights.cpp:116
+#: ../scope/clickapps/apps-query.cpp:159
 msgid "Apps"
 msgstr "Apps"
 
@@ -43,6 +44,10 @@
 msgid "Search apps"
 msgstr "Search apps"
 
+#: ../libclickscope/click/highlights.cpp:119
+msgid "Scopes"
+msgstr ""
+
 #: ../libclickscope/click/preview.cpp:58
 msgid "Info"
 msgstr "Info"
@@ -55,104 +60,104 @@
 msgid "What's new"
 msgstr "What's new"
 
-#: ../libclickscope/click/preview.cpp:210
+#: ../libclickscope/click/preview.cpp:229
 msgid "Publisher/Creator"
 msgstr "Publisher/Creator"
 
-#: ../libclickscope/click/preview.cpp:211
+#: ../libclickscope/click/preview.cpp:230
 msgid "Seller"
 msgstr "Seller"
 
-#: ../libclickscope/click/preview.cpp:212
+#: ../libclickscope/click/preview.cpp:231
 msgid "Website"
 msgstr "Website"
 
-#: ../libclickscope/click/preview.cpp:213
+#: ../libclickscope/click/preview.cpp:232
 msgid "Contact"
 msgstr "Contact"
 
-#: ../libclickscope/click/preview.cpp:214
+#: ../libclickscope/click/preview.cpp:233
 msgid "License"
 msgstr "Licence"
 
-#: ../libclickscope/click/preview.cpp:222
+#: ../libclickscope/click/preview.cpp:241
 msgid "Version number"
 msgstr "Version number"
 
-#: ../libclickscope/click/preview.cpp:223
+#: ../libclickscope/click/preview.cpp:242
 msgid "Last updated"
 msgstr "Last updated"
 
-#: ../libclickscope/click/preview.cpp:224
+#: ../libclickscope/click/preview.cpp:243
 msgid "First released"
 msgstr "First released"
 
-#: ../libclickscope/click/preview.cpp:225
+#: ../libclickscope/click/preview.cpp:244
 msgid "Size"
 msgstr "Size"
 
-#: ../libclickscope/click/preview.cpp:233
+#: ../libclickscope/click/preview.cpp:252
 msgid "Version"
 msgstr "Version"
 
-#: ../libclickscope/click/preview.cpp:364
+#: ../libclickscope/click/preview.cpp:383
 msgid "Reviews"
 msgstr "Reviews"
 
-#: ../libclickscope/click/preview.cpp:383
+#: ../libclickscope/click/preview.cpp:402
 msgid "Download Error"
 msgstr "Download Error"
 
-#: ../libclickscope/click/preview.cpp:384
+#: ../libclickscope/click/preview.cpp:403
 msgid "Download or install failed. Please try again."
 msgstr "Download or install failed. Please try again."
 
 #. TODO see bug LP: #1289434
-#: ../libclickscope/click/preview.cpp:386
+#: ../libclickscope/click/preview.cpp:405
 msgid "Close"
 msgstr "Close"
 
-#: ../libclickscope/click/preview.cpp:391
+#: ../libclickscope/click/preview.cpp:410
 msgid "Login Error"
 msgstr "Login Error"
 
-#: ../libclickscope/click/preview.cpp:392
+#: ../libclickscope/click/preview.cpp:411
 msgid "Please log in to your Ubuntu One account."
 msgstr "Please log in to your Ubuntu One account."
 
-#: ../libclickscope/click/preview.cpp:394
+#: ../libclickscope/click/preview.cpp:413
 msgid "Go to Accounts"
 msgstr "Go to Accounts"
 
-#: ../libclickscope/click/preview.cpp:624
+#: ../libclickscope/click/preview.cpp:646
 msgid "Open"
 msgstr "Open"
 
-#: ../libclickscope/click/preview.cpp:627
-#: ../libclickscope/click/preview.cpp:711
+#: ../libclickscope/click/preview.cpp:649
+#: ../libclickscope/click/preview.cpp:733
 msgid "Search"
 msgstr "Search"
 
-#: ../libclickscope/click/preview.cpp:645
-#: ../libclickscope/click/preview.cpp:782
+#: ../libclickscope/click/preview.cpp:667
+#: ../libclickscope/click/preview.cpp:804
 msgid "Uninstall"
 msgstr "Uninstall"
 
-#: ../libclickscope/click/preview.cpp:766
+#: ../libclickscope/click/preview.cpp:788
 msgid "Confirmation"
 msgstr "Confirmation"
 
 #. TRANSLATORS: Do NOT translate ${title} here.
-#: ../libclickscope/click/preview.cpp:769
+#: ../libclickscope/click/preview.cpp:791
 msgid "Uninstall ${title}?"
 msgstr "Uninstall ${title}?"
 
 #. TODO: see bug LP: #1289434
-#: ../libclickscope/click/preview.cpp:778
+#: ../libclickscope/click/preview.cpp:800
 msgid "Cancel"
 msgstr "Cancel"
 
-#: ../libclickscope/click/preview.cpp:843
+#: ../libclickscope/click/preview.cpp:866
 msgid "Install"
 msgstr "Install"
 
@@ -162,48 +167,49 @@
 msgstr[0] "{1} byte"
 msgstr[1] "{1} bytes"
 
-#: ../scope/clickapps/apps-query.cpp:260
+#: ../scope/clickapps/apps-query.cpp:262
 msgid "Get more apps from the store"
 msgstr "Get more apps from the store"
 
-#: ../scope/clickapps/apps-query.cpp:266
+#: ../scope/clickapps/apps-query.cpp:268
 #, c-format
 msgid "Search for '%s' in the store"
 msgstr "Search for '%s' in the store"
 
-#: ../scope/clickapps/apps-query.cpp:273
+#: ../scope/clickapps/apps-query.cpp:275
 msgid "Get more apps like this from the Store"
 msgstr "Get more apps like this from the Store"
 
-#: ../scope/clickapps/apps-query.cpp:302
-#: ../scope/clickstore/store-query.cpp:236
-#: ../scope/clickstore/store-query.cpp:247
-msgid "All departments"
-msgstr "All departments"
+#: ../scope/clickapps/apps-query.cpp:315
+#: ../scope/clickstore/store-query.cpp:244
+#: ../scope/clickstore/store-query.cpp:255
+#: ../scope/clickstore/store-query.cpp:467
+msgid "All"
+msgstr ""
 
-#: ../scope/clickstore/store-query.cpp:285
+#: ../scope/clickstore/store-query.cpp:297
 msgid "✔ INSTALLED"
 msgstr "✔ INSTALLED"
 
-#: ../scope/clickstore/store-query.cpp:290
+#: ../scope/clickstore/store-query.cpp:302
 msgid "✔ PURCHASED"
 msgstr "✔ PURCHASED"
 
-#: ../scope/clickstore/store-query.cpp:298
+#: ../scope/clickstore/store-query.cpp:310
 msgid "FREE"
 msgstr "FREE"
 
-#: ../scope/clickstore/store-query.cpp:415
+#: ../scope/clickstore/store-query.cpp:427
 msgid "Available"
 msgstr "Available"
 
-#: ../scope/clickstore/store-query.cpp:421
+#: ../scope/clickstore/store-query.cpp:433
 #, c-format
 msgid "%u result in Ubuntu Store"
 msgid_plural "%u results in Ubuntu Store"
 msgstr[0] "%u result in Ubuntu Store"
 msgstr[1] "%u results in Ubuntu Store"
 
-#: ../scope/clickstore/store-query.cpp:431
+#: ../scope/clickstore/store-query.cpp:443
 msgid "Recommended"
 msgstr "Recommended"

=== modified file 'po/es.po'
--- po/es.po	2014-07-31 08:14:29 +0000
+++ po/es.po	2014-08-21 20:38:09 +0000
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: unity-scope-click\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2014-07-28 17:25-0400\n"
+"POT-Creation-Date: 2014-08-19 17:19-0400\n"
 "PO-Revision-Date: 2014-07-30 16:50+0000\n"
 "Last-Translator: Adolfo Jayme <[e-mail]>\n"
 "Language-Team: Spanish <[e-mail]>\n"
@@ -15,11 +15,11 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2014-07-31 08:14+0000\n"
-"X-Generator: Launchpad (build 17131)\n"
+"X-Launchpad-Export-Date: 2014-08-20 06:26+0000\n"
+"X-Generator: Launchpad (build 17163)\n"
 
 #: ../data/com.canonical.scopes.clickstore.ini.in.in.h:1
-#: ../scope/clickapps/apps-query.cpp:259
+#: ../scope/clickapps/apps-query.cpp:261
 msgid "Ubuntu Store"
 msgstr "Tienda Ubuntu"
 
@@ -31,7 +31,8 @@
 msgid "Search store"
 msgstr "Buscar en la tienda"
 
-#: ../data/clickscope.ini.in.in.h:1 ../scope/clickapps/apps-query.cpp:157
+#: ../data/clickscope.ini.in.in.h:1 ../libclickscope/click/highlights.cpp:116
+#: ../scope/clickapps/apps-query.cpp:159
 msgid "Apps"
 msgstr "Aplicaciones"
 
@@ -43,6 +44,10 @@
 msgid "Search apps"
 msgstr "Buscar aplicaciones"
 
+#: ../libclickscope/click/highlights.cpp:119
+msgid "Scopes"
+msgstr ""
+
 #: ../libclickscope/click/preview.cpp:58
 msgid "Info"
 msgstr "Información"
@@ -55,104 +60,104 @@
 msgid "What's new"
 msgstr "Novedades"
 
-#: ../libclickscope/click/preview.cpp:210
+#: ../libclickscope/click/preview.cpp:229
 msgid "Publisher/Creator"
 msgstr "Autor/editor"
 
-#: ../libclickscope/click/preview.cpp:211
+#: ../libclickscope/click/preview.cpp:230
 msgid "Seller"
 msgstr "Vendedor"
 
-#: ../libclickscope/click/preview.cpp:212
+#: ../libclickscope/click/preview.cpp:231
 msgid "Website"
 msgstr "Sitio web"
 
-#: ../libclickscope/click/preview.cpp:213
+#: ../libclickscope/click/preview.cpp:232
 msgid "Contact"
 msgstr "Contacto"
 
-#: ../libclickscope/click/preview.cpp:214
+#: ../libclickscope/click/preview.cpp:233
 msgid "License"
 msgstr "Licencia"
 
-#: ../libclickscope/click/preview.cpp:222
+#: ../libclickscope/click/preview.cpp:241
 msgid "Version number"
 msgstr "Número de versión"
 
-#: ../libclickscope/click/preview.cpp:223
+#: ../libclickscope/click/preview.cpp:242
 msgid "Last updated"
 msgstr "Última actualización"
 
-#: ../libclickscope/click/preview.cpp:224
+#: ../libclickscope/click/preview.cpp:243
 msgid "First released"
 msgstr "Primera publicación"
 
-#: ../libclickscope/click/preview.cpp:225
+#: ../libclickscope/click/preview.cpp:244
 msgid "Size"
 msgstr "Tamaño"
 
-#: ../libclickscope/click/preview.cpp:233
+#: ../libclickscope/click/preview.cpp:252
 msgid "Version"
 msgstr "Versión"
 
-#: ../libclickscope/click/preview.cpp:364
+#: ../libclickscope/click/preview.cpp:383
 msgid "Reviews"
 msgstr "Reseñas"
 
-#: ../libclickscope/click/preview.cpp:383
+#: ../libclickscope/click/preview.cpp:402
 msgid "Download Error"
 msgstr "Error en la descarga"
 
-#: ../libclickscope/click/preview.cpp:384
+#: ../libclickscope/click/preview.cpp:403
 msgid "Download or install failed. Please try again."
 msgstr "La descarga o la instalación han fallado. Inténtelo nuevamente."
 
 #. TODO see bug LP: #1289434
-#: ../libclickscope/click/preview.cpp:386
+#: ../libclickscope/click/preview.cpp:405
 msgid "Close"
 msgstr "Cerrar"
 
-#: ../libclickscope/click/preview.cpp:391
+#: ../libclickscope/click/preview.cpp:410
 msgid "Login Error"
 msgstr "Error de autenticación"
 
-#: ../libclickscope/click/preview.cpp:392
+#: ../libclickscope/click/preview.cpp:411
 msgid "Please log in to your Ubuntu One account."
 msgstr "Acceda a su cuenta de Ubuntu One."
 
-#: ../libclickscope/click/preview.cpp:394
+#: ../libclickscope/click/preview.cpp:413
 msgid "Go to Accounts"
 msgstr "Ir a cuentas"
 
-#: ../libclickscope/click/preview.cpp:624
+#: ../libclickscope/click/preview.cpp:646
 msgid "Open"
 msgstr "Abrir"
 
-#: ../libclickscope/click/preview.cpp:627
-#: ../libclickscope/click/preview.cpp:711
+#: ../libclickscope/click/preview.cpp:649
+#: ../libclickscope/click/preview.cpp:733
 msgid "Search"
 msgstr "Buscar"
 
-#: ../libclickscope/click/preview.cpp:645
-#: ../libclickscope/click/preview.cpp:782
+#: ../libclickscope/click/preview.cpp:667
+#: ../libclickscope/click/preview.cpp:804
 msgid "Uninstall"
 msgstr "Desinstalar"
 
-#: ../libclickscope/click/preview.cpp:766
+#: ../libclickscope/click/preview.cpp:788
 msgid "Confirmation"
 msgstr "Confirmación"
 
 #. TRANSLATORS: Do NOT translate ${title} here.
-#: ../libclickscope/click/preview.cpp:769
+#: ../libclickscope/click/preview.cpp:791
 msgid "Uninstall ${title}?"
 msgstr "¿Desinstalar ${title}?"
 
 #. TODO: see bug LP: #1289434
-#: ../libclickscope/click/preview.cpp:778
+#: ../libclickscope/click/preview.cpp:800
 msgid "Cancel"
 msgstr "Cancelar"
 
-#: ../libclickscope/click/preview.cpp:843
+#: ../libclickscope/click/preview.cpp:866
 msgid "Install"
 msgstr "Instalar"
 
@@ -162,48 +167,49 @@
 msgstr[0] "{1} byte"
 msgstr[1] "{1} bytes"
 
-#: ../scope/clickapps/apps-query.cpp:260
+#: ../scope/clickapps/apps-query.cpp:262
 msgid "Get more apps from the store"
 msgstr "Consiga más aplicaciones en la tienda"
 
-#: ../scope/clickapps/apps-query.cpp:266
+#: ../scope/clickapps/apps-query.cpp:268
 #, c-format
 msgid "Search for '%s' in the store"
 msgstr "Busque «%s» en la tienda"
 
-#: ../scope/clickapps/apps-query.cpp:273
+#: ../scope/clickapps/apps-query.cpp:275
 msgid "Get more apps like this from the Store"
 msgstr "Más aplicaciones como esta en la Tienda"
 
-#: ../scope/clickapps/apps-query.cpp:302
-#: ../scope/clickstore/store-query.cpp:236
-#: ../scope/clickstore/store-query.cpp:247
-msgid "All departments"
-msgstr "Todos los departamentos"
+#: ../scope/clickapps/apps-query.cpp:315
+#: ../scope/clickstore/store-query.cpp:244
+#: ../scope/clickstore/store-query.cpp:255
+#: ../scope/clickstore/store-query.cpp:467
+msgid "All"
+msgstr ""
 
-#: ../scope/clickstore/store-query.cpp:285
+#: ../scope/clickstore/store-query.cpp:297
 msgid "✔ INSTALLED"
 msgstr "✔ INSTALADA"
 
-#: ../scope/clickstore/store-query.cpp:290
+#: ../scope/clickstore/store-query.cpp:302
 msgid "✔ PURCHASED"
 msgstr "✔ COMPRADA"
 
-#: ../scope/clickstore/store-query.cpp:298
+#: ../scope/clickstore/store-query.cpp:310
 msgid "FREE"
 msgstr "GRATIS"
 
-#: ../scope/clickstore/store-query.cpp:415
+#: ../scope/clickstore/store-query.cpp:427
 msgid "Available"
 msgstr "Disponible"
 
-#: ../scope/clickstore/store-query.cpp:421
+#: ../scope/clickstore/store-query.cpp:433
 #, c-format
 msgid "%u result in Ubuntu Store"
 msgid_plural "%u results in Ubuntu Store"
 msgstr[0] "%u resultado en la Tienda de Ubuntu"
 msgstr[1] "%u resultados en la Tienda de Ubuntu"
 
-#: ../scope/clickstore/store-query.cpp:431
+#: ../scope/clickstore/store-query.cpp:443
 msgid "Recommended"
 msgstr "Recomendado"

=== modified file 'po/eu.po'
--- po/eu.po	2014-07-31 08:14:29 +0000
+++ po/eu.po	2014-08-21 20:38:09 +0000
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: unity-scope-click\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2014-07-28 17:25-0400\n"
+"POT-Creation-Date: 2014-08-19 17:19-0400\n"
 "PO-Revision-Date: 2014-07-30 17:33+0000\n"
 "Last-Translator: Ibai Oihanguren Sala <Unknown>\n"
 "Language-Team: Basque <[e-mail]>\n"
@@ -15,11 +15,11 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2014-07-31 08:14+0000\n"
-"X-Generator: Launchpad (build 17131)\n"
+"X-Launchpad-Export-Date: 2014-08-20 06:26+0000\n"
+"X-Generator: Launchpad (build 17163)\n"
 
 #: ../data/com.canonical.scopes.clickstore.ini.in.in.h:1
-#: ../scope/clickapps/apps-query.cpp:259
+#: ../scope/clickapps/apps-query.cpp:261
 msgid "Ubuntu Store"
 msgstr "Ubunturen denda"
 
@@ -31,7 +31,8 @@
 msgid "Search store"
 msgstr "Bilatu dendan"
 
-#: ../data/clickscope.ini.in.in.h:1 ../scope/clickapps/apps-query.cpp:157
+#: ../data/clickscope.ini.in.in.h:1 ../libclickscope/click/highlights.cpp:116
+#: ../scope/clickapps/apps-query.cpp:159
 msgid "Apps"
 msgstr "Aplikazioak"
 
@@ -43,6 +44,10 @@
 msgid "Search apps"
 msgstr "Bilatu aplikazioak"
 
+#: ../libclickscope/click/highlights.cpp:119
+msgid "Scopes"
+msgstr ""
+
 #: ../libclickscope/click/preview.cpp:58
 msgid "Info"
 msgstr "Informazioa"
@@ -55,104 +60,104 @@
 msgid "What's new"
 msgstr "Zer berri?"
 
-#: ../libclickscope/click/preview.cpp:210
+#: ../libclickscope/click/preview.cpp:229
 msgid "Publisher/Creator"
 msgstr "Argitaratzailea/Sortzailea"
 
-#: ../libclickscope/click/preview.cpp:211
+#: ../libclickscope/click/preview.cpp:230
 msgid "Seller"
 msgstr "Saltzailea"
 
-#: ../libclickscope/click/preview.cpp:212
+#: ../libclickscope/click/preview.cpp:231
 msgid "Website"
 msgstr "Webgunea"
 
-#: ../libclickscope/click/preview.cpp:213
+#: ../libclickscope/click/preview.cpp:232
 msgid "Contact"
 msgstr "Kontaktua"
 
-#: ../libclickscope/click/preview.cpp:214
+#: ../libclickscope/click/preview.cpp:233
 msgid "License"
 msgstr "Lizentzia"
 
-#: ../libclickscope/click/preview.cpp:222
+#: ../libclickscope/click/preview.cpp:241
 msgid "Version number"
 msgstr "Bertsio-zenbakia"
 
-#: ../libclickscope/click/preview.cpp:223
+#: ../libclickscope/click/preview.cpp:242
 msgid "Last updated"
 msgstr "Azken eguneratzea"
 
-#: ../libclickscope/click/preview.cpp:224
+#: ../libclickscope/click/preview.cpp:243
 msgid "First released"
 msgstr "Aurreneko argitaratzea"
 
-#: ../libclickscope/click/preview.cpp:225
+#: ../libclickscope/click/preview.cpp:244
 msgid "Size"
 msgstr "Tamaina"
 
-#: ../libclickscope/click/preview.cpp:233
+#: ../libclickscope/click/preview.cpp:252
 msgid "Version"
 msgstr "Bertsioa"
 
-#: ../libclickscope/click/preview.cpp:364
+#: ../libclickscope/click/preview.cpp:383
 msgid "Reviews"
 msgstr "Kritikak"
 
-#: ../libclickscope/click/preview.cpp:383
+#: ../libclickscope/click/preview.cpp:402
 msgid "Download Error"
 msgstr "Deskarga-errorea"
 
-#: ../libclickscope/click/preview.cpp:384
+#: ../libclickscope/click/preview.cpp:403
 msgid "Download or install failed. Please try again."
 msgstr "Deskarga edo instalazioak huts egin du. Saiatu berriro."
 
 #. TODO see bug LP: #1289434
-#: ../libclickscope/click/preview.cpp:386
+#: ../libclickscope/click/preview.cpp:405
 msgid "Close"
 msgstr "Itxi"
 
-#: ../libclickscope/click/preview.cpp:391
+#: ../libclickscope/click/preview.cpp:410
 msgid "Login Error"
 msgstr "Errorea saioa hastean"
 
-#: ../libclickscope/click/preview.cpp:392
+#: ../libclickscope/click/preview.cpp:411
 msgid "Please log in to your Ubuntu One account."
 msgstr "Hasi saioa zure Ubuntu One kontuan."
 
-#: ../libclickscope/click/preview.cpp:394
+#: ../libclickscope/click/preview.cpp:413
 msgid "Go to Accounts"
 msgstr "Joan Kontuak-era"
 
-#: ../libclickscope/click/preview.cpp:624
+#: ../libclickscope/click/preview.cpp:646
 msgid "Open"
 msgstr "Ireki"
 
-#: ../libclickscope/click/preview.cpp:627
-#: ../libclickscope/click/preview.cpp:711
+#: ../libclickscope/click/preview.cpp:649
+#: ../libclickscope/click/preview.cpp:733
 msgid "Search"
 msgstr "Bilatu"
 
-#: ../libclickscope/click/preview.cpp:645
-#: ../libclickscope/click/preview.cpp:782
+#: ../libclickscope/click/preview.cpp:667
+#: ../libclickscope/click/preview.cpp:804
 msgid "Uninstall"
 msgstr "Desinstalatu"
 
-#: ../libclickscope/click/preview.cpp:766
+#: ../libclickscope/click/preview.cpp:788
 msgid "Confirmation"
 msgstr "Berrespena"
 
 #. TRANSLATORS: Do NOT translate ${title} here.
-#: ../libclickscope/click/preview.cpp:769
+#: ../libclickscope/click/preview.cpp:791
 msgid "Uninstall ${title}?"
 msgstr "${title} desinstalatu?"
 
 #. TODO: see bug LP: #1289434
-#: ../libclickscope/click/preview.cpp:778
+#: ../libclickscope/click/preview.cpp:800
 msgid "Cancel"
 msgstr "Utzi"
 
-#: ../libclickscope/click/preview.cpp:843
+#: ../libclickscope/click/preview.cpp:866
 msgid "Install"
 msgstr "Instalatu"
 
@@ -162,48 +167,49 @@
 msgstr[0] "byte {1}"
 msgstr[1] "{1} byte"
 
-#: ../scope/clickapps/apps-query.cpp:260
+#: ../scope/clickapps/apps-query.cpp:262
 msgid "Get more apps from the store"
 msgstr "Eskuratu dendako aplikazio gehiago"
 
-#: ../scope/clickapps/apps-query.cpp:266
+#: ../scope/clickapps/apps-query.cpp:268
 #, c-format
 msgid "Search for '%s' in the store"
 msgstr "Bilatu '%s' dendan"
 
-#: ../scope/clickapps/apps-query.cpp:273
+#: ../scope/clickapps/apps-query.cpp:275
 msgid "Get more apps like this from the Store"
 msgstr "Eskuratu hau moduko aplikazio gehiago dendan"
 
-#: ../scope/clickapps/apps-query.cpp:302
-#: ../scope/clickstore/store-query.cpp:236
-#: ../scope/clickstore/store-query.cpp:247
-msgid "All departments"
-msgstr "Sail guztiak"
+#: ../scope/clickapps/apps-query.cpp:315
+#: ../scope/clickstore/store-query.cpp:244
+#: ../scope/clickstore/store-query.cpp:255
+#: ../scope/clickstore/store-query.cpp:467
+msgid "All"
+msgstr ""
 
-#: ../scope/clickstore/store-query.cpp:285
+#: ../scope/clickstore/store-query.cpp:297
 msgid "✔ INSTALLED"
 msgstr "✔ INSTALATUTA"
 
-#: ../scope/clickstore/store-query.cpp:290
+#: ../scope/clickstore/store-query.cpp:302
 msgid "✔ PURCHASED"
 msgstr "✔ EROSITA"
 
-#: ../scope/clickstore/store-query.cpp:298
+#: ../scope/clickstore/store-query.cpp:310
 msgid "FREE"
 msgstr "DOAN"
 
-#: ../scope/clickstore/store-query.cpp:415
+#: ../scope/clickstore/store-query.cpp:427
 msgid "Available"
 msgstr "Eskuragarri"
 
-#: ../scope/clickstore/store-query.cpp:421
+#: ../scope/clickstore/store-query.cpp:433
 #, c-format
 msgid "%u result in Ubuntu Store"
 msgid_plural "%u results in Ubuntu Store"
 msgstr[0] "Emaitza %u Ubunturen dendan"
 msgstr[1] "%u emaitza Ubunturen dendan"
 
-#: ../scope/clickstore/store-query.cpp:431
+#: ../scope/clickstore/store-query.cpp:443
 msgid "Recommended"
 msgstr "Gomendatua"

=== modified file 'po/fa.po'
--- po/fa.po	2014-08-04 06:35:07 +0000
+++ po/fa.po	2014-08-21 20:38:09 +0000
@@ -7,19 +7,19 @@
 msgstr ""
 "Project-Id-Version: unity-scope-click\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2014-07-28 17:25-0400\n"
-"PO-Revision-Date: 2014-08-03 12:48+0000\n"
+"POT-Creation-Date: 2014-08-19 17:19-0400\n"
+"PO-Revision-Date: 2014-08-20 11:15+0000\n"
 "Last-Translator: Danial Behzadi <[e-mail]>\n"
 "Language-Team: Persian <[e-mail]>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Launchpad-Export-Date: 2014-08-04 06:35+0000\n"
-"X-Generator: Launchpad (build 17147)\n"
+"X-Launchpad-Export-Date: 2014-08-21 06:51+0000\n"
+"X-Generator: Launchpad (build 17163)\n"
 
 #: ../data/com.canonical.scopes.clickstore.ini.in.in.h:1
-#: ../scope/clickapps/apps-query.cpp:259
+#: ../scope/clickapps/apps-query.cpp:261
 msgid "Ubuntu Store"
 msgstr "فروشگاه اوبونتو"
 
@@ -31,7 +31,8 @@
 msgid "Search store"
 msgstr "جست‌وجوی فروشگاه"
 
-#: ../data/clickscope.ini.in.in.h:1 ../scope/clickapps/apps-query.cpp:157
+#: ../data/clickscope.ini.in.in.h:1 ../libclickscope/click/highlights.cpp:116
+#: ../scope/clickapps/apps-query.cpp:159
 msgid "Apps"
 msgstr "اپ‌ها"
 
@@ -43,6 +44,10 @@
 msgid "Search apps"
 msgstr "جست‌وجوی اپ‌ها"
 
+#: ../libclickscope/click/highlights.cpp:119
+msgid "Scopes"
+msgstr "حوزه‌ها"
+
 #: ../libclickscope/click/preview.cpp:58
 msgid "Info"
 msgstr "اطلاعات"
@@ -55,104 +60,104 @@
 msgid "What's new"
 msgstr "اپ‌های جدید"
 
-#: ../libclickscope/click/preview.cpp:210
+#: ../libclickscope/click/preview.cpp:229
 msgid "Publisher/Creator"
 msgstr "منتشرکننده/سازنده"
 
-#: ../libclickscope/click/preview.cpp:211
+#: ../libclickscope/click/preview.cpp:230
 msgid "Seller"
 msgstr "فروشنده"
 
-#: ../libclickscope/click/preview.cpp:212
+#: ../libclickscope/click/preview.cpp:231
 msgid "Website"
 msgstr "پایگاه‌وب"
 
-#: ../libclickscope/click/preview.cpp:213
+#: ../libclickscope/click/preview.cpp:232
 msgid "Contact"
 msgstr "مخاطب"
 
-#: ../libclickscope/click/preview.cpp:214
+#: ../libclickscope/click/preview.cpp:233
 msgid "License"
 msgstr "پروانه"
 
-#: ../libclickscope/click/preview.cpp:222
+#: ../libclickscope/click/preview.cpp:241
 msgid "Version number"
 msgstr "شماره‌ی نگارش"
 
-#: ../libclickscope/click/preview.cpp:223
+#: ../libclickscope/click/preview.cpp:242
 msgid "Last updated"
 msgstr "آخرین به‌روزرسانی"
 
-#: ../libclickscope/click/preview.cpp:224
+#: ../libclickscope/click/preview.cpp:243
 msgid "First released"
 msgstr "نخستین انتشار"
 
-#: ../libclickscope/click/preview.cpp:225
+#: ../libclickscope/click/preview.cpp:244
 msgid "Size"
 msgstr "اندازه"
 
-#: ../libclickscope/click/preview.cpp:233
+#: ../libclickscope/click/preview.cpp:252
 msgid "Version"
 msgstr "نگارش"
 
-#: ../libclickscope/click/preview.cpp:364
+#: ../libclickscope/click/preview.cpp:383
 msgid "Reviews"
 msgstr "باربینی‌ها"
 
-#: ../libclickscope/click/preview.cpp:383
+#: ../libclickscope/click/preview.cpp:402
 msgid "Download Error"
 msgstr "خطای بارگیری"
 
-#: ../libclickscope/click/preview.cpp:384
+#: ../libclickscope/click/preview.cpp:403
 msgid "Download or install failed. Please try again."
 msgstr "بارگیری یا نصب شکست خورد. لطفاً دوباره تلاش کنید."
 
 #. TODO see bug LP: #1289434
-#: ../libclickscope/click/preview.cpp:386
+#: ../libclickscope/click/preview.cpp:405
 msgid "Close"
 msgstr "بستن"
 
-#: ../libclickscope/click/preview.cpp:391
+#: ../libclickscope/click/preview.cpp:410
 msgid "Login Error"
 msgstr "خطای ورود"
 
-#: ../libclickscope/click/preview.cpp:392
+#: ../libclickscope/click/preview.cpp:411
 msgid "Please log in to your Ubuntu One account."
 msgstr "لطفاً به حساب کاربری اویونتووان خود وارد شوید."
 
-#: ../libclickscope/click/preview.cpp:394
+#: ../libclickscope/click/preview.cpp:413
 msgid "Go to Accounts"
 msgstr "رفتن به حساب‌های کاربری"
 
-#: ../libclickscope/click/preview.cpp:624
+#: ../libclickscope/click/preview.cpp:646
 msgid "Open"
 msgstr "گشودن"
 
-#: ../libclickscope/click/preview.cpp:627
-#: ../libclickscope/click/preview.cpp:711
+#: ../libclickscope/click/preview.cpp:649
+#: ../libclickscope/click/preview.cpp:733
 msgid "Search"
 msgstr "جست‌وجو"
 
-#: ../libclickscope/click/preview.cpp:645
-#: ../libclickscope/click/preview.cpp:782
+#: ../libclickscope/click/preview.cpp:667
+#: ../libclickscope/click/preview.cpp:804
 msgid "Uninstall"
 msgstr "حذف نصب"
 
-#: ../libclickscope/click/preview.cpp:766
+#: ../libclickscope/click/preview.cpp:788
 msgid "Confirmation"
 msgstr "تأییدیه"
 
 #. TRANSLATORS: Do NOT translate ${title} here.
-#: ../libclickscope/click/preview.cpp:769
+#: ../libclickscope/click/preview.cpp:791
 msgid "Uninstall ${title}?"
 msgstr "حذف ${title}؟"
 
 #. TODO: see bug LP: #1289434
-#: ../libclickscope/click/preview.cpp:778
+#: ../libclickscope/click/preview.cpp:800
 msgid "Cancel"
 msgstr "لغو"
 
-#: ../libclickscope/click/preview.cpp:843
+#: ../libclickscope/click/preview.cpp:866
 msgid "Install"
 msgstr "نصب"
 
@@ -161,47 +166,48 @@
 msgid_plural "{1} bytes"
 msgstr[0] "{1} بایت"
 
-#: ../scope/clickapps/apps-query.cpp:260
+#: ../scope/clickapps/apps-query.cpp:262
 msgid "Get more apps from the store"
 msgstr "گرفتن اپ‌های بیش‌تر از فروشگاه"
 
-#: ../scope/clickapps/apps-query.cpp:266
+#: ../scope/clickapps/apps-query.cpp:268
 #, c-format
 msgid "Search for '%s' in the store"
 msgstr "جست‌وجو برای «%s» در فروشگاه"
 
-#: ../scope/clickapps/apps-query.cpp:273
+#: ../scope/clickapps/apps-query.cpp:275
 msgid "Get more apps like this from the Store"
 msgstr "گرفتن اپ‌های بیش‌تری شبیه به این از فروشگاه"
 
-#: ../scope/clickapps/apps-query.cpp:302
-#: ../scope/clickstore/store-query.cpp:236
-#: ../scope/clickstore/store-query.cpp:247
-msgid "All departments"
-msgstr "همه‌ی بخش‌ها"
+#: ../scope/clickapps/apps-query.cpp:315
+#: ../scope/clickstore/store-query.cpp:244
+#: ../scope/clickstore/store-query.cpp:255
+#: ../scope/clickstore/store-query.cpp:467
+msgid "All"
+msgstr "همه"
 
-#: ../scope/clickstore/store-query.cpp:285
+#: ../scope/clickstore/store-query.cpp:297
 msgid "✔ INSTALLED"
 msgstr "✔ نصب شده"
 
-#: ../scope/clickstore/store-query.cpp:290
+#: ../scope/clickstore/store-query.cpp:302
 msgid "✔ PURCHASED"
 msgstr "✔ خریداری شده"
 
-#: ../scope/clickstore/store-query.cpp:298
+#: ../scope/clickstore/store-query.cpp:310
 msgid "FREE"
 msgstr "رایگان"
 
-#: ../scope/clickstore/store-query.cpp:415
+#: ../scope/clickstore/store-query.cpp:427
 msgid "Available"
 msgstr "موجود"
 
-#: ../scope/clickstore/store-query.cpp:421
+#: ../scope/clickstore/store-query.cpp:433
 #, c-format
 msgid "%u result in Ubuntu Store"
 msgid_plural "%u results in Ubuntu Store"
 msgstr[0] "%u یافته در فروشگاه اوبونتو"
 
-#: ../scope/clickstore/store-query.cpp:431
+#: ../scope/clickstore/store-query.cpp:443
 msgid "Recommended"
 msgstr "توصيه شده"

=== modified file 'po/fi.po'
--- po/fi.po	2014-08-01 07:16:52 +0000
+++ po/fi.po	2014-08-21 20:38:09 +0000
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: unity-scope-click\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2014-07-28 17:25-0400\n"
+"POT-Creation-Date: 2014-08-19 17:19-0400\n"
 "PO-Revision-Date: 2014-07-31 08:25+0000\n"
 "Last-Translator: Jiri Grönroos <Unknown>\n"
 "Language-Team: Finnish <[e-mail]>\n"
@@ -15,11 +15,11 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2014-08-01 07:16+0000\n"
-"X-Generator: Launchpad (build 17141)\n"
+"X-Launchpad-Export-Date: 2014-08-20 06:26+0000\n"
+"X-Generator: Launchpad (build 17163)\n"
 
 #: ../data/com.canonical.scopes.clickstore.ini.in.in.h:1
-#: ../scope/clickapps/apps-query.cpp:259
+#: ../scope/clickapps/apps-query.cpp:261
 msgid "Ubuntu Store"
 msgstr "Ubuntu-kauppa"
 
@@ -31,7 +31,8 @@
 msgid "Search store"
 msgstr "Etsi kaupasta"
 
-#: ../data/clickscope.ini.in.in.h:1 ../scope/clickapps/apps-query.cpp:157
+#: ../data/clickscope.ini.in.in.h:1 ../libclickscope/click/highlights.cpp:116
+#: ../scope/clickapps/apps-query.cpp:159
 msgid "Apps"
 msgstr "Sovellukset"
 
@@ -43,6 +44,10 @@
 msgid "Search apps"
 msgstr "Etsi sovelluksia"
 
+#: ../libclickscope/click/highlights.cpp:119
+msgid "Scopes"
+msgstr ""
+
 #: ../libclickscope/click/preview.cpp:58
 msgid "Info"
 msgstr "Tiedot"
@@ -55,104 +60,104 @@
 msgid "What's new"
 msgstr "Uutuudet"
 
-#: ../libclickscope/click/preview.cpp:210
+#: ../libclickscope/click/preview.cpp:229
 msgid "Publisher/Creator"
 msgstr "Julkaisija/tekijä"
 
-#: ../libclickscope/click/preview.cpp:211
+#: ../libclickscope/click/preview.cpp:230
 msgid "Seller"
 msgstr "Myyjä"
 
-#: ../libclickscope/click/preview.cpp:212
+#: ../libclickscope/click/preview.cpp:231
 msgid "Website"
 msgstr "Verkkosivusto"
 
-#: ../libclickscope/click/preview.cpp:213
+#: ../libclickscope/click/preview.cpp:232
 msgid "Contact"
 msgstr "Yhteys"
 
-#: ../libclickscope/click/preview.cpp:214
+#: ../libclickscope/click/preview.cpp:233
 msgid "License"
 msgstr "Lisenssi"
 
-#: ../libclickscope/click/preview.cpp:222
+#: ../libclickscope/click/preview.cpp:241
 msgid "Version number"
 msgstr "Versionumero"
 
-#: ../libclickscope/click/preview.cpp:223
+#: ../libclickscope/click/preview.cpp:242
 msgid "Last updated"
 msgstr "Viimeksi päivitetty"
 
-#: ../libclickscope/click/preview.cpp:224
+#: ../libclickscope/click/preview.cpp:243
 msgid "First released"
 msgstr "Ensijulkaisu"
 
-#: ../libclickscope/click/preview.cpp:225
+#: ../libclickscope/click/preview.cpp:244
 msgid "Size"
 msgstr "Koko"
 
-#: ../libclickscope/click/preview.cpp:233
+#: ../libclickscope/click/preview.cpp:252
 msgid "Version"
 msgstr "Versio"
 
-#: ../libclickscope/click/preview.cpp:364
+#: ../libclickscope/click/preview.cpp:383
 msgid "Reviews"
 msgstr "Arvostelut"
 
-#: ../libclickscope/click/preview.cpp:383
+#: ../libclickscope/click/preview.cpp:402
 msgid "Download Error"
 msgstr "Latausvirhe"
 
-#: ../libclickscope/click/preview.cpp:384
+#: ../libclickscope/click/preview.cpp:403
 msgid "Download or install failed. Please try again."
 msgstr "Lataus tai asennus epäonnistui. Yritä uudelleen."
 
 #. TODO see bug LP: #1289434
-#: ../libclickscope/click/preview.cpp:386
+#: ../libclickscope/click/preview.cpp:405
 msgid "Close"
 msgstr "Sulje"
 
-#: ../libclickscope/click/preview.cpp:391
+#: ../libclickscope/click/preview.cpp:410
 msgid "Login Error"
 msgstr "Kirjautumisvirhe"
 
-#: ../libclickscope/click/preview.cpp:392
+#: ../libclickscope/click/preview.cpp:411
 msgid "Please log in to your Ubuntu One account."
 msgstr "Kirjaudu Ubuntu One -tilillesi."
 
-#: ../libclickscope/click/preview.cpp:394