Merge branch 'master' of github.com:osmandapp/Osmand

OsmAnd/res/values-be/strings.xml

@@ -1951,4 +1951,6 @@
 	<string name="shared_string_manage">Кіраваць</string>
 	<string name="shared_string_edit">Правіць</string>
 	<string name="shared_string_open">Адчыніць</string>
+    <string name="filter_poi_hint">Фільтраваць паводле назвы</string>
+    <string name="search_poi_category_hint">Друкуйце, каб знайсьці ўсё</string>
     </resources>

OsmAnd/res/values-ca/strings.xml

@@ -1982,4 +1982,6 @@ Activant aquests canvis de visualització l\'estil del mapa canvia a "Hibern i e
 	<string name="shared_string_edit">Edita</string>
 	<string name="shared_string_places">Llocs</string>
 	<string name="shared_string_search">Cerca</string>
-	</resources>
+	<string name="filter_poi_hint">Filtre per nom</string>
+    <string name="search_poi_category_hint">Escriviu per cercar-ho tot</string>
+    </resources>

OsmAnd/res/values-cs/strings.xml

@@ -1924,5 +1924,6 @@ s často kladenými otázkami.</string>
 	<string name="shared_string_manage">Spravovat</string>
 	<string name="shared_string_edit">Upravit</string>
 	<string name="shared_string_open">Otevřít</string>
-    <string name="rendering_attr_OSMMapperAssistant_name">Pomocník editorů OSM map</string>
-	</resources>
+    <string name="rendering_attr_OSMMapperAssistant_name">Pomocník OSM editorů</string>
+	<string name="filter_poi_hint">Filtrovat podle jména</string>
+    </resources>

OsmAnd/res/values-da/phrases.xml

@@ -110,8 +110,8 @@
         <string name="poi_lift_gate">Vippebom</string>
         <string name="poi_toll_booth">Betalingsanlæg</string>
         <string name="poi_border_control">Grænsekontrol</string>
-        <string name="poi_traffic_calming_bump">Bumb</string>
-        <string name="poi_traffic_calming_hump">Bumb</string>
+        <string name="poi_traffic_calming_bump">Vejbumb</string>
+        <string name="poi_traffic_calming_hump">Vejbumb, bredt</string>
         <string name="poi_traffic_calming_cushion">Pudebumb</string>
         <string name="poi_traffic_calming_chicane">Chikane</string>
         <string name="poi_traffic_calming_rumble_strip">Rumlestriber</string>
@@ -132,7 +132,7 @@
         <string name="poi_parking_entrance">Indgang til parkering</string>
         <string name="poi_garages">Garage</string>
 
-        <string name="poi_public_transport_platform">Offentlig transport stoppested</string>
+        <string name="poi_public_transport_platform">Stoppested</string>
         <string name="poi_public_transport_platform_bus">Busstoppested</string>
         <string name="poi_public_transport_platform_trolleybus">Trolleybus stoppested</string>
         <string name="poi_bus_stop">Busstoppested</string>
@@ -414,7 +414,7 @@
         <string name="poi_social_centre">Socialcenter</string>
         <string name="poi_theatre">Teater</string>
         <string name="poi_circus">Cirkus</string>
-        <string name="poi_dance_floor">Dansegulv</string>
+        <string name="poi_dance_floor">Dansested</string>
         <string name="poi_nightclub">Natklub</string>
         <string name="poi_stripclub">Stripklub</string>
         <string name="poi_beach_resort">Badeby</string>
@@ -482,7 +482,7 @@
         <string name="poi_craft_sweep">Skorstensfejer</string>
         <string name="poi_craft_tailor">Skrædder</string>
         <string name="poi_craft_tiler">Brolægger</string>
-        <string name="poi_craft_tinsmith">Blikkenslager</string>
+        <string name="poi_craft_tinsmith">Pladesmed</string>
         <string name="poi_craft_upholsterer">Møbelpolstrer</string>
         <string name="poi_craft_watchmaker">Urmager</string>
         <string name="poi_craft_window_construction">Vinduefremstilling</string>
@@ -672,7 +672,7 @@
 	<string name="poi_child_clothes">Børnetøj</string>
 	<string name="poi_apartment">Lejlighed</string>
 
-	<string name="poi_public_transport_stop_position">Offentlig transport stoppested</string>
+	<string name="poi_public_transport_stop_position">Offentlig transport stopposition</string>
 	<string name="poi_halt">Jernbane stop</string>
 	<string name="poi_lodging">Logi</string>
 	<string name="poi_internet_access_wlan">Internetadgang: wlan</string>
@@ -767,11 +767,11 @@
 	<string name="poi_residential">Boligområde</string>
 
 	<string name="poi_recreation_ground">Rekreativtområde</string>
-	<string name="poi_village_green">Forte</string>
+	<string name="poi_village_green">Grønning</string>
 
 	<string name="poi_junction">Vejkryds</string>
 	<string name="poi_sailing">Sejlads</string>
-	<string name="poi_charity">Genbrugsbutik</string>
+	<string name="poi_charity">Genbrugsbutik, velgørenhed</string>
 	<string name="poi_photo">Fotoforretning</string>
 	<string name="poi_tomb">Grav</string>
 	<string name="poi_wilderness_hut">Vildmarkshytte</string>

