diff --git a/strings.txt b/strings.txt
index 4a235cffee..e01872062c 100644
--- a/strings.txt
+++ b/strings.txt
@@ -1906,7 +1906,7 @@
hu = A képernyőn
[food]
en = food
- tags = ios,android
+ tags = ios,android,tizen
comment = Search Suggestion
cs = jídlo
de = Essen
@@ -1924,7 +1924,7 @@
hu = élelmiszer
[transport]
en = transport
- tags = ios,android
+ tags = ios,android,tizen
comment = Search Suggestion
cs = doprava
de = Verkehr
@@ -1942,7 +1942,7 @@
hu = közlekedés
[fuel]
en = gas
- tags = ios,android
+ tags = ios,android,tizen
comment = Search Suggestion
cs = čerpací stanice
de = Tankstelle
@@ -1960,7 +1960,7 @@
hu = benzinkút
[parking]
en = parking
- tags = ios,android
+ tags = ios,android,tizen
comment = Search Suggestion
cs = parkoviště
de = Parkplatz
@@ -1978,7 +1978,7 @@
hu = parkoló
[shop]
en = shop
- tags = ios,android
+ tags = ios,android,tizen
comment = Search Suggestion
cs = obchod
de = Laden
@@ -1996,7 +1996,7 @@
hu = bolt
[hotel]
en = hotel
- tags = ios,android
+ tags = ios,android,tizen
cs = hotel
de = Hotel
es = hotel
@@ -2013,7 +2013,7 @@
hu = szálloda
[tourism]
en = sights
- tags = ios,android
+ tags = ios,android,tizen
comment = Search Suggestion
cs = pamětihodnosti
de = Sehenswürdigkeit
@@ -2031,7 +2031,7 @@
hu = látnivaló
[entertainment]
en = entertainment
- tags = ios,android
+ tags = ios,android,tizen
comment = Search Suggestion
cs = zábava
de = Unterhaltung
@@ -2049,7 +2049,7 @@
hu = szórakozás
[atm]
en = atm
- tags = ios,android
+ tags = ios,android,tizen
comment = Search Suggestion
cs = bankomat
de = Geldautomat
@@ -2066,7 +2066,7 @@
hu = pénzautomata
[bank]
en = bank
- tags = ios,android
+ tags = ios,android,tizen
comment = Search Suggestion
cs = banka
de = Bank
@@ -2084,7 +2084,7 @@
hu = bank
[pharmacy]
en = pharmacy
- tags = ios,android
+ tags = ios,android,tizen
comment = Search Suggestion
cs = lékárna
de = Apotheke
@@ -2102,7 +2102,7 @@
hu = gyógyszertár
[hospital]
en = hospital
- tags = ios,android
+ tags = ios,android,tizen
comment = Search Suggestion
cs = nemocnice
de = Spital
@@ -2120,7 +2120,7 @@
hu = kórház
[toilet]
en = toilet
- tags = ios,android
+ tags = ios,android,tizen
comment = Search Suggestion
cs = záchody
de = Toilette
@@ -2138,7 +2138,7 @@
hu = mosdó
[post]
en = post
- tags = ios,android
+ tags = ios,android,tizen
comment = Search Suggestion
cs = pošta
de = Post
@@ -2156,7 +2156,7 @@
hu = posta
[police]
en = police
- tags = ios,android
+ tags = ios,android,tizen
comment = Search Suggestion
cs = policie
de = Polizeistation
@@ -2174,7 +2174,7 @@
hu = rendőrség
[no_search_results_found]
en = No results found
- tags = ios,android
+ tags = ios,android,tizen
comment = String in search result list, when nothing found
cs = Žádné výsledky
de = Keine Ergebnisse gefunden
diff --git a/tizen/MapsWithMe/inc/AppResourceId.h b/tizen/MapsWithMe/inc/AppResourceId.h
index 983272900a..d2d0d5c722 100644
--- a/tizen/MapsWithMe/inc/AppResourceId.h
+++ b/tizen/MapsWithMe/inc/AppResourceId.h
@@ -1,19 +1,17 @@
-#ifndef _APP_RESOURCE_ID_H_
-#define _APP_RESOURCE_ID_H_
+#pragma once
-
-
-#endif // _APP_RESOURCE_ID_H_
extern const wchar_t* IDC_ABOUT_BUTTON;
extern const wchar_t* IDC_CLOSE_BUTTON;
extern const wchar_t* IDC_DOWNLOAD_LISTVIEW;
extern const wchar_t* IDC_ENABLE_GPS;
extern const wchar_t* IDC_ENABLE_SCALE_BUTTONS_CB;
extern const wchar_t* IDC_FOOTS_CHECKBUTTON;
+extern const wchar_t* IDC_LISTVIEW;
extern const wchar_t* IDC_MEASUREMENT_NOTE;
extern const wchar_t* IDC_MEASUREMENT_UNITS_LABEL;
extern const wchar_t* IDC_MENU;
extern const wchar_t* IDC_METERS_CHECKBUTTON;
+extern const wchar_t* IDC_SEARCHBAR;
extern const wchar_t* IDC_VERSION_LABEL;
extern const wchar_t* IDC_WEB;
extern const wchar_t* IDC_ZOOM_IN;
@@ -21,8 +19,11 @@ extern const wchar_t* IDC_ZOOM_OUT;
extern const wchar_t* IDF_ABOUT_FORM;
extern const wchar_t* IDF_DOWNLOAD_FORM;
extern const wchar_t* IDF_MAIN_FORM;
+extern const wchar_t* IDF_SEARCH_FORM;
extern const wchar_t* IDS_ABOUT;
extern const wchar_t* IDS_ARE_YOU_SURE;
+extern const wchar_t* IDS_ATM;
+extern const wchar_t* IDS_BANK;
extern const wchar_t* IDS_BECOME_A_PRO;
extern const wchar_t* IDS_CANCEL;
extern const wchar_t* IDS_CANCEL_DOWNLOAD;
@@ -30,15 +31,29 @@ extern const wchar_t* IDS_DELETE;
extern const wchar_t* IDS_DOWNLOAD;
extern const wchar_t* IDS_DOWNLOAD_COUNTRY_FAILED;
extern const wchar_t* IDS_DOWNLOAD_MAPS;
+extern const wchar_t* IDS_ENTERTAINMENT;
+extern const wchar_t* IDS_FOOD;
+extern const wchar_t* IDS_FUEL;
+extern const wchar_t* IDS_HOSPITAL;
+extern const wchar_t* IDS_HOTEL;
extern const wchar_t* IDS_KILOMETRES;
extern const wchar_t* IDS_MB;
extern const wchar_t* IDS_MEASUREMENT_UNITS;
extern const wchar_t* IDS_MEASUREMENT_UNITS_SUMMARY;
extern const wchar_t* IDS_MILES;
+extern const wchar_t* IDS_NO_SEARCH_RESULTS_FOUND;
+extern const wchar_t* IDS_PARKING;
+extern const wchar_t* IDS_PHARMACY;
+extern const wchar_t* IDS_POLICE;
+extern const wchar_t* IDS_POST;
extern const wchar_t* IDS_PREF_ZOOM_SUMMARY;
extern const wchar_t* IDS_PREF_ZOOM_TITLE;
extern const wchar_t* IDS_SETTINGS;
extern const wchar_t* IDS_SHARE_MY_LOCATION;
+extern const wchar_t* IDS_SHOP;
+extern const wchar_t* IDS_TOILET;
+extern const wchar_t* IDS_TOURISM;
+extern const wchar_t* IDS_TRANSPORT;
extern const wchar_t* IDS_VERSION;
// main form
extern const wchar_t * IDB_MY_POSITION_NORMAL;
@@ -52,3 +67,6 @@ extern const wchar_t * IDB_MWM_PRO;
extern const wchar_t * IDB_DOWNLOAD_MAP;
extern const wchar_t * IDB_SETTINGS;
extern const wchar_t * IDB_SHARE;
+//search
+extern const wchar_t * IDB_SINGLE_RESULT;
+extern const wchar_t * IDB_SUGGESTION_RESULT;
diff --git a/tizen/MapsWithMe/res/ces-CZ.xml b/tizen/MapsWithMe/res/ces-CZ.xml
index 606bf876c2..98b1669320 100644
--- a/tizen/MapsWithMe/res/ces-CZ.xml
+++ b/tizen/MapsWithMe/res/ces-CZ.xml
@@ -26,6 +26,37 @@
Měřicí jednotky
Vyber si míle nebo kilometry
+
+ jídlo
+
+ doprava
+
+ čerpací stanice
+
+ parkoviště
+
+ obchod
+ hotel
+
+ pamětihodnosti
+
+ zábava
+
+ bankomat
+
+ banka
+
+ lékárna
+
+ nemocnice
+
+ záchody
+
+ pošta
+
+ policie
+
+ Žádné výsledky
Verze: %s
diff --git a/tizen/MapsWithMe/res/deu-DE.xml b/tizen/MapsWithMe/res/deu-DE.xml
index 0c57072263..aced23b375 100644
--- a/tizen/MapsWithMe/res/deu-DE.xml
+++ b/tizen/MapsWithMe/res/deu-DE.xml
@@ -26,6 +26,37 @@
Maßeinheiten
Auswahl zwischen Meilen und Kilometern
+
+ Essen
+
+ Verkehr
+
+ Tankstelle
+
+ Parkplatz
+
+ Laden
+ Hotel
+
+ Sehenswürdigkeit
+
+ Unterhaltung
+
+ Geldautomat
+
+ Bank
+
+ Apotheke
+
+ Spital
+
+ Toilette
+
+ Post
+
+ Polizeistation
+
+ Keine Ergebnisse gefunden
Version: %s
diff --git a/tizen/MapsWithMe/res/eng-GB.xml b/tizen/MapsWithMe/res/eng-GB.xml
index df438e60b8..6181e739de 100644
--- a/tizen/MapsWithMe/res/eng-GB.xml
+++ b/tizen/MapsWithMe/res/eng-GB.xml
@@ -28,6 +28,37 @@
Measurement Units
Choose between miles and kilometres
+
+ food
+
+ transport
+
+ gas
+
+ parking
+
+ shop
+ hotel
+
+ sights
+
+ entertainment
+
+ atm
+
+ bank
+
+ pharmacy
+
+ hospital
+
+ toilet
+
+ post
+
+ police
+
+ No results found
Version: %s
diff --git a/tizen/MapsWithMe/res/fra-FR.xml b/tizen/MapsWithMe/res/fra-FR.xml
index 69f6332e00..12950e862c 100644
--- a/tizen/MapsWithMe/res/fra-FR.xml
+++ b/tizen/MapsWithMe/res/fra-FR.xml
@@ -28,6 +28,37 @@
Unités de mesure
Choisissez entre miles et kilomètres
+
+ alimentation
+
+ transport
+
+ carburant
+
+ parking
+
+ magasin
+ hôtel
+
+ site touristique
+
+ divertissement
+
+ distributeur de billets
+
+ banque
+
+ pharmacie
+
+ hôpital/clinique
+
+ toilettes
+
+ poste
+
+ police/gendarmerie
+
+ Aucun résultat trouvé
Version : %s
diff --git a/tizen/MapsWithMe/res/ita-IT.xml b/tizen/MapsWithMe/res/ita-IT.xml
index d0dc456bb4..4b11561234 100644
--- a/tizen/MapsWithMe/res/ita-IT.xml
+++ b/tizen/MapsWithMe/res/ita-IT.xml
@@ -28,6 +28,37 @@
Unità di misura
Scegli tra miglia e chilometri
+
+ mangiare
+
+ transporto
+
+ stazione di rifornimento
+
+ parcheggio
+
+ negozio
+ hôtel
+
+ turistico
+
+ divertimento
+
+ bancomat
+
+ banca
+
+ farmacia
+
+ ospedale
+
+ toilette
+
+ posta
+
+ posto di polizia
+
+ Nessun risultato trovato
Versione: %s
diff --git a/tizen/MapsWithMe/res/pol-PL.xml b/tizen/MapsWithMe/res/pol-PL.xml
index bca94ac929..23e48dd737 100644
--- a/tizen/MapsWithMe/res/pol-PL.xml
+++ b/tizen/MapsWithMe/res/pol-PL.xml
@@ -28,6 +28,37 @@
Jednostki miary
Wybierz pomiędzy milami, a kilometrami
+
+ jedzenie
+
+ transport
+
+ stacja benzynowa
+
+ parking
+
+ sklep
+ hotel
+
+ osobliwości miasta
+
+ rozrywka
+
+ bankomat
+
+ bank
+
+ apteka
+
+ szpital
+
+ toaleta
+
+ poczta
+
+ policja
+
+ Nie znaleziono
Wersja: %s
diff --git a/tizen/MapsWithMe/res/por-PT.xml b/tizen/MapsWithMe/res/por-PT.xml
index 2a607abc16..3dea00d92c 100644
--- a/tizen/MapsWithMe/res/por-PT.xml
+++ b/tizen/MapsWithMe/res/por-PT.xml
@@ -28,6 +28,37 @@
Unidades de medida
Escolha entre milhas e quilómetros
+
+ alimentação
+
+ transporte
+
+ combustível
+
+ estacionamento
+
+ compras
+ hotel
+
+ vistas
+
+ entretenimento
+
+ multibanco
+
+ banco
+
+ farmácia
+
+ hospital
+
+ WC
+
+ correios
+
+ polícia
+
+ Não foram encontrados resultados
Versão: %s
diff --git a/tizen/MapsWithMe/res/rus-RU.xml b/tizen/MapsWithMe/res/rus-RU.xml
index 680e114027..3cb1734944 100644
--- a/tizen/MapsWithMe/res/rus-RU.xml
+++ b/tizen/MapsWithMe/res/rus-RU.xml
@@ -28,6 +28,37 @@
Единицы измерения
Использовать километры или мили
+
+ еда
+
+ транспорт
+
+ заправка
+
+ парковка
+
+ магазин
+ гостиница
+
+ достопримечательность
+
+ развлечения
+
+ банкомат
+
+ банк
+
+ аптека
+
+ больница
+
+ туалет
+
+ почта
+
+ полиция
+
+ Нет результатов поиска
Версия: %s
diff --git a/tizen/MapsWithMe/res/spa-ES.xml b/tizen/MapsWithMe/res/spa-ES.xml
index cf85240c6c..4a4083d3da 100644
--- a/tizen/MapsWithMe/res/spa-ES.xml
+++ b/tizen/MapsWithMe/res/spa-ES.xml
@@ -26,6 +26,37 @@
Unidades de medida
Elija entre millas y kilómetros
+
+ comer
+
+ transporte
+
+ gasolinera
+
+ estacionamiento
+
+ tienda
+ hotel
+
+ turismo
+
+ entretenimiento
+
+ atm
+
+ banco
+
+ farmacia
+
+ hospital
+
+ servicios sanitario
+
+ oficina de correos
+
+ policía
+
+ No se han encontrado resultados
Versión: %s
diff --git a/tizen/MapsWithMe/res/ukr-UA.xml b/tizen/MapsWithMe/res/ukr-UA.xml
index c883afa75f..366608f9d9 100644
--- a/tizen/MapsWithMe/res/ukr-UA.xml
+++ b/tizen/MapsWithMe/res/ukr-UA.xml
@@ -28,6 +28,37 @@
Одиниці виміру
Використовувати милі чи кілометри
+
+ їжа
+
+ транспорт
+
+ заправка
+
+ парковка
+
+ крамниця
+ готель
+
+ пам’ятні місця
+
+ розваги
+
+ банкомат
+
+ банк
+
+ аптека
+
+ лікарня
+
+ туалет
+
+ пошта
+
+ міліція
+
+ Результатів не знайдено
Версія: %s