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

OsmAnd/res/values-be/phrases.xml

@@ -915,7 +915,7 @@
 	<string name="poi_enforcement_check">Патрабаванне:кантроль</string>
 	<string name="poi_enforcement_access">Патрабаванне:доступ</string>
 	<string name="poi_enforcement_traffic_signals">Патрабаванне:святлафоры</string>
-	<string name="poi_fee">Аплата</string>
+	<string name="poi_fee_yes">Аплата</string>
 
 	<string name="poi_disused">Невыкарыстоўваемы</string>
 
@@ -953,4 +953,8 @@
 	<string name="poi_access_agricultural">Сельгасп. доступ</string>
 
 	<string name="poi_access_destination">Транзіт забаронены</string>
+	<string name="poi_capital">Сталіца</string>
+	<string name="poi_fee_no">Бясплатна</string>
+
+	<string name="poi_monitoring_station">Станцыя назіраньня</string>
 	</resources>

OsmAnd/res/values-be/strings.xml

@@ -2056,4 +2056,5 @@
 	<string name="error_message_pattern">Памылка: {0}</string>
 <string name="no_updates_available">Няма даступных абнаўленьняў</string>
     <string name="we_really_care_about_your_opinion">Нас вельмі цікавіць ваша меркаваньне і нам важна пачуць вас.</string>
+	<string name="rendering_value_boldOutline_name">Тлусты абрыс</string>
     </resources>

OsmAnd/res/values-ca/phrases.xml

@@ -928,7 +928,7 @@
 	<string name="poi_basin">Bassa</string>
 	<string name="poi_bump_gate">Porta batent de tancament controlat</string>
 	<string name="poi_country">País</string>
-	<string name="poi_fee">Pagament</string>
+	<string name="poi_fee_yes">Pagament</string>
 
 	<string name="poi_abandoned_poi">Objectes perduts</string>
 	<string name="poi_node_networks">Xarxa de nodes de senderisme/ciclisme</string>
@@ -948,4 +948,8 @@
 	<string name="poi_access_delivery">Accés per lliuraments</string>
 	<string name="poi_access_agricultural">Accés per activitats agrícoles</string>
 
+	<string name="poi_monitoring_station">Centre de control</string>
+	<string name="poi_capital">Capital</string>
+	<string name="poi_fee_no">Sense cap cost</string>
+
 	</resources>

OsmAnd/res/values-ca/strings.xml

@@ -2087,4 +2087,5 @@ Per retornar a l\'estil habitual dels mapes d\'OsmAnd, només cal desactivar aqu
 	<string name="error_message_pattern">Error: {0}</string>
 <string name="no_updates_available">No hi ha actualitzacions disponibles</string>
     <string name="we_really_care_about_your_opinion">"Valorem molt la vostra opinió i és important per nosaltres  disposar dels vostres comentaris."</string>
+	<string name="rendering_value_boldOutline_name">Contorn destacat</string>
     </resources>

OsmAnd/res/values-cs/phrases.xml

@@ -921,7 +921,7 @@
 	<string name="poi_enforcement_access">Vynucení:přístup</string>
 	<string name="poi_enforcement_toll">Vynucení:mýto</string>
 
-<string name="poi_fee">Poplatek</string>
+<string name="poi_fee_yes">Poplatek</string>
 
 	<string name="poi_country">Krajina</string>
 	<string name="poi_abandoned_poi">Opuštěný objekt</string>

OsmAnd/res/values-da/phrases.xml

@@ -940,7 +940,7 @@
 	<string name="poi_enforcement_toll">Vejafgiftskontrol</string>
 
 <string name="poi_country">Landlig</string>
-	<string name="poi_fee">Gebyr</string>
+	<string name="poi_fee_yes">Gebyr</string>
 
 	<string name="poi_abandoned_poi">Forladt objekt</string>
 	<string name="poi_route_hiking_iwn_poi">International vandrerute</string>
