Merge remote-tracking branch 'origin/master'

This commit is contained in:
Weblate 2015-09-14 14:51:20 +02:00
commit 35be836942
2 changed files with 13 additions and 3 deletions

View file

@ -142,8 +142,8 @@
<string name="poi_tram_stop">Остановка трамвая</string>
<string name="poi_public_transport_station">Станция общественного транспорта</string>
<string name="poi_bus_station">Автобусная станция</string>
<string name="poi_railway_station">Ж станция</string>
<string name="poi_railway_platform">Ж платформа</string>
<string name="poi_railway_station">Железнодорожная станция</string>
<string name="poi_railway_platform">Железнодорожная платформа</string>
<string name="poi_railway_subway_entrance">Вход в метро</string>
<string name="poi_subway_station">Станция метро</string>
<string name="poi_taxi">Стоянка такси</string>
@ -794,7 +794,7 @@
<string name="poi_medical_supply">Медицинские изделия</string>
<string name="poi_public_transport_stop_position">Остановка общественного транспорта</string>
<string name="poi_railway_buffer_stop">Железнодорожная остановка буфер</string>
<string name="poi_junction">Круговое движение</string>
<string name="poi_junction">Перекрёсток</string>
<string name="poi_observation_tower">Смотровая башня</string>
<string name="poi_bell_tower">Колокольня</string>
<string name="poi_industrial">Промышленный район</string>
@ -924,6 +924,9 @@
<string name="poi_leaf_type_needleleaved">Хвойная растительность</string>
<string name="poi_leaf_type_mixed">Смешанного типа</string>
<string name="poi_leaf_type_leafless">Безлистная растительность</string>
<string name="poi_species">Вид</string>
<string name="poi_genus">Род</string>
<string name="poi_taxon">Таксон</string>
<string name="poi_trees_olive">Оливка</string>
<string name="poi_trees_apple">Яблоко</string>
@ -993,4 +996,6 @@
<string name="poi_water_point">Пункт водоснабжения</string>
<string name="poi_cuisine">Кухня</string>
</resources>

View file

@ -1169,6 +1169,9 @@
<string name="poi_leaf_type_needleleaved">Needleleaved</string>
<string name="poi_leaf_type_mixed">Mixed</string>
<string name="poi_leaf_type_leafless">Leafless</string>
<string name="poi_species">Species</string>
<string name="poi_genus">Genus</string>
<string name="poi_taxon">Taxon</string>
<string name="poi_trees_olive">Olive</string>
<string name="poi_trees_apple">Apple</string>
@ -1248,4 +1251,6 @@
<string name="poi_water_point">Water point</string>
<string name="poi_cuisine">Cuisine</string>
</resources>