OsmAnd/res/values-da/strings.xml

@@ -1995,4 +1995,6 @@
 	<string name="shared_string_open">Åben</string>
     <string name="shared_string_manage">Administrer</string>
 	<string name="shared_string_edit">Rediger</string>
-	</resources>
+	<string name="filter_poi_hint">Filtrer efter navn</string>
+    <string name="search_poi_category_hint">Tast for at søge alt</string>
+    </resources>

OsmAnd/res/values-de/phrases.xml

@@ -612,4 +612,28 @@
 	<string name="poi_radar">Radar</string>
 	<string name="poi_aquarium">Aquarium</string>
 	<string name="poi_team_handball">Handball</string>
-  </resources>
+  <string name="poi_shop">Geschäft</string>
+		<string name="poi_shop_food">Lebensmittel</string>
+	<string name="poi_emergency">Notfall</string>
+	<string name="poi_road_obstacle">Straßemhindernis</string>
+		<string name="poi_filling_station">Tankstelle</string>
+		<string name="poi_public_transport">ÖPNV</string>
+		<string name="poi_man_made">von Menschenhand</string>
+		<string name="poi_water_supply">Wasserversorgung</string>
+		<string name="poi_communication">Kommunikation</string>
+		<string name="poi_trash_disposal">Entsorgung</string>
+		<string name="poi_landuse">Landnutzung</string>
+	<string name="poi_education">Bildung</string>
+	<string name="poi_administrative">Verwaltung</string>
+	<string name="poi_healthcare">Gesundheitsektor</string>
+	<string name="poi_office">Büro</string>
+	<string name="poi_sport">Sport</string>
+	<string name="poi_tourism">Tourismus</string>
+		<string name="poi_sightseeing">Sehenswürdigkeiten</string>
+		<string name="poi_accomodation">Unterkunft</string>
+		<string name="poi_internet_access">Internet-Zugang</string>
+	<string name="poi_entertainment">Freizeit</string>
+		<string name="poi_club">Club</string>
+	<string name="poi_sustenance">Gastronomie</string>
+	<string name="poi_cafe_and_restaurant">Cafe und Restaurant</string>
+	</resources>

OsmAnd/res/values-fi/strings.xml

@@ -1,4 +1,5 @@
-<?xml version="1.0" encoding="utf-8" standalone="no"?><resources><string name="no_route">Ei reittiä</string>
+<?xml version='1.0' encoding='utf-8'?>
+<resources><string name="no_route">Ei reittiä</string>
 	<string name="delete_target_point">Poista välietappi</string>
 	<string name="target_point">Välietappi %1$s</string>
     <string name="intermediate_point">Välietappi %1$s</string>
@@ -700,4 +701,52 @@
 	<string name="driving_region_uk">Iso Britannia, Intia, Australia ja muut</string>
 	<string name="amenity_type_seamark">Merimerkki</string>
     <string name="app_modes_choose_descr">Valitse näkyvät profiilit</string>
-    </resources>
+    <string name="shared_string_open">Avaa</string>
+    <string name="shared_string_edit">Muokkaa</string>
+	<string name="shared_string_places">Paikat</string>
+	<string name="shared_string_search">Etsi</string>
+	<string name="shared_string_show_description">Näytä kuvaus</string>
+	<string name="shared_string_message">Viesti</string>
+	<string name="confirm_usage_speed_cameras">Monissa maissa (Saksa, Ranska, Italia, ym.) nopeusvalvontakameroiden varoitukset eivät ole käytettävissä lakien vuoksi. OsmAnd ei ota vastuutaa mikäli rikot näitä lakeja. Valitse kyllä vain jos olet valtuutettu käyttämään ominaisuutta.</string>
+	<string name="welmode_download_maps">Lataa kartta</string>
+	<string name="welcome_header">Tervetuloa</string>
+    <string name="current_route">Nykyinen reitti</string>
+    <string name="mark_to_delete">Merkitse poistaaksesi</string>
+	<string name="shared_string_go">Mene</string>
+	<string name="shared_string_do_not_use">Älä käytä</string>
+	<string name="shared_string_dismiss">Unohda</string>
+	<string name="shared_string_next">Seuraava</string>
+	<string name="shared_string_enable">Ota käyttöön</string>
+	<string name="shared_string_disable">Pois käytöstä</string>
+	<string name="shared_string_enabled">Käytössä</string>
+	<string name="shared_string_disabled">Ei käytössä</string>
+	<string name="shared_string_or">tai</string>
+	<string name="shared_string_and">ja</string>
+	<string name="shared_string_select_on_map">Valitse kartalta</string>
+	<string name="shared_string_deselect">Poista valinta</string>
+	<string name="shared_string_deselect_all">Poista kaikki valinnat</string>
+	<string name="shared_string_save_as_gpx">Tallena GPX reittinä</string>
+	<string name="shared_string_delete_all">Poista kaikki</string>
+	<string name="shared_string_share">Jaa</string>
+	<string name="shared_string_export">Vie</string>
+	<string name="shared_string_control_start">Aloita</string>
+	<string name="shared_string_control_stop">Lopeta</string>
+	<string name="shared_string_more">Lisää…</string>
+	<string name="shared_string_more_actions">Lisää toimintoja</string>
+	<string name="shared_string_remember_my_choice">Muista valinta</string>
+	<string name="shared_string_download">Lataa</string>
+	<string name="shared_string_downloading">Lataus käynnissä</string>
+	<string name="shared_string_show">Näytä</string>
+	<string name="shared_string_show_all">Näytä kaikki</string>
+	<string name="shared_string_favorite">Suosikki</string>
+	<string name="shared_string_favorites">Suosikit</string>
+	<string name="shared_string_address">Osoite</string>
+	<string name="shared_string_my_location">Sijainti</string>
+	<string name="shared_string_my_places">Omat paikat</string>
+	<string name="shared_string_my_favorites">Omat suosikit</string>
+	<string name="shared_string_my_tracks">Reittini</string>
+	<string name="shared_string_audio">Ääni</string>
+	<string name="shared_string_video">Video</string>
+	<string name="shared_string_photo">Kuva</string>
+	<string name="audionotes_plugin_name">Ääni/video muistiinpanot</string>
+	</resources>

