Merge remote-tracking branch 'origin/master'

OsmAnd/res/values-be/phrases.xml

@@ -39,7 +39,7 @@
 	<string name="poi_boutique">Буцік</string>
 	<string name="poi_chemist">Аптэка</string>
 	<string name="poi_clothes">Крама адзеньня</string>
-	<string name="poi_child_clothes">Дзіцячае адзеньне</string>
+	<string name="poi_clothes_children">Дзіцячае адзеньне</string>
 	<string name="poi_shoes">Крама абутку</string>
 	<string name="poi_computer">Кампутары</string>
 	<string name="poi_copyshop">Капіявальныя паслугі</string>

OsmAnd/res/values-bg/phrases.xml

@@ -74,7 +74,7 @@
 	<string name="poi_charity">Благотворителност</string>
 	<string name="poi_chemist">Аптека</string>
 	<string name="poi_clothes">Магазин за дрехи</string>
-	<string name="poi_child_clothes">Детско облекло</string>
+	<string name="poi_clothes_children">Детско облекло</string>
 	<string name="poi_shoes">Магазин за обувки</string>
 	<string name="poi_computer">Магазин за компютри</string>
 	<string name="poi_copyshop">Копирен център</string>

OsmAnd/res/values-ca/phrases.xml

@@ -115,7 +115,7 @@
 	<string name="poi_tobacco">Venda de tabac</string>
 	<string name="poi_carpet">Botiga de catifes</string>
 	<string name="poi_clothes">Magatzem de roba</string>
-	<string name="poi_child_clothes">Roba infantil</string>
+	<string name="poi_clothes_children">Roba infantil</string>
 	<string name="poi_curtain">Pelleteria</string>
 	<string name="poi_fabric">Botiga de teixits</string>
 	<string name="poi_public_transport_platform">Parada de transport públic</string>

OsmAnd/res/values-cs/phrases.xml

@@ -18,7 +18,7 @@
 	<string name="poi_bed">Vybavení ložnic</string>
 	<string name="poi_boutique">Módní butik</string>
 	<string name="poi_chemist">Drogerie</string>
-	<string name="poi_child_clothes">Dětské oblečení</string>
+	<string name="poi_clothes_children">Dětské oblečení</string>
 	<string name="poi_shoes">Obuv</string>
 	<string name="poi_hardware">Železářství</string>
 	<string name="poi_tobacco">Tabák</string>

OsmAnd/res/values-da/phrases.xml

@@ -669,7 +669,7 @@
 	<string name="poi_user_defined_other">Brugerdefineret</string>
 	
 	<string name="poi_military_landuse">Militærzone</string>
-	<string name="poi_child_clothes">Børnetøj</string>
+	<string name="poi_clothes_children">Børnetøj</string>
 	<string name="poi_apartment">Lejlighed</string>
 
 	<string name="poi_public_transport_stop_position">Offentlig transport stoppested</string>

OsmAnd/res/values-de/phrases.xml

@@ -111,7 +111,7 @@
 	<string name="poi_charging_station">Ladestation</string>
 	<string name="poi_chemist">Drogerie</string>
 	<string name="poi_chess">Schach</string>
-	<string name="poi_child_clothes">Kinderbekleidungsgeschäft</string>
+	<string name="poi_clothes_children">Kinderbekleidungsgeschäft</string>
 	<string name="poi_cinema">Kino</string>
 	<string name="poi_circus">Zirkus</string>
 	<string name="poi_city">Stadt</string>

OsmAnd/res/values-es-rAR/phrases.xml

@@ -74,7 +74,7 @@
 	<string name="poi_charity">Negocio benéfico</string>
 	<string name="poi_chemist">Higiene personal y del hogar</string>
 	<string name="poi_clothes">Negocio de ropa</string>
-	<string name="poi_child_clothes">Ropa infantil</string>
+	<string name="poi_clothes_children">Ropa infantil</string>
 	<string name="poi_shoes">Zapatería</string>
 	<string name="poi_computer">Computadoras</string>
 	<string name="poi_copyshop">Fotocopiadora</string>

OsmAnd/res/values-es/phrases.xml

@@ -389,7 +389,7 @@
 	<string name="poi_charity">Negocio benéfico</string>
 	<string name="poi_confectionery">Dulcería</string>
 	<string name="poi_clothes">Negocio de ropa</string>