@@ -960,4 +960,8 @@
 	<string name="poi_access_delivery">Adgang for levering</string>
 	<string name="poi_access_agricultural">Adgang for landbrug</string>
 
+	<string name="poi_monitoring_station">Målestation</string>
+	<string name="poi_capital">Hovedstad</string>
+	<string name="poi_fee_no">Inget gebyr</string>
+
 	</resources>

OsmAnd/res/values-da/strings.xml

@@ -2101,4 +2101,5 @@
 	<string name="successfully_uploaded_pattern">Overført {0}/{1}</string>
 	<string name="no_updates_available">Ingen opdateringer tilgængelige</string>
     <string name="we_really_care_about_your_opinion">Vi er meget interesseret i din mening, og det er vigtigt for os at høre fra dig.</string>
+	<string name="rendering_value_boldOutline_name">Fed kontur</string>
     </resources>

OsmAnd/res/values-de/phrases.xml

@@ -95,7 +95,7 @@
 	<string name="poi_car_parts">Autoteilehändler</string>
 	<string name="poi_car_rental">Autovermietung</string>
 	<string name="poi_car_repair">Kfz-Werkstatt</string>
-	<string name="poi_car_sharing">Fahrgemeinschaft</string>
+	<string name="poi_car_sharing">Carsharing Station</string>
 	<string name="poi_car">Autohändler</string>
 	<string name="poi_car_wash">Autowaschanlage</string>
 	<string name="poi_caravan_site">Campingplatz</string>
@@ -746,7 +746,7 @@
 	<string name="poi_internet_access_terminal">Internetzugang: Terminal</string>
 	<string name="poi_internet_access_service">Internetzugang: Dienst</string>
 
-	<string name="poi_fee">Gebühr</string>
+	<string name="poi_fee_yes">Gebühr</string>
 
 	<string name="poi_brand">Marke</string>
 	<string name="poi_maxweight">Maximalgewicht</string>

OsmAnd/res/values-de/strings.xml

@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='utf-8'?>
+<?xml version='1.0' encoding='utf-8'?>
 <resources>
 	<string name="gps_network_not_enabled">Kein Standortdienst aktiviert. Aktivieren?</string>
 	<string name="disable_recording_once_app_killed">Eigenständige Streckenaufzeichnung unterbinden</string>
@@ -2207,22 +2207,22 @@ Afghanistan, Ägypten, Albanien, Algerien, Andorra, Angola, Anguilla, Antigua an
     <string name="lang_nb">Norwegische Buchsprache</string>
     <string name="lang_nn">Norwegisch (Neunorwegisch)</string>
     <string name="rendering_value_default13_name">Standard (13)</string>
-	<string name="rendering_value_defaultTranslucentCyan_name">Standard (lichtdurchlässiges Cyan)</string>
+	<string name="rendering_value_defaultTranslucentCyan_name">Standard (transparentes Cyan)</string>
     <string name="rendering_attr_currentTrackColor_name">GPX-Farbe</string>
     <string name="rendering_attr_currentTrackWidth_name">GPX-Breite</string>
     <string name="rendering_value_red_name">Rot</string>
-    <string name="rendering_value_translucent_red_name">Lichtdurchlässiges Rot</string>
+    <string name="rendering_value_translucent_red_name">Transparentes Rot</string>
-    <string name="rendering_value_translucent_orange_name">Lichtdurchlässiges Orange</string>
+    <string name="rendering_value_translucent_orange_name">Transparentes Orange</string>
     <string name="rendering_value_yellow_name">Gelb</string>
-    <string name="rendering_value_translucent_yellow_name">Lichtdurchlässiges Gelb</string>
+    <string name="rendering_value_translucent_yellow_name">Transparentes Gelb</string>
     <string name="rendering_value_lightgreen_name">Hellgrün</string>
     <string name="rendering_value_translucent_lightgreen_name">Transparentes Hellgrün</string>
     <string name="rendering_value_green_name">Grün</string>