OsmAnd/res/values-fr/strings.xml

@@ -2016,4 +2016,6 @@ Afghanistan, Albanie, Algérie, Allemagne, Andorre, Angola, Anguilla, Antigua-et
 	<string name="shared_string_manage">Gérer</string>
 	<string name="shared_string_edit">Modifier</string>
 	<string name="shared_string_open">Ouvrir</string>
+    <string name="filter_poi_hint">Filtrer par nom</string>
+    <string name="search_poi_category_hint">Rechercher partout</string>
     </resources>

OsmAnd/res/values-hu/strings.xml

@@ -1930,4 +1930,6 @@
 \n\nEz a nézet bármely megadott térképnagyításon a térképadatokban elérhető utazási részletek legnagyobb mennyiségét biztosítja (főként utak, ösvények, csapások és tájolási jelek).\n\nÉrthetően ábrázolja az utak minden típusát is egyértelmű színkódolásokkal, amely akkor hasznos, ha például nagy járműveket vezet.\n\nTovábbá speciális túralehetőségeket is biztosít, úgymint kerékpárutak vagy az Alpok hegyi útjainak megjelenítése.\n\nNem szükséges speciális térképet letölteni, a nézet a szabványos térképeinkből kerül előállításra.\n\nEz a nézet visszaállítható, ha újra kikapcsolja az aktiválást itt, vagy a „Térképstílus” megváltoztatásával a „Térkép beállítása” alatt igény szerint. "</string>
 	<string name="plugin_nautical_descr">"Ez a bővítmény az OsmAnd térképet és a navigációs alkalmazást gazdagítja hajózási térképek készítésével csónakázáshoz, vitorlázáshoz és a vízi sportok egyéb típusaihoz.\n\nEgy speciális térkép-kiegészítő az OsmAnd alkalmazáshoz biztosítani fogja az összes hajózási navigációs jelzést és grafikon szimbólumot a szárazföldi, valamint a partközeli navigációhoz. Minden egyen navigációs jelzés leírása olyan részleteket biztosít, amely azok azonosításához és a jelentésükhöz szükségesek (kategória, alak, szín, sorozat, hivatkozás, stb.).\n\nAz OsmAnd hagyományos térképstílusainak egyikéhez való visszatéréshez egyszerűen kapcsolja ki ezen bővítmény aktiválást újra, vagy változtassa meg a „Térképstílust” a „Térkép beállítása” alatt igény szerint. "</string>
 	<string name="plugin_ski_descr">"Az OsmAnd ezen bővítménye a keze ügyébe helyezi a globális lesikló pályák, az országok közti sífutópályák, az alpesi síutak, kabinok és sífelvonók részleteit. Az utak és a pályák nehézség szerinti színkódokkal vannak megjelenítve, és egy speciális „Téli” térképstílussal vannak ábrázolva, amely beolvaszt egy hószínű téli tájat.\n\nA nézet aktiválása megváltoztatja a térképstílust „Tél és síelésre”, megjelenítve a táj minden elemét a téli körülmények szerint. Ez a nézet visszaállítható, ha újra kikapcsolja az aktiválást itt, vagy a „Térképstílus” megváltoztatásával a „Térkép beállítása” alatt igény szerint. "</string>
-	</resources>
+	<string name="filter_poi_hint">Szűrés név szerint</string>
+    <string name="search_poi_category_hint">Gépelj az összes kereséséhez</string>
+    </resources>

OsmAnd/res/values-it/strings.xml

@@ -800,7 +800,7 @@
   <string name="backToMenu">Torna al menu</string>
   <string name="zoomOut">Zoom indietro</string>
   <string name="zoomIn">Zoom avanti</string>
-  <string name="zoomIs">Lo zoom è</string>
+  <string name="zoomIs">Il livello dello zoom è</string>
   <string name="north">nord</string>
   <string name="north_north_east">nord-nord-est</string>
   <string name="north_east">nord-est</string>
@@ -834,8 +834,8 @@
   <string name="direction_style_clockwise">Bussola (12 settori)</string>
   <string name="settings_direction_style">Stile della direzione</string>
   <string name="settings_direction_style_descr">Scegli lo stile in cui vengono espresse in movimento le direzioni relative</string>
