Android-builders-club/OsmAnd
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse source
This commit is contained in:
Weblate 2017-10-19 13:22:35 +02:00
commit 80b7cb00d4
3 changed files with 78 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
OsmAnd-java/test/resources/test_turn_lanes.json
View file

@ -644,6 +644,20 @@
"expectedResults": {
"84975049": "TL|+TR,C"
}
},
{
"testName": "36.Bierweg TR Äußere Bayreuther Straße (B 2) ",
"startPoint": {
"latitude": 45.61486172708771,
"longitude": 35.50859335064885
},
"endPoint": {
"latitude": 45.61364315690609,
"longitude": 35.51007661223409
},
"expectedResults": {
"35361252": "TL|+TR,C"
}
}
]

33
OsmAnd/res/values-ru/phrases.xml
View file

@ -3526,4 +3526,37 @@
<string name="poi_visibility_street">Видимость: улица</string>
<string name="poi_visibility_area">Видимость: площадь</string>
<string name="poi_operational_status">Рабочее состояние</string>
<string name="poi_operational_status_open">Открыто</string>
<string name="poi_operational_status_closed">Закрыто</string>
<string name="poi_operational_status_restricted">Ограничено</string>
<string name="poi_operational_status_broken">Сломано</string>
<string name="poi_operational_status_needs_maintenance">Требуется обслуживание</string>
<string name="poi_water_place_durability_durable">Прочность водостока: прочный</string>
<string name="poi_water_place_durability_emergency">Прочность водостока: для экстренного использования</string>
<string name="poi_water_supply_type">Тип водоснабжения</string>
<string name="poi_water_purification">Очистка воды</string>
<string name="poi_water_purification_none">Нет</string>
<string name="poi_water_purification_chlorine">Хлорирование</string>
<string name="poi_water_purification_reverse_osmosis">Обратный осмос</string>
<string name="poi_water_purification_aquatabs">Таблетки для дезинфекции воды</string>
<string name="poi_water_supply_water_well">Колодец</string>
<string name="poi_water_supply_pipeline">Трубопровод</string>
<string name="poi_water_supply_running_water">Проточная вода</string>
<string name="poi_water_supply_pump">Насос</string>
<string name="poi_water_supply_borehole">Скважина</string>
<string name="poi_water_supply_water_trucking">Доставка воды</string>
<string name="poi_water_supply_water_tank">Резервуар для воды</string>
<string name="poi_water_supply_bottled_water">Бутилированная вода</string>
<string name="poi_water_place_access">Доступ к водоснабжению</string>
<string name="poi_water_place_access_community">Сообщество</string>
<string name="poi_water_place_access_family">Семья</string>
<string name="poi_water_place_access_multifamilies">Несколько семей</string>
</resources>

31
OsmAnd/res/values/phrases.xml
View file

@ -92,6 +92,10 @@
<string name="poi_animal_shelter_type">Animals accepted</string>
<string name="poi_animal_shelter_purpose">Purpose</string>
<string name="poi_boat_rental_type">Rented boats</string>
<string name="poi_operational_status">Operational status</string>
<string name="poi_water_supply_type">Water supply type</string>
<string name="poi_water_purification">Water purification</string>
<string name="poi_water_place_access">Water place access</string>
<!-- categories -->
<string name="poi_shop">Store</string>
@ -3513,4 +3517,31 @@
<string name="poi_visibility_street">Visibility: street</string>
<string name="poi_visibility_area">Visibility: area</string>
<string name="poi_operational_status_open">Open</string>
<string name="poi_operational_status_closed">Closed</string>
<string name="poi_operational_status_restricted">Restricted</string>
<string name="poi_operational_status_broken">Broken</string>
<string name="poi_operational_status_needs_maintenance">Needs maintenance</string>
<string name="poi_water_place_durability_durable">Water place durability: durable</string>
<string name="poi_water_place_durability_emergency">Water place durability: emergency</string>
<string name="poi_water_purification_none">None</string>
<string name="poi_water_purification_chlorine">Chlorine</string>
<string name="poi_water_purification_reverse_osmosis">Reverse osmosis</string>
<string name="poi_water_purification_aquatabs">Aquatabs</string>
<string name="poi_water_supply_water_well">Water well</string>
<string name="poi_water_supply_pipeline">Pipeline</string>
<string name="poi_water_supply_running_water">Running water</string>
<string name="poi_water_supply_pump">Pump</string>
<string name="poi_water_supply_borehole">Borehole</string>
<string name="poi_water_supply_water_trucking">Water trucking</string>
<string name="poi_water_supply_water_tank">Water tank</string>
<string name="poi_water_supply_bottled_water">Bottled water</string>
<string name="poi_water_place_access_community">Community</string>
<string name="poi_water_place_access_family">Family</string>
<string name="poi_water_place_access_multifamilies">Multifamilies</string>
</resources>