-    <string name="rendering_value_translucent_green_name">Lichtdurchlässiges Grün</string>
+    <string name="rendering_value_translucent_green_name">Transparentes Grün</string>
     <string name="rendering_value_lightblue_name">Hellblau</string>
     <string name="rendering_value_translucent_lightblue_name">Transparentes Hellblau</string>
     <string name="rendering_value_blue_name">Blau</string>
-    <string name="rendering_value_translucent_blue_name">Lichtdurchlässiges Blau</string>
+    <string name="rendering_value_translucent_blue_name">Transparentes Blau</string>
     <string name="rendering_value_purple_name">Lila</string>
     <string name="rendering_value_translucent_purple_name">Transparentes Lila</string>
     <string name="restart_is_required">Zum Abschluss der Änderung ist ein manueller Neustart der Anwendung erforderlich.</string>

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

@@ -922,7 +922,7 @@
 	<string name="poi_enforcement_toll">Control de peaje</string>
 
 <string name="poi_country">País</string>
-	<string name="poi_fee">Costo</string>
+	<string name="poi_fee_yes">Costo</string>
 
 	<string name="poi_kent_carriage_gap">Bolardos para carros a caballo</string>
 	<string name="poi_abandoned_poi">Objeto abandonado</string>

OsmAnd/res/values-es/phrases.xml

@@ -925,7 +925,7 @@
 
 	<string name="poi_enforcement_access">Control de acceso</string>
 	<string name="poi_country">País</string>
-	<string name="poi_fee">Costo</string>
+	<string name="poi_fee_yes">Costo</string>
 
 	<string name="poi_kent_carriage_gap">Bolardos para carros a caballo</string>
 	<string name="poi_abandoned_poi">Objeto abandonado</string>

OsmAnd/res/values-fr/phrases.xml

@@ -915,7 +915,7 @@
 	<string name="poi_bus_trap">Passe à bus</string>
 	<string name="poi_rwn_ref">Réseau régional de randonnée pédestre</string>
 	<string name="poi_country">Pays</string>
-	<string name="poi_fee">Tarif</string>
+	<string name="poi_fee_yes">Tarif</string>
 
 	<string name="poi_abandoned_poi">Objet abandonné</string>
 	<string name="poi_access_private">Propriété privée</string>

OsmAnd/res/values-hu/strings.xml

@@ -2036,4 +2036,5 @@
 	<string name="successfully_uploaded_pattern">Sikeresen feltöltve: {0}/{1}</string>
 	<string name="try_again">Próbálja újra</string>
 	<string name="error_message_pattern">Hiba: {0}</string>
+<string name="rendering_value_boldOutline_name">Félkövér körvonal</string>
     </resources>

OsmAnd/res/values-pl/phrases.xml

@@ -924,7 +924,7 @@
 
 	<string name="poi_operator">Obsługujący</string>
 	<string name="poi_brand">Marka</string>
-	<string name="poi_fee">Opłata</string>
+	<string name="poi_fee_yes">Opłata</string>
 
 	<string name="poi_enforcement_traffic_signals">Sygnalizacja świetlna</string>
 	<string name="poi_enforcement_maxspeed">Fotoradar</string>

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

@@ -923,7 +923,7 @@
 	<string name="poi_enforcement_check">Fiscalização:verificação</string>
 	<string name="poi_cutline">Linha de corte</string>
 	<string name="poi_country">País</string>
-	<string name="poi_fee">Taxa</string>
+	<string name="poi_fee_yes">Taxa</string>
 
 	<string name="poi_abandoned_poi">Objeto abandonado</string>
 	<string name="poi_route_hiking_iwn_poi">Rota de caminhada internacional</string>
@@ -943,4 +943,8 @@
 	<string name="poi_access_delivery">Acesso para entrega</string>
 	<string name="poi_access_agricultural">Acesso agrícola</string>
 