-	<string name="poi_child_clothes">Ropa infantil</string>
+	<string name="poi_clothes_children">Ropa infantil</string>
 	<string name="poi_shoes">Zapatería</string>
 	<string name="poi_copyshop">Fotocopiadora</string>
 	<string name="poi_curtain">Blanquería</string>

OsmAnd/res/values-fa/phrases.xml

@@ -33,7 +33,7 @@
 <string name="poi_carpet">فروشگاه فرش</string>
 <string name="poi_chemist">فروشگاه مواد مخدر</string>
 <string name="poi_clothes">فروشگاه پوشاک</string>
-<string name="poi_child_clothes">\فروشگاه پوشاک کودکان</string>
+<string name="poi_clothes_children">\فروشگاه پوشاک کودکان</string>
 <string name="poi_shoes">کفش فروشی</string>
 <string name="poi_computer">فروشگاه کامپیوتر</string>
 <string name="poi_copyshop">فروشگاه چاپ و تکثیر</string>

OsmAnd/res/values-fr/phrases.xml

@@ -533,7 +533,7 @@
 	<string name="poi_frame">Magasin d\'encadrement</string>
 	<string name="poi_bathroom_furnishing">Magasin d\'équipement pour la salle de bain</string>
 	<string name="poi_bed">Magasin d\'équipement pour la chambre</string>
-	<string name="poi_child_clothes">Vêtements pour enfants</string>
+	<string name="poi_clothes_children">Vêtements pour enfants</string>
 	<string name="poi_curtain">Boutique de rideaux</string>
 	<string name="poi_dairy">Crèmerie</string>
 	<string name="poi_baby_goods">Articles pour bébé</string>

OsmAnd/res/values-gl/phrases.xml

@@ -17,7 +17,7 @@
 	<string name="poi_art">Tenda de arte</string>
 	<string name="poi_boutique">Tenda de moda</string>
 	<string name="poi_carpet">Tenda de alfombras</string>
-	<string name="poi_child_clothes">Roupa infantil</string>
+	<string name="poi_clothes_children">Roupa infantil</string>
 	<string name="poi_shoes">Zapataría</string>
 	<string name="poi_computer">Tenda de informática</string>
 	<string name="poi_copyshop">Copistaría</string>

OsmAnd/res/values-it/phrases.xml

@@ -29,7 +29,7 @@
 	<string name="poi_carpet">Negozio tappeti</string>
 	<string name="poi_chemist">Farmacia</string>
 	<string name="poi_clothes">Abbigliamento</string>
-	<string name="poi_child_clothes">Abbigliamento bambini</string>
+	<string name="poi_clothes_children">Abbigliamento bambini</string>
 	<string name="poi_shoes">Negozio calzature</string>
 	<string name="poi_computer">Negozio di computer</string>
 	<string name="poi_copyshop">Copisteria</string>

OsmAnd/res/values-ja/phrases.xml

@@ -94,7 +94,7 @@
 	<string name="poi_carpet">敷物店(Carpet shop)</string>
 	<string name="poi_chemist">ドラッグストア・薬局(Drug store)</string>
 	<string name="poi_clothes">衣料品店(Apparel store)</string>
-	<string name="poi_child_clothes">子供用衣料品店(Childrens apparel)</string>
+	<string name="poi_clothes_children">子供用衣料品店(Childrens apparel)</string>
 	<string name="poi_shoes">靴屋(Shoe store)</string>
 	<string name="poi_computer">パソコンショップ(Computer store)</string>
 	<string name="poi_copyshop">印刷、現像店(Copy shop)</string>

OsmAnd/res/values-ko/phrases.xml

@@ -31,7 +31,7 @@
 	<string name="poi_carpet">카펫 가게</string>
 	<string name="poi_chemist">약국</string>
 	<string name="poi_clothes">의류 매장</string>
-	<string name="poi_child_clothes">어린이 의류</string>
+	<string name="poi_clothes_children">어린이 의류</string>
 	<string name="poi_shoes">신발 가게</string>
 	<string name="poi_computer">컴퓨터 가게</string>
 	<string name="poi_copyshop">복사 가게</string>

OsmAnd/res/values-ml/phrases.xml