-  <string name="auto_announce_on">Inizia l\'auto-segnalazione</string>
-  <string name="auto_announce_off">Ferma l\'autosegnalazione</string>
+  <string name="auto_announce_on">Avvia gli annunci automatici</string>
+  <string name="auto_announce_off">Ferma gli annunci automatici</string>
   <string name="scroll_map_by_gestures_descr">Muovi la mappa con i gesti sullo schermo tattile</string>
   <string name="scroll_map_by_gestures">Scorrimento naturale della mappa</string>
   <string name="i_am_here">Io sono qui</string>
@@ -2134,8 +2134,8 @@ Si consiglia di aggiungere uno o più punti intermedi per migliorarne le prestaz
     <string name="general_settings_2">Impostazioni generali</string>
 	<string name="shared_string_clear_all">Cancella tutto</string>
 	<string name="shared_string_my_location">Mia posizione</string>
-	<string name="shared_string_my_favorites">Miei preferiti</string>
-	<string name="shared_string_my_tracks">Mie tracce</string>
+	<string name="shared_string_my_favorites">I miei preferiti</string>
+	<string name="shared_string_my_tracks">Le mie tracce</string>
 	<string name="shared_string_currently_recording_track">Traccia in corso di registrazione</string>
 	<string name="waypoint_visit_after">Visita dopo</string>
     <string name="waypoint_visit_before">Visita prima</string>
@@ -2171,7 +2171,9 @@ Si consiglia di aggiungere uno o più punti intermedi per migliorarne le prestaz
 	<string name="shared_string_places">Luoghi</string>
 	<string name="shared_string_search">Cerca</string>
 	<string name="shared_string_open">Apri</string>
-    <string name="rendering_attr_OSMMapperAssistant_name">Assistente mappatura OSM</string>
+    <string name="rendering_attr_OSMMapperAssistant_name">Assistente mappatore OSM</string>
 	<string name="shared_string_manage">Gestisci</string>
 	<string name="shared_string_edit">Modifica</string>
-	</resources>
+	<string name="filter_poi_hint">Filtra per nome</string>
+    <string name="search_poi_category_hint">Scrivi cercare fra tutti</string>
+    </resources>

OsmAnd/res/values-ja/phrases.xml

@@ -5,7 +5,7 @@
 	<string name="poi_bus_stop">バス停(Bus stop)</string>
 	<string name="poi_car_rental">レンタカー(Car rental)</string>
 	<string name="poi_car_wash">洗車(Car wash)</string>
-	<string name="poi_casino">賭場(Casino)</string>
+	<string name="poi_casino">賭場・カジノ(Casino)</string>
 	<string name="poi_city">市(City)</string>
 	<string name="poi_college">大学(College)</string>
 	<string name="poi_dentist">歯科医(Dentist)</string>
@@ -13,7 +13,7 @@
 	<string name="poi_hotel">ホテル(Hotel)</string>
 	<string name="poi_kindergarten">幼稚園(Kindergarten)</string>
 	<string name="poi_library">図書館(Library)</string>
-	<string name="poi_pub">パブ・立ち呑み屋(Pub)</string>
+	<string name="poi_pub">パブ・居酒屋(Pub)</string>
 	<string name="poi_sauna">サウナ(Sauna)</string>
 	<string name="poi_school">学校(School)</string>
 	<string name="poi_general">雑貨店(General store)</string>
@@ -541,6 +541,149 @@
 	<string name="poi_funicular">ケーブルカー(Funicular)</string>
 	<string name="poi_resort">リゾート地(Resort)</string>
 
