Merge lp:~costales/unav/0.60-nik-conv2-search-label-overwrite into lp:unav

[costales]

Don't overwrite the history results in Search page

=== modified file 'qml/Location.qml'
--- qml/Location.qml	2016-05-15 08:59:16 +0000
+++ qml/Location.qml	2016-05-15 08:59:16 +0000
@@ -36,15 +36,16 @@
 
         onStatusChanged: {
             if (status === XmlListModel.Error) {
+                historyModel.clear();
                 statusLabel.text = i18n.tr("Time out! Please try again");
                 statusLabel.visible = true;
                 historyIcon.visible =  false;
             }
 
             else if (status === XmlListModel.Ready && count === 0) {
-                //TRANSLATORS: This string is search shown when no POIs are found with the chosen search radius. %1 is the POI type eg..Pub, Airport
-                // Example string, "Sorry, no Airport found nearby. Try again with a larger search radius"
-                statusLabel.text = i18n.tr("Sorry, no %1 found nearby. Try again with a larger search radius").arg(searchField.text)
+                historyModel.clear();
+                //TRANSLATORS: This string is search shown when no POIs are found with the chosen search radius.
+                statusLabel.text = i18n.tr("Sorry, nothing found. Try another search")
                 statusLabel.visible = true;
                 historyIcon.visible =  false;
             }
@@ -215,7 +216,7 @@
 
             onTriggered: {
                 if (text.trim()) {
-                    statusLabel.visible = true
+                    statusLabel.visible = true;
                     statusLabel.text = i18n.tr("Searching…");
                     xmlSearchModel.searchString = text;
                     xmlSearchModel.search();
@@ -226,8 +227,8 @@
 
             onTextChanged: {
                 if (!text.trim()) {
-                    xmlSearchModel.clear()
-                    sortedSearchModel.clear()
+                    xmlSearchModel.clear();
+                    sortedSearchModel.clear();
                 }
             }
         }