@@ -78,7 +78,7 @@
 	<string name="poi_charity">"ചാരിറ്റി ഷോപ് "</string>
 	<string name="poi_chemist">"മരുന്നു കട "</string>
 	<string name="poi_clothes">"തുണിക്കട "</string>
-	<string name="poi_child_clothes">കുട്ടികളുടെ വസ്ത്രങ്ങള്‍</string>
+	<string name="poi_clothes_children">കുട്ടികളുടെ വസ്ത്രങ്ങള്‍</string>
 	<string name="poi_shoes">"ചെരിപ്പ് കട "</string>
 	<string name="poi_candles">കാന്ഡില്‍ സ്ടോര്‍</string>
 	<string name="poi_computer">കംപ്യൂട്ടര്‍ സ്ടോര്‍</string>

OsmAnd/res/values-mr/phrases.xml

@@ -31,7 +31,7 @@
 
 	<string name="poi_bicycle">सायकल दुकान</string>
 	<string name="poi_clothes">कपड्याचे दुकान</string>
-	<string name="poi_child_clothes">मुलांचे कपडे</string>
+	<string name="poi_clothes_children">मुलांचे कपडे</string>
 	<string name="poi_computer">कॉम्प्युटर दुकान</string>
 	<string name="poi_curtain">पडद्याचे दुकान</string>
 	<string name="poi_florist">फुलांचे दुकान</string>

OsmAnd/res/values-nl/phrases.xml

@@ -33,7 +33,7 @@
 	<string name="poi_carpet">Tapijtwinkel</string>
 	<string name="poi_chemist">Drogisterij</string>
 	<string name="poi_clothes">Kledingwinkel</string>
-	<string name="poi_child_clothes">Kinderkledingwinkel</string>
+	<string name="poi_clothes_children">Kinderkledingwinkel</string>
 	<string name="poi_shoes">Schoenenwinkel</string>
 	<string name="poi_computer">Computerwinkel</string>
 	<string name="poi_copyshop">Kopieerzaak</string>

OsmAnd/res/values-pl/phrases.xml

@@ -31,7 +31,7 @@
 	<string name="poi_carpet">Sklep z dywanami</string>
 	<string name="poi_chemist">Apteka / Drogeria</string>
 	<string name="poi_clothes">Sklep odzieżowy</string>
-	<string name="poi_child_clothes">Sklep odzieżowy dla dzieci</string>
+	<string name="poi_clothes_children">Sklep odzieżowy dla dzieci</string>
 	<string name="poi_shoes">Sklep obuwniczy</string>
 	<string name="poi_computer">Sklep komputerowy</string>
 	<string name="poi_curtain">Sklep z zasłonami</string>

OsmAnd/res/values-pt-rBR/phrases.xml

@@ -71,7 +71,7 @@
 	<string name="poi_charity">Brechó beneficente</string>
 	<string name="poi_chemist">Drogaria</string>
 	<string name="poi_clothes">Loja de roupas</string>
-	<string name="poi_child_clothes">Vestuário infantil</string>
+	<string name="poi_clothes_children">Vestuário infantil</string>
 	<string name="poi_shoes">Sapataria</string>
 	<string name="poi_computer">Loja de informática</string>
 	<string name="poi_copyshop">Reprografia</string>

OsmAnd/res/values-ru/phrases.xml

@@ -38,7 +38,7 @@
 	<string name="poi_charity">Благотворительный магазин</string>
 	<string name="poi_chemist">Бытовая химия, косметика</string>
 	<string name="poi_clothes">Одежда</string>
-	<string name="poi_child_clothes">Детская одежда</string>
+	<string name="poi_clothes_children">Детская одежда</string>
 	<string name="poi_shoes">Обувь</string>
 	<string name="poi_computer">Компьютеры</string>
 	<string name="poi_copyshop">Ксерокопия, полиграфия</string>
@@ -2036,4 +2036,32 @@
 	<string name="poi_crop_asparagus">Выращиваемая культура: спаржа</string>
 	<string name="poi_crop_flowers">Выращиваемая культура: цветы</string>
 