-	<string name="poi_club_art">芸術クラブ(Art club)</string>
-	<string name="poi_club_astronomy">天文クラブ(Astronomy club)</string>
+	<string name="poi_club_art">芸術同好会(Art club)</string>
+	<string name="poi_club_astronomy">天文学同好会(Astronomy club)</string>
+	<string name="poi_club_computer">コンピューター同好会(Computer club)</string>
+	<string name="poi_club_board_games">ボードゲーム同好会(Board games club)</string>
+	<string name="poi_club_motorcycle">オートバイ同好会(Motorcycle club)</string>
+	<string name="poi_club_sport">スポーツ同好会(Sports club)</string>
+	<string name="poi_club_game">ゲーム同好会(Game club)</string>
+	<string name="poi_club_automobile">自動車同好会(Automobile club)</string>
+	<string name="poi_club_chess">チェス同好会(Chess club)</string>
+	<string name="poi_club_cinema">映画同好会(Cinema club)</string>
+	<string name="poi_club_fan">ファンクラブ(Fan club)</string>
+	<string name="poi_club_fishing">釣り同好会(Fishing club)</string>
+	<string name="poi_club_veterans">退役軍人会(Veterans club)</string>
+	<string name="poi_club_linux">Linuxユーザーグループ(Linux club)</string>
+	<string name="poi_club_theatre">演劇同好会・劇団(Theater club)</string>
+	<string name="poi_club_history">歴史同好会(History club)</string>
+	<string name="poi_club_music">音楽同好会・楽団(Music club)</string>
+	<string name="poi_club_ethnic">国際交流会(Ethnic club)</string>
+	<string name="poi_club_nature">アウトドア・自然に関する同好会(Nature club)</string>
+	<string name="poi_club_photography">写真同好会(Photography club)</string>
+	<string name="poi_club_hunting">猟友会(Hunting club)</string>
+	<string name="poi_club_shooting">射撃同好会(Shooting club)</string>
+	<string name="poi_club_tourism">旅行同好会(Tourism club)</string>
+	<string name="poi_club_charity">慈善団体・ボランティア団体(Charity club)</string>
+
+	<string name="poi_piste_downhill">ダウンヒル(Downhill)</string>
+	<string name="poi_piste_nordic">ノルディック・クロスカントリー(Nordic)</string>
+	<string name="poi_piste_skitour">登山スキー(Skitour)</string>
+	<string name="poi_piste_hike">ハイキング(Hike)</string>
+	<string name="poi_piste_sleigh">中型～大型ソリ(Sleigh)</string>
+	<string name="poi_piste_sled">小型ソリ(Sled)</string>
+	<string name="poi_piste_snow_park">スノーパーク・雪中公園(Snow park)</string>
+	<string name="poi_piste_playground">雪遊び場・キッズゲレンデ(Playground)</string>
+	<string name="poi_piste_ice_skate">アイススケート(Ice skate)</string>
+
+	<string name="poi_arts_centre">アート公演・制作所(Arts centre)</string>
+	<string name="poi_cinema">映画館(Cinema)</string>
+	<string name="poi_community_centre">コミュニティーセンター・集会所(Community centre)</string>
+	<string name="poi_social_centre">社会福祉センター(Social centre)</string>
+	<string name="poi_theatre">劇場(Theatre)</string>
+	<string name="poi_circus">サーカス(Circus)</string>
+	<string name="poi_dance_floor">ダンスフロア(Dance floor)</string>
+	<string name="poi_nightclub">ナイトクラブ・ディスコ(Nightclub)</string>
+	<string name="poi_stripclub">ストリップクラブ(Stripclub)</string>
+	<string name="poi_beach_resort">海水浴場・リゾートビーチ(Beach resort)</string>
+	<string name="poi_dog_park">ドッグラン(Dog park)</string>
+	<string name="poi_leisure_fishing">釣り場・釣り堀(Fishing place)</string>
+	<string name="poi_hunting_stand">狩猟スタンド・狩猟用櫓(Hunting stand)</string>
+	<string name="poi_harbour">港(Harbor)</string>
+	<string name="poi_marina">船舶係留所・マリーナ(Marina)</string>
+	<string name="poi_miniature_golf">ミニチュアゴルフ・パットゴルフ(Miniature golf)</string>
+	<string name="poi_playground">児童公園(Playground)</string>
+	<string name="poi_bench">ベンチ(Bench)</string>
+	<string name="poi_swimming_pool">プール(Swimming pool)</string>
+	<string name="poi_water_park">レジャープール(Water park)</string>
+	<string name="poi_park">公園(Park)</string>
+	<string name="poi_recreation_ground">レクリエーション広場(Recreation ground)</string>
+	<string name="poi_village_green">共有地(Village green)</string>
+
+	<string name="poi_cafe">喫茶店・カフェ(Cafe)</string>
+	<string name="poi_biergarten">ビアガーデン(Biergarten)</string>
+	<string name="poi_restaurant">レストラン・食堂(Restaurant)</string>
+	<string name="poi_fast_food">ファーストフード(Fast food)</string>
+	<string name="poi_bar">バー・立ち呑み屋(Bar)</string>
+	<string name="poi_food_court">フードコート(Food court)</string>
+	<string name="poi_drinking_water">給水所・水飲み場(Drinking water)</string>
+	<string name="poi_barbecue">バーベキュー場(Barbecue)</string>
+
+	<string name="poi_craft_agricultural_engines">農業機械設計作成(Agricultural engines)</string>
+	<string name="poi_craft_basket_maker">籠職人(Basket maker)</string>
+	<string name="poi_craft_beekeeper">養蜂場(Beekeeper)</string>
+	<string name="poi_craft_blacksmith">鍛冶場(Blacksmith)</string>
+	<string name="poi_craft_brewery">ビール醸造所(Brewery)</string>
+	<string name="poi_craft_boatbuilder">造船所(Boatbuilder)</string>
+	<string name="poi_craft_bookbinder">製本所(Bookbinder)</string>
+	<string name="poi_craft_carpenter">工務店・大工(Carpenter)</string>
+	<string name="poi_craft_carpet_layer">カーペット店(Carpet layer)</string>
+	<string name="poi_craft_caterer">仕出し店(Caterer)</string>
+	<string name="poi_craft_clockmaker">時計工房(Clockmaker)</string>
+	<string name="poi_craft_dressmaker">仕立て屋(Dressmaker)</string>
+	<string name="poi_craft_electrician">電気工事店(Electrician)</string>
+	<string name="poi_craft_gardener">造園店(Gardener)</string>
+	<string name="poi_craft_glaziery">ガラス店(Glaziery craft)</string>
+	<string name="poi_craft_handicraft">日用品工房(Handicraft)</string>
+	<string name="poi_craft_hvac">空調設計・製作事務所(Heating, ventilation, air conditioning)</string>
+	<string name="poi_craft_insulation">断熱工事・事務所(Insulation)</string>
+	<string name="poi_craft_jeweller">装飾品修理・工房(Jeweller)</string>
+	<string name="poi_craft_locksmith">錠前屋(Locksmith)</string>
+	<string name="poi_craft_key_cutter">合鍵屋(Key cutter)</string>
+	<string name="poi_craft_metal_construction">金属加工所(Metal construction craft)</string>
+	<string name="poi_craft_optician">レンズ工場(Optician)</string>
+	<string name="poi_craft_painter">塗装店(Painter)</string>
+	<string name="poi_craft_parquet_layer">床材店(Parquet layer)</string>
+	<string name="poi_craft_photographer">写真館・フォトスタジオ(Photographer)</string>
+	<string name="poi_craft_photographic_laboratory">現像所(Photographic laboratory)</string>
+	<string name="poi_craft_plasterer">左官店(Plasterer)</string>
+	<string name="poi_craft_plumber">配管工(Plumber)</string>
+	<string name="poi_craft_pottery">陶芸工房(Pottery craft)</string>
+	<string name="poi_craft_rigger">艤装職(Rigger)</string>
+	<string name="poi_craft_roofer">屋根屋・屋根葺き職人(Roofer)</string>
+	<string name="poi_craft_saddler">馬具・車修理屋(Saddler)</string>
+	<string name="poi_craft_sailmaker">帆修理・製作(Sailmaker)</string>
+	<string name="poi_craft_sawmill">製材所(Sawmill)</string>
+	<string name="poi_craft_scaffolder">とび職事務所(Scaffolder)</string>
+	<string name="poi_craft_sculptor">彫刻工房(Sculptor)</string>
+	<string name="poi_craft_shoemaker">靴工場(Shoemaker)</string>
+	<string name="poi_craft_stand_builder">イベント設営事務所(Stand builder)</string>
+	<string name="poi_craft_stonemason">石工・石材加工所(Stonemason)</string>
+	<string name="poi_craft_sun_protection">日よけ製作所(Sun protection craft)</string>
+	<string name="poi_craft_sweep">煙突掃除事務所(Sweep)</string>
+	<string name="poi_craft_tailor">仕立て屋(Tailor)</string>
+	<string name="poi_craft_tiler">タイル店(Tiler)</string>
+	<string name="poi_craft_tinsmith">ブリキ製品工場(Tinsmith)</string>
+	<string name="poi_craft_upholsterer">家具製造所(Upholsterer)</string>
+	<string name="poi_craft_watchmaker">腕時計職人(Watchmaker)</string>
+	<string name="poi_craft_window_construction">窓設置工(Window construction)</string>
+
+	<string name="poi_funeral_directors">葬儀屋(Funeral directors)</string>
+	<string name="poi_craft_computer">コンピューター技師(Computer craft)</string>
+	<string name="poi_beauty">SPA・ネイル・総合美容店(Beauty salon)</string>
+	<string name="poi_beauty_salon_nails">ネイルサロン(Nail salon)</string>
+	<string name="poi_hairdresser">美容室(Hairdresser)</string>
+	<string name="poi_massage">マッサージ店・整体院(Massage salon)</string>
+	<string name="poi_tattoo">刺青・彫師(Tattoo salon)</string>
+	<string name="poi_dry_cleaning">ドライクリーニング屋(Dry cleaning)</string>
+	<string name="poi_laundry">コインランドリー(Laundry)</string>
+	<string name="poi_car_sharing">カーシェアリング(Car sharing)</string>
+	<string name="poi_boat_sharing">ボートシェアリング(Boat sharing)</string>
+	<string name="poi_dock">ドック(Dock)</string>
+	<string name="poi_toilets">トイレ(Restroom)</string>
+	<string name="poi_brothel">売春宿(Brothel)</string>
+	<string name="poi_smoking_area">喫煙所・喫煙エリア(Smoking area)</string>
+	<string name="poi_mortuary">遺体安置所(Mortuary)</string>
+	<string name="poi_crematorium">火葬場(Crematorium)</string>
+	<string name="poi_internet_cafe">ネットカフェ(Internet cafe)</string>
+
+	<string name="poi_atm">ATM・CD(ATM)</string>
+	<string name="poi_money_lender">消費者金融(Money lender)</string>
+	<string name="poi_pawnbroker">質屋(Pawnbroker)</string>
+	<string name="poi_bureau_de_change">両替商・両替機(Bureau de change)</string>
+	<string name="poi_accountant">会計事務所(Accountant)</string>
+	<string name="poi_bitcoin_yes">Bitcoin支払い対応(Bitcoin payment)</string>
+
+	<string name="poi_cave_entrance">洞窟入口(Cave entrance)</string>
+	<string name="poi_peak">山頂(Mountain peak)</string>
 	</resources>