+	<string name="poi_monitoring_station">Estação de medição ambiental</string>
+	<string name="poi_capital">Capital</string>
+	<string name="poi_fee_no">Sem taxa</string>
+
 	</resources>

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

@@ -1785,4 +1785,5 @@
 	<string name="error_message_pattern">Erro: {0}</string>
 <string name="no_updates_available">Não há atualizações disponíveis</string>
     <string name="we_really_care_about_your_opinion">Nos preocupamos muito com sua opinião e é importante para nós ouvi-lo.</string>
+	<string name="rendering_value_boldOutline_name">Títulos com contornos</string>
     </resources>

OsmAnd/res/values-ru/phrases.xml

@@ -591,6 +591,7 @@
 	<string name="poi_military_naval_base">Военно-морская база</string>
 	<string name="poi_military_nuclear_explosion_site">Место ядерного взрыва</string>
 	<string name="poi_city">Город</string>
+	<string name="poi_capital">Столица</string>
 	<string name="poi_town">Город (небольшой)</string>
 	<string name="poi_village">Деревня</string>
 	<string name="poi_hamlet">Деревня (небольшая)</string>
@@ -750,4 +751,28 @@
 	<string name="poi_recreation_ground">Площадка для игр</string>
 	<string name="poi_dyke">Насыпь</string>
 	<string name="poi_payment_terminal">Платежный терминал</string>
+
+	<string name="poi_opening_hours">Часы работы</string>
+	<string name="poi_collection_times">Время выемки</string>
+	<string name="poi_description">Описание</string>
+	<string name="poi_phone">Телефон</string>
+	<string name="poi_website">Веб-сайт</string>
+	<string name="poi_service_times">Время обслуживания</string>
+	<string name="poi_abandoned">Заброшено</string>
+	<string name="poi_abandoned_poi">Заброшенный объект</string>
+	<string name="poi_disused">Не используется по назначению</string>
+
+	<string name="poi_operator">Оператор</string>
+	<string name="poi_brand">Торговая марка</string>
+	<string name="poi_fee_yes">Взимается оплата</string>
+	<string name="poi_fee_no">Оплата не взимается</string>
+
+	<string name="poi_access_private">Частный доступ</string>
+	<string name="poi_access_no">Нет доступа</string>
+	<string name="poi_access_destination">Доступ: пункт назначения</string>
+	<string name="poi_access_permissive">Доступ разрешен владельцем</string>
+	<string name="poi_access_customers">Доступ только для посетителей</string>
+	<string name="poi_access_delivery">Доступ только для доставки</string>
+	<string name="poi_access_agricultural">Доступ только для с/х техники</string>
+
 	</resources>

OsmAnd/res/values-sk/phrases.xml

@@ -913,7 +913,7 @@
 <string name="poi_country">Krajina</string>
 	<string name="poi_enforcement_mindistance">Vynútenie:minimálna vzdialenosť</string>
 	<string name="poi_enforcement_maxspeed">Vynútenie:maximálna rýchlosť</string>
-	<string name="poi_fee">Poplatok</string>
+	<string name="poi_fee_yes">Poplatok</string>
 
 	<string name="poi_opening_hours">Otváracie hodiny</string>
 	</resources>

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

@@ -922,7 +922,7 @@
 	<string name="poi_enforcement_toll">執法：收費</string>
 
 <string name="poi_country">國家</string>
-	<string name="poi_fee">費用</string>
+	<string name="poi_fee_yes">費用</string>
 
 	<string name="poi_abandoned_poi">已遺棄的物件</string>
 	<string name="poi_route_hiking_iwn_poi">國際步行路線</string>
@@ -942,4 +942,8 @@
 	<string name="poi_access_delivery">交貨通行</string>
 	<string name="poi_access_agricultural">農用通路</string>
 