+	<string name="poi_surveillance_indoor">Видеонаблюдение: внутри</string>
+	<string name="poi_surveillance_outdoor">Видеонаблюдение: снаружи</string>
+	<string name="poi_surveillance_public">Видеонаблюдение: в общественных местах</string>
+
+	<string name="poi_clothes_women">Женская одежда</string>
+	<string name="poi_clothes_underwear">Нижнее бельё</string>
+	<string name="poi_clothes_men">Мужская одежда</string>
+	<string name="poi_clothes_wedding">Свадебные платья</string>
+	<string name="poi_clothes_sports">Спортивная одежда</string>
+	<string name="poi_clothes_babies">Одежда для новорождённых</string>
+	<string name="poi_clothes_denim">Одежда из джинсовой ткани</string>
+	<string name="poi_clothes_workwear">Рабочая одежда</string>
+	<string name="poi_clothes_hats">Шляпы</string>
+	<string name="poi_clothes_fur">Меховая одежда</string>
+	<string name="poi_clothes_leather">Кожаная одежда</string>
+	<string name="poi_clothes_costumes">Карнавальные костюмы</string>
+	<string name="poi_clothes_traditional">Традиционная одежда</string>
+	<string name="poi_clothes_suits">Костюмы, смокинги</string>
+	<string name="poi_clothes_maternity">Одежда для беременных</string>
+	<string name="poi_clothes_vintage">Старинная одежда</string>
+	<string name="poi_clothes_oversize">Одежда для больших людей</string>
+	<string name="poi_clothes_schoolwear">Школьная форма</string>
+	<string name="poi_clothes_swimwear">Купальные костюмы</string>
+	<string name="poi_clothes_socks">Носки</string>
+	<string name="poi_clothes_shirts">Футболки</string>
+	<string name="poi_clothes_dance">Одежда для танцев</string>
+	<string name="poi_clothes_military">Военная одежда</string>
+
 </resources>

OsmAnd/res/values-sc/phrases.xml

@@ -31,7 +31,7 @@
 	<string name="poi_carpet">Butega de tapetes</string>
 	<string name="poi_chemist">Potecaria</string>
 	<string name="poi_clothes">Bestimenta</string>
-	<string name="poi_child_clothes">Bestimenta pro pitzinnos</string>
+	<string name="poi_clothes_children">Bestimenta pro pitzinnos</string>
 	<string name="poi_shoes">Butega de iscarpas</string>
 	<string name="poi_computer">Butega de informàtica</string>
 	<string name="poi_copyshop">Copisteria</string>

OsmAnd/res/values-sk/phrases.xml

@@ -52,7 +52,7 @@
 	<string name="poi_carpet">Koberce</string>
 	<string name="poi_chemist">Drogéria</string>
 	<string name="poi_clothes">Oblečenie/Konfekcia</string>
-	<string name="poi_child_clothes">Detské oblečenie</string>
+	<string name="poi_clothes_children">Detské oblečenie</string>
 	<string name="poi_shoes">Obuv</string>
 	<string name="poi_computer">Počítače</string>
 	<string name="poi_copyshop">Kopírovanie</string>

OsmAnd/res/values-sl/phrases.xml

@@ -226,7 +226,7 @@
 	<string name="poi_boutique">Modni butik</string>
 	<string name="poi_carpet">Trgovina s preprogami</string>
 	<string name="poi_clothes">Trgovina z oblačili</string>
-	<string name="poi_child_clothes">Trgovina z otroškimi oblačili</string>
+	<string name="poi_clothes_children">Trgovina z otroškimi oblačili</string>
 	<string name="poi_shoes">Trgovina s čevlji</string>
 	<string name="poi_curtain">Trgovina z zavesami</string>
 	<string name="poi_dive">Trgovina s potapljaško opremo</string>

OsmAnd/res/values-sq/phrases.xml

@@ -83,7 +83,7 @@
 	<string name="poi_charity">Dyqan bamirësie</string>
 	<string name="poi_chemist">Farmaci</string>
 	<string name="poi_clothes">Dyqan rrobash</string>
-	<string name="poi_child_clothes">Rroba fëmijësh</string>
+	<string name="poi_clothes_children">Rroba fëmijësh</string>
 	<string name="poi_shoes">Dyqan këpucësh</string>
 	<string name="poi_candles">Dyqan qirinjësh</string>
 	<string name="poi_computer">Dyqan kompjuterash</string>

OsmAnd/res/values-tr/phrases.xml

