Merge remote-tracking branch 'origin/master'

This commit is contained in:
Weblate 2016-06-09 22:17:03 +02:00
commit e88f3eb2df
2 changed files with 19 additions and 1 deletions

View file

@ -2909,4 +2909,13 @@
<string name="poi_ventilation_shaft">Вентиляционная шахта</string> <string name="poi_ventilation_shaft">Вентиляционная шахта</string>
<string name="poi_pump_type_beam_pump">Тип насоса: станок-качалка</string>
<string name="poi_pump_type_india_mk_2_3">Тип насоса: India Mk II или III></string>
<string name="poi_pump_type_gravity">Тип насоса: гравитационный</string>
<string name="poi_pump_style_modern">Стиль насоса: современный</string>
<string name="poi_pump_style_historic">Стиль насоса: исторический</string>
<string name="poi_pump_status_ok">Состояние насоса: работает</string>
<string name="poi_pump_status_broken">Состояние насоса: сломан</string>
<string name="poi_pump_status_locked">Состояние насоса: заперт</string>
</resources> </resources>

View file

@ -727,7 +727,7 @@
<string name="poi_religious">Religious area</string> <string name="poi_religious">Religious area</string>
<string name="poi_wayside_cross">Wayside cross</string> <string name="poi_wayside_cross">Wayside cross</string>
<string name="poi_wayside_shrine">Wayside shrine</string> <string name="poi_wayside_shrine">Wayside shrine</string>
<string name="poi_information">Tourist information</string> <string name="poi_information">Information</string>
<string name="poi_clock">Clock</string> <string name="poi_clock">Clock</string>
<string name="poi_travel_agent">Travel agent</string> <string name="poi_travel_agent">Travel agent</string>
<string name="poi_viewpoint">Viewpoint</string> <string name="poi_viewpoint">Viewpoint</string>
@ -2913,4 +2913,13 @@
<string name="poi_ventilation_shaft">Ventilation shaft</string> <string name="poi_ventilation_shaft">Ventilation shaft</string>
<string name="poi_pump_type_beam_pump">Pump type: beam pump</string>
<string name="poi_pump_type_india_mk_2_3">Pump type: India Mk II or III></string>
<string name="poi_pump_type_gravity">Pump type: gravity</string>
<string name="poi_pump_style_modern">Pump style: modern</string>
<string name="poi_pump_style_historic">Pump style: historic</string>
<string name="poi_pump_status_ok">Pump status: ok</string>
<string name="poi_pump_status_broken">Pump status: broken</string>
<string name="poi_pump_status_locked">Pump status: locked</string>
</resources> </resources>