+	<string name="poi_monitoring_station">監測站</string>
+	<string name="poi_capital">首都</string>
+	<string name="poi_fee_no">不收費</string>
+
 	</resources>

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

@@ -2073,4 +2073,5 @@
 	<string name="error_message_pattern">錯誤：{0}</string>
 <string name="no_updates_available">沒可用的更新</string>
     <string name="we_really_care_about_your_opinion">我們很在乎您的意見，並且聽到您的反映對我們來說是很重要的。</string>
+	<string name="rendering_value_boldOutline_name">粗外框</string>
     </resources>

OsmAnd/res/values/phrases.xml

@@ -329,13 +329,13 @@
 	<string name="poi_conservation">Conservation land</string>
 
 	<string name="poi_canal">Canal</string>
-<!--	<string name="poi_building_poi">Building</string>-->
 	<string name="poi_pier">Pier</string>
 	<string name="poi_surveillance">Surveillance</string>
 	<string name="poi_observatory">Observatory</string>
 	<string name="poi_astronomical_observatory">Astronomical observatory</string>
 	<string name="poi_tower">Tower</string>
 	<string name="poi_mast">Mast</string>
+	<string name="poi_monitoring_station">Monitoring station</string>
 	<string name="poi_radar">Radar</string>
 	<string name="poi_crane">Crane</string>
 	<string name="poi_construction">Construction</string>
@@ -374,6 +374,7 @@
 	<string name="poi_customs">Customs</string>
 	<string name="poi_country">Country</string>
 	<string name="poi_city">City</string>
+	<string name="poi_capital">Capital</string>
 	<string name="poi_town">Town</string>
 	<string name="poi_village">Village</string>
 	<string name="poi_hamlet">Hamlet</string>
@@ -923,7 +924,8 @@
 
 	<string name="poi_operator">Operator</string>
 	<string name="poi_brand">Brand</string>
-	<string name="poi_fee">Fee</string>
+	<string name="poi_fee_yes">Fee is charged</string>
+	<string name="poi_fee_no">No fee</string>
 
 	<string name="poi_access_private">Private access</string>
 	<string name="poi_access_no">No access</string>

OsmAnd/res/values/strings.xml

@@ -9,6 +9,7 @@
          3. All your modified/created strings are in the top of the file (to make easier find what\'s translated).
     PLEASE: Have a look at http://code.google.com/p/osmand/wiki/UIConsistency, it may really improve your and our work  :-)  Thx - Hardy
     -->
+    <string name="rendering_value_boldOutline_name">Bold outline</string>
     <string name="no_updates_available">No updates available</string>
     <string name="download_live_updates">Live updates</string>
 	<string name="rendering_value_default13_name">Default (13)</string>

OsmAnd/src/net/osmand/plus/OsmAndFormatter.java

@@ -205,16 +205,19 @@ public class OsmAndFormatter {
 			} else if(Amenity.PHONE.equals(key)) {
 				d.append(ctx.getString(R.string.phone) + ": ");
 			} else if(Amenity.WEBSITE.equals(key)) {
-				
 				d.append(ctx.getString(R.string.website) + ": ");
 			} else {
 				AbstractPoiType pt = poiTypes.getAnyPoiAdditionalTypeByKey(e.getKey());
 				if (pt != null) {
+					if(pt instanceof PoiType && !((PoiType) pt).isText()) {
 						vl = pt.getTranslation();
 					} else {
-					vl = Algorithms.capitalizeFirstLetterAndLowercase(e.getKey());
+						vl = pt.getTranslation() + ": " + amenity.unzipContent(e.getValue());
+					}
+				} else {
+					vl = Algorithms.capitalizeFirstLetterAndLowercase(e.getKey()) +
+					 ": " + amenity.unzipContent(e.getValue());
 				}
-				vl += ": " + amenity.unzipContent(e.getValue());
 			}
 			d.append(vl).append('\n');
 		}