@@ -83,7 +83,7 @@
 	<string name="poi_charity">Hayır evi</string>
 	<string name="poi_chemist">İlaç deposu</string>
 	<string name="poi_clothes">Giyim mağazası</string>
-	<string name="poi_child_clothes">Çocuk Giyim</string>
+	<string name="poi_clothes_children">Çocuk Giyim</string>
 	<string name="poi_shoes">Ayakkabı mağazası</string>
 	<string name="poi_candles">Mum mağaza</string>
 	<string name="poi_computer">Bilgisayar mağazası</string>

OsmAnd/res/values-uk/phrases.xml

@@ -31,7 +31,7 @@
 	<string name="poi_carpet">Килими</string>
 	<string name="poi_chemist">Аптека</string>
 	<string name="poi_clothes">Магазин одягу</string>
-	<string name="poi_child_clothes">Дитячий одяг</string>
+	<string name="poi_clothes_children">Дитячий одяг</string>
 	<string name="poi_shoes">Магазин взуття</string>
 	<string name="poi_computer">Комп’ютерний магазин</string>
 	<string name="poi_copyshop">Копіювальні послуги, полігрфафія</string>

OsmAnd/res/values-zh-rTW/phrases.xml

@@ -74,7 +74,7 @@
 	<string name="poi_charity">慈善義賣店</string>
 	<string name="poi_chemist">藥局</string>
 	<string name="poi_clothes">服飾店</string>
-	<string name="poi_child_clothes">兒童服飾</string>
+	<string name="poi_clothes_children">兒童服飾</string>
 	<string name="poi_shoes">鞋店</string>
 	<string name="poi_computer">電腦商店</string>
 	<string name="poi_copyshop">複印店</string>

OsmAnd/res/values/phrases.xml

@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='utf-8'?>
+<?xml version='1.0' encoding='utf-8'?>
 <resources>
 <!--  categories -->
 	<string name="poi_shop">Shop</string>
@@ -85,7 +85,7 @@
 	<string name="poi_charity">Charity shop</string>
 	<string name="poi_chemist">Drug store</string>
 	<string name="poi_clothes">Apparel store</string>
-	<string name="poi_child_clothes">Childrens apparel</string>
+	<string name="poi_clothes_children">Childrens apparel</string>
 	<string name="poi_shoes">Shoe store</string>
 	<string name="poi_candles">Candles store</string>
 	<string name="poi_computer">Computer store</string>
@@ -2041,4 +2041,32 @@
 	<string name="poi_crop_asparagus">Crop: asparagus</string>
 	<string name="poi_crop_flowers">Crop: flowers</string>
 
+	<string name="poi_surveillance_indoor">Surveillance: indoor</string>
+	<string name="poi_surveillance_outdoor">Surveillance: outdoor</string>
+	<string name="poi_surveillance_public">Surveillance: public</string>
+
+	<string name="poi_clothes_women">Women's clothes</string>
+	<string name="poi_clothes_underwear">Underwear</string>
+	<string name="poi_clothes_men">Men's clothing</string>
+	<string name="poi_clothes_wedding">Wedding dresses</string>
+	<string name="poi_clothes_sports">Sports wear</string>
+	<string name="poi_clothes_babies">Babies clothes</string>
+	<string name="poi_clothes_denim">Clothing from denim</string>
+	<string name="poi_clothes_workwear">Workwear</string>
+	<string name="poi_clothes_hats">Hats</string>
+	<string name="poi_clothes_fur">Fur</string>
+	<string name="poi_clothes_leather">Leather</string>
+	<string name="poi_clothes_costumes">Costumes</string>
+	<string name="poi_clothes_traditional">Traditional clothes</string>
+	<string name="poi_clothes_suits">Suits</string>
+	<string name="poi_clothes_maternity">Maternity clothes</string>
+	<string name="poi_clothes_vintage">Vintage clothes</string>
+	<string name="poi_clothes_oversize">Oversize clothes</string>
+	<string name="poi_clothes_schoolwear">School wear</string>
+	<string name="poi_clothes_swimwear">Swimwear</string>
+	<string name="poi_clothes_socks">Socks</string>
+	<string name="poi_clothes_shirts">Shirts</string>
+	<string name="poi_clothes_dance">Clothes for dancing</string>
+	<string name="poi_clothes_military">Military clothes</string>
+
 </resources>