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

This commit is contained in:
Victor Shcherb 2015-06-30 10:31:38 +02:00
commit d5eb93854c
5 changed files with 81 additions and 8 deletions

View file

@ -734,7 +734,7 @@
<string name="poi_picnic_table">Taula de berena</string>
<string name="poi_winery">Celler</string>
<string name="poi_stripclub">Club de striptease</string>
<string name="poi_stripclub">Club d\'striptease</string>
<string name="poi_craft_computer">Ordinadors a mida</string>
<string name="poi_beauty">Estètica</string>
<string name="poi_beauty_salon_nails">Manicur</string>
@ -836,4 +836,13 @@
<string name="poi_camera">Càmeres i òptiques</string>
<string name="poi_religious">Zona religiosa</string>
<string name="poi_bollard">Bol·lard</string>
<string name="poi_cycle_barrier">Barrera de bicicletes</string>
<string name="poi_motorcycle_barrier">Barrera de motos</string>
<string name="poi_block">Bloc de formigó</string>
<string name="poi_bus_trap">Parany de carril bus</string>
<string name="poi_cattle_grid">Pas canadenc</string>
<string name="poi_full_height_turnstile">Torn d\'alçada completa</string>
<string name="poi_general_barrier">Barrera genèrica</string>
<string name="poi_height_restrictor">Limitador d\'alçada</string>
</resources>

View file

@ -835,8 +835,8 @@
<string name="poi_motorcycle_barrier">Barrera para Motos</string>
<string name="poi_block">Bloque</string>
<string name="poi_bus_trap">Trampa para colectivos</string>
<string name="poi_cattle_grid">Rejilla de retención</string>
<string name="poi_full_height_turnstile">Molinete alto</string>
<string name="poi_cattle_grid">Paso canadiense</string>
<string name="poi_full_height_turnstile">Molinete de altura total</string>
<string name="poi_bump_gate">Puerta de golpe</string>
<string name="poi_general_barrier">Barrera general</string>
<string name="poi_stile">Portilla peatonal</string>
@ -844,4 +844,13 @@
<string name="poi_horse_stile">Portilla equina</string>
<string name="poi_kissing_gate">Portilla Kissing</string>
<string name="poi_sally_port">Poterna</string>
</resources>
<string name="poi_swing_gate">Barrera giratoria</string>
<string name="poi_turnstile">Molinete</string>
<string name="poi_barrier_entrance">Entrada</string>
<string name="poi_entrance_main">Entrada principal</string>
<string name="poi_entrance">Entrada</string>
<string name="poi_entrance_exit">Salida</string>
<string name="poi_highway_crossing">Cruce peatonal</string>
</resources>

View file

@ -507,7 +507,7 @@
<string name="poi_hotel">Hotel</string>
<string name="poi_guest_house">Guesthouse</string>
<string name="poi_hostel">Hostel</string>
<string name="poi_motel">Hotel de estrada</string>
<string name="poi_motel">Motel</string>
<string name="poi_alpine_hut">Abrigo de montanha</string>
<string name="poi_chalet">Chalé</string>
<string name="poi_apartment">Apartamento</string>
@ -830,4 +830,28 @@
<string name="poi_wiki_lang_lv">Letão wiki</string>
<string name="poi_camera">Câmeras e lentes</string>
<string name="poi_religious">Área religiosa</string>
</resources>
<string name="poi_bollard">Pilarete</string>
<string name="poi_cycle_barrier">Barreira para bicicleta</string>
<string name="poi_motorcycle_barrier">Barreira para moto</string>
<string name="poi_block">Bloqueio</string>
<string name="poi_bus_trap">Armadilha de ônibus</string>
<string name="poi_cattle_grid">Mata-burro</string>
<string name="poi_full_height_turnstile">Catraca de altura completa</string>
<string name="poi_bump_gate">Bump gate</string>
<string name="poi_general_barrier">Barreira geral</string>
<string name="poi_stile">Travessia em cerca</string>
<string name="poi_height_restrictor">Limitador de altura</string>
<string name="poi_horse_stile">Passagem para cavalos</string>
<string name="poi_turnstile">Catraca</string>
<string name="poi_barrier_entrance">Entrada</string>
<string name="poi_entrance_main">Entrada principal</string>
<string name="poi_entrance">Entrada</string>
<string name="poi_entrance_exit">Saída</string>
<string name="poi_kissing_gate">Kissing gate</string>
<string name="poi_sally_port">Portão de fortaleza</string>
<string name="poi_swing_gate">Swing gate</string>
<string name="poi_kent_carriage_gap">Kent carriage gap</string>
<string name="poi_highway_crossing">Cruzamento de estrada</string>
</resources>

View file

@ -839,4 +839,11 @@
<string name="poi_sally_port">Vstup do pevnosti</string>
<string name="poi_swing_gate">Otočná závora</string>
<string name="poi_turnstile">Turniket</string>
</resources>
<string name="poi_barrier_entrance">Vstup</string>
<string name="poi_entrance_main">Hlavný vchod</string>
<string name="poi_entrance">Vchod</string>
<string name="poi_entrance_exit">Východ</string>
<string name="poi_highway_crossing">Priechod pre chodcov</string>
</resources>

View file

@ -830,4 +830,28 @@
<string name="poi_camera">相機和鏡頭</string>
<string name="poi_religious">宗教區域</string>
</resources>
<string name="poi_bollard">系船柱</string>
<string name="poi_cycle_barrier">自行車擋柵</string>
<string name="poi_motorcycle_barrier">摩托車擋柵</string>
<string name="poi_block">阻擋塊</string>
<string name="poi_bus_trap">限制小汽車通行</string>
<string name="poi_cattle_grid">擋畜溝柵</string>
<string name="poi_full_height_turnstile">全高十字旋轉門</string>
<string name="poi_bump_gate">凸碰柵門</string>
<string name="poi_general_barrier">一般障礙</string>
<string name="poi_stile">梯磴</string>
<string name="poi_height_restrictor">限高閘</string>
<string name="poi_horse_stile">馬梯</string>
<string name="poi_kissing_gate">小窄門</string>
<string name="poi_sally_port">暗門</string>
<string name="poi_swing_gate">搖擺彈門</string>
<string name="poi_turnstile">旋轉門</string>
<string name="poi_kent_carriage_gap">馬車間格柱</string>
<string name="poi_barrier_entrance">入口</string>
<string name="poi_entrance_main">主入口</string>
<string name="poi_entrance">入口</string>
<string name="poi_entrance_exit">出口</string>
<string name="poi_highway_crossing">斑馬線</string>
</resources>