OsmAnd/res/values-ko/strings.xml

@@ -2229,4 +2229,6 @@
 	<string name="shared_string_edit">편집</string>
 	<string name="shared_string_places">장소</string>
 	<string name="shared_string_search">검색</string>
-	</resources>
+	<string name="filter_poi_hint">이름으로 필터링</string>
+    <string name="search_poi_category_hint">모든 검색 유형</string>
+    </resources>

OsmAnd/res/values-nl/strings.xml

@@ -199,7 +199,7 @@
   <string name="init_native_library">Voorbereiden interne bibliotheek…</string>
   <string name="choose_auto_follow_route">Kaartpositie volgen</string>
   <string name="choose_auto_follow_route_descr">Tijd totdat kaartweergave wordt gesynchroniseerd met de positie</string>
-  <string name="auto_follow_route_never">Nooit (druk op de blauwe pijl om begeleiding handmatig te starten)</string>
+  <string name="auto_follow_route_never">Nooit (druk op \'Start\' om de begeleiding te starten)</string>
   <string name="auto_follow_route_navigation">Alleen automatisch volgen tijdens navigatie</string>
   <string name="auto_follow_route_navigation_descr">Alleen automatisch volgen tijdens navigatie.</string>
   <string name="auto_follow_location_enabled">Automatisch kaart volgen in gebruik.</string>
@@ -1487,8 +1487,8 @@ Afghanistan, Albanie, Algerije, Andorra, Angola, Anguilla, Antigua en Barbuda, A
 	<string name="speak_street_names">Straatnamen aankondigen (TTS)</string>
         
     
-    <string name="driving_region_descr">Regio voor autorijden: VS, Europa, GB, Azië en andere</string>
-	<string name="driving_region">Land</string>
+    <string name="driving_region_descr">Regio voor autorijden: VS, Europa, GB, Azië en overige</string>
+	<string name="driving_region">Regio voor autorijden</string>
 	<string name="driving_region_japan">Japan</string>
 	<string name="driving_region_us">Verenigde Staten</string>
 	<string name="driving_region_canada">Canada</string>
@@ -1808,13 +1808,13 @@ Afghanistan, Albanie, Algerije, Andorra, Angola, Anguilla, Antigua en Barbuda, A
     
     <string name="local_index_select_gpx_file">Selecteer om te bekijken</string>
     <string name="route_descr_destination">Bestemming</string>
-    <string name="no_index_file_to_download">Geen bestanden gevonden: controleer de internetverbinding.</string>
+    <string name="no_index_file_to_download">Geen downloads gevonden: controleer de internetverbinding.</string>
     <string name="osmo_gpx_points_downloaded">OsMo punten: %1$s opgehaald.</string>
     <string name="osmo_auto_connect_descr">Verbind automatisch met OsMo service bij het opstarten van de applicatie</string>
     <string name="osmo_auto_connect">Automatisch verbinding maken</string>
     <string name="osmo_start_service">OsMo service</string>
     <string name="osmo_gpx_track_downloaded">OsMo track: %1$s opgehaald.</string>
-    <string name="osmo_group_information_desc">" - Alle groepen zijn openbaar! Om anoniem te blijven moet u apparaten rechtstreeks met elkaar verbinden via hun Tracker-ID, en niet in een groep.\n- Er kunnen maximaal 16 deelnemers in een groep.\n- Als er gedurende 2 weken geen of nog maar 1 deelnemer actief is, wordt de groep verwijderd.\n- Een groep kan besloten worden gemaakt (\"alleen op uitnodiging\"). Het beheer daarvan moet op de beheerspagina gebeuren.\n- Als u een groep nodig heeft met andere voorwaarden, ga dan naar http://osmo.mobi"</string>
+    <string name="osmo_group_information_desc">" - Alle groepen zijn openbaar! Om anoniem te blijven moet u apparaten rechtstreeks met elkaar verbinden via hun Tracker-ID, en niet in een groep.\n- Er kunnen maximaal 8 deelnemers in een groep.\n- Als er gedurende 2 weken geen of nog maar 1 deelnemer actief is, wordt de groep verwijderd.\n- Een groep kan besloten worden gemaakt (\"alleen op uitnodiging\"). Het beheer daarvan moet op de beheerspagina gebeuren.\n- Als u een groep nodig heeft met andere voorwaarden, ga dan naar http://osmo.mobi"</string>
     <string name="osmo_group_information">Lees dit voordat u een groep maakt!</string>
     <string name="osmo_not_signed_in">Kon niet inloggen op OsMo</string>
     <string name="osmo_group_by_invite">Alleen toegang met uitnodiging</string>
@@ -2152,4 +2152,16 @@ Afghanistan, Albanie, Algerije, Andorra, Angola, Anguilla, Antigua en Barbuda, A
 	<string name="osmo_grop_name_length_alert">De naam van een groep moet uit minstens 3 tekens bestaan!</string>
 	<string name="agps_info">A-GPS info</string>
 	<string name="agps_data_last_downloaded">Laatste A-GPS data gedownload: %1$s</string>
-    </resources>
+    <string name="filter_poi_hint">Filter op naam</string>
+    <string name="search_poi_category_hint">Tik om alles te doorzoeken</string>
+    <string name="shared_string_open">Open</string>
+    <string name="rendering_attr_OSMMapperAssistant_name">OSM cartografie-assistent</string>
+	<string name="shared_string_manage">Beheer</string>
+	<string name="shared_string_edit">Bewerk</string>
+	<string name="shared_string_places">Plaatsen</string>
+	<string name="shared_string_search">Zoek</string>
+	<string name="shared_string_show_description">Toon beschrijving</string>
+	<string name="shared_string_message">Bericht</string>
+	<string name="shared_string_do_not_use">Niet gebruiken</string>
+	<string name="shared_string_address">Adres</string>
+	</resources>

OsmAnd/res/values-ru/strings.xml

@@ -1960,4 +1960,5 @@
     <string name="rendering_attr_OSMMapperAssistant_name">Помощник картографа OSM</string>
 	<string name="shared_string_manage">Управление</string>
 	<string name="shared_string_edit">Редактировать</string>
-	</resources>
+	<string name="filter_poi_hint">Фильтровать по имени</string>
+    </resources>

OsmAnd/res/values-sc/phrases.xml

@@ -643,5 +643,34 @@
 		<string name="poi_accomodation">Allògiu</string>
 		<string name="poi_smoking_area">Àrea fumatores</string>
 	<string name="poi_piste_playground">Parcu giogos</string>
-	<string name="poi_car_sharing"></string>
+	<string name="poi_car_sharing"/>
+	<string name="poi_photo">Butega de fotografia</string>
+	<string name="poi_fuel:diesel">Diesel</string>
+	<string name="poi_fuel:gtl_diesel">GTL diesel</string>
+	<string name="poi_fuel:hgv_diesel">HGV diesel</string>
+	<string name="poi_fuel:biodiesel">Bio diesel</string>
+	<string name="poi_fuel:lpg">LPG</string>
+	<string name="poi_fuel:ethanol">Etanolo</string>
+	<string name="poi_fuel:methanol">Metanolo</string>
+	<string name="poi_fuel:lh2">Idrògenu lìcuidu</string>
+	<string name="poi_fuel:electricity">Eletritzidade</string>
+	<string name="poi_rest_area">Logu de pasada</string>
+
+	<string name="poi_industrial">Àrea industriale</string>
+	<string name="poi_forest">Padente artifitziale o amministrada dae sas pessones</string>
+	<string name="poi_meadow">Pradu</string>
+	<string name="poi_canal">Canale</string>
+	<string name="poi_reservoir">Lagu artifitziale</string>
+	<string name="poi_gasometer">Gasòmetru</string>
+	<string name="poi_silo">Lòssia</string>
+	<string name="poi_storage_tank">Serbatòiu</string>
+
+	<string name="poi_training">Istrutura de addestramentu</string>
+	<string name="poi_quarter">Bighinadu</string>
+	<string name="poi_residential">Àrea de residèntzia</string>
+
+	<string name="poi_handball">Botza-manu (Pallamanu)</string>
+	<string name="poi_tomb">Tumba/losa</string>
+	<string name="poi_water">Abba</string>
+	<string name="poi_wood">Linna</string>
 	</resources>

OsmAnd/res/values-sc/strings.xml

@@ -1944,4 +1944,5 @@
     <string name="shared_string_manage">Amministra</string>
 	<string name="shared_string_edit">Modìfica</string>
 	<string name="rendering_attr_OSMMapperAssistant_name">Assistente mapadura OSM</string>
-	</resources>
+	<string name="filter_poi_hint">Filtra pro nùmene</string>
+    </resources>

OsmAnd/res/values-sk/strings.xml

@@ -2149,4 +2149,6 @@ Afganistan, Albánsko, Alžírsko, Andora, Angola, Anguilla, Antigua a Barbuda,
     <string name="rendering_attr_OSMMapperAssistant_name">Asistent mapera OSM</string>
 	<string name="shared_string_manage">Spravovať</string>
 	<string name="shared_string_edit">Upraviť</string>
-	</resources>
+	<string name="filter_poi_hint">Filtrovať podľa názvu</string>
+    <string name="search_poi_category_hint">Píšte pre vyhľadanie všetkých</string>
+    </resources>

OsmAnd/res/values-sv/strings.xml

@@ -1860,4 +1860,6 @@
 	<string name="shared_string_open">Öppna</string>
     <string name="shared_string_manage">Hantera</string>
 	<string name="shared_string_edit">Redigera</string>
-	</resources>
+	<string name="filter_poi_hint">Filtrera efter namn</string>
+    <string name="search_poi_category_hint">Skriv för att söka alla</string>
+    </resources>

OsmAnd/res/values-uk/phrases.xml

@@ -131,4 +131,12 @@
 	<string name="poi_osmwiki">Вікіпедія</string>
 	<string name="poi_user_defined_other">Визначено користувачем</string>
 	
-	</resources>
+	<string name="poi_shop_food">Продовольчий магазин</string>
+	<string name="poi_road_obstacle">Дорожні перешкоди</string>
+		<string name="poi_filling_station">АЗС</string>
+		<string name="poi_personal_transport">Особистий транспорт</string>
+		<string name="poi_public_transport">Громадський транспорт</string>
+		<string name="poi_air_transport">Авіаційний транспорт</string>
+		<string name="poi_water_transport">Водний транспорт</string>
+		<string name="poi_bicycle_transport">Велосипедний траспорт</string>
+		</resources>

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

@@ -1969,4 +1969,6 @@
     <string name="rendering_attr_OSMMapperAssistant_name">OSM 制圖助手</string>
 	<string name="shared_string_manage">管理</string>
 	<string name="shared_string_edit">編輯</string>
-	</resources>
+	<string name="filter_poi_hint">依名稱篩選</string>
+    <string name="search_poi_category_hint">鍵入以搜尋全部</string>
+    </resources>