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

This commit is contained in:
Victor Shcherb 2015-07-15 09:09:58 +02:00
commit 43ad4e0bca
4 changed files with 45 additions and 29 deletions

View file

@ -892,15 +892,15 @@
<string name="poi_tourism_attraction">Atracción turística</string>
<string name="poi_cutline">Cortafuegos forestal</string>
<string name="poi_icn_ref">Red ciclista internacional</string>
<string name="poi_ncn_ref">Red ciclista nacional</string>
<string name="poi_rcn_ref">Red ciclista regional</string>
<string name="poi_lcn_ref">Red ciclista local</string>
<string name="poi_icn_ref">Red internacional de ciclismo</string>
<string name="poi_ncn_ref">Red nacional de ciclismo</string>
<string name="poi_rcn_ref">Red regional de ciclismo</string>
<string name="poi_lcn_ref">Red local de ciclismo</string>
<string name="poi_iwn_ref">Red de senderismo internacional</string>
<string name="poi_nwn_ref">Red de senderismo nacional</string>
<string name="poi_rwn_ref">Red de senderismo regional</string>
<string name="poi_lwn_ref">Red de senderismo local</string>
<string name="poi_iwn_ref">Red internacional de senderismo</string>
<string name="poi_nwn_ref">Red nacional de senderismo</string>
<string name="poi_rwn_ref">Red regional de senderismo</string>
<string name="poi_lwn_ref">Red local de senderismo</string>
<string name="poi_opening_hours">Horario de atención</string>
<string name="poi_collection_times">Horario de recolección</string>
@ -913,9 +913,12 @@
<string name="poi_operator">Operador</string>
<string name="poi_brand">Marca</string>
<string name="poi_enforcement_maxspeed">Cumplimiento de velocidad máxima</string>
<string name="poi_enforcement_traffic_signals">Cumplimiento de señales de tráfico</string>
<string name="poi_enforcement_maxheight">Cumplimiento de altura máxima</string>
<string name="poi_enforcement_mindistance">Cumplimiento de distancia mínima</string>
<string name="poi_enforcement_check">Cumplimiento de control</string>
</resources>
<string name="poi_enforcement_maxspeed">Control de velocidad</string>
<string name="poi_enforcement_traffic_signals">Control de semáforos</string>
<string name="poi_enforcement_maxheight">Control de altura máxima</string>
<string name="poi_enforcement_mindistance">Control de distancia mínima</string>
<string name="poi_enforcement_check">Control</string>
<string name="poi_enforcement_access">Control de acceso</string>
<string name="poi_enforcement_toll">Control de peaje</string>
</resources>

View file

@ -905,11 +905,23 @@
<string name="poi_operator">Operador</string>
<string name="poi_brand">Marca</string>
<string name="poi_enforcement_traffic_signals">Cumplimiento: semáforos</string>
<string name="poi_enforcement_maxspeed">Cumplimiento: velocidad máxima</string>
<string name="poi_enforcement_maxheight">Cumplimiento: altura máxima</string>
<string name="poi_enforcement_mindistance">Cumplimiento: distancia mínima</string>
<string name="poi_enforcement_check">Cumplimiento: control</string>
<string name="poi_enforcement_toll">Cumplimiento: peaje</string>
<string name="poi_enforcement_traffic_signals">Control de semáforos</string>
<string name="poi_enforcement_maxspeed">Control de velocidad máxima</string>
<string name="poi_enforcement_maxheight">Control de altura máxima</string>
<string name="poi_enforcement_mindistance">Control de distancia mínima</string>
<string name="poi_enforcement_check">Control</string>
<string name="poi_enforcement_toll">Control de peaje</string>
</resources>
<string name="poi_kissing_gate">Portilla giratoria</string>
<string name="poi_sally_port">Portón de muralla</string>
<string name="poi_ncn_ref">Red nacional de ciclismo</string>
<string name="poi_rcn_ref">Red regional de ciclismo</string>
<string name="poi_lcn_ref">Red local de ciclismo</string>
<string name="poi_iwn_ref">Red internacional de senderismo</string>
<string name="poi_nwn_ref">Red nacional de senderismo</string>
<string name="poi_rwn_ref">Red regional de senderismo</string>
<string name="poi_lwn_ref">Red local de senderismo</string>
<string name="poi_enforcement_access">Control de acceso</string>
</resources>

View file

@ -913,8 +913,8 @@
<string name="osmand_parking_pm">PM</string>
<string name="osmand_parking_am">AM</string>
<string name="osmand_parking_position_name">Punto di parcheggio</string>
<string name="osmand_parking_plugin_description">"Il plugin posizione di parcheggio ti permette di memorizzare facilmente quando l\'auto è stata stata parcheggiata e quanto tempo rimane, se il parcheggio è a tempo.
\nPuoi trovare il luogo di parcheggio e il tempo rimanente nella scheda del plugin e nel widget sulla mappa.\nAggiunge una notifica al calendario se vuoi che te lo ricordi."</string>
<string name="osmand_parking_plugin_description">Il plugin posizione di parcheggio ti permette di memorizzare quando l\'auto è stata stata parcheggiata e quanto tempo rimane, se il parcheggio è a tempo.
\n\nPuoi trovare il luogo di parcheggio e il tempo rimanente nella scheda del plugin e nel widget sulla mappa.\nAggiunge una notifica al calendario se vuoi che te lo ricordi.</string>
<string name="osmand_parking_plugin_name">Posizione parcheggio</string>
<string name="context_menu_item_add_parking_point">Marca come posizione di parcheggio</string>
<string name="context_menu_item_delete_parking_point">Elimina un marcatore di parcheggio</string>

View file

@ -1910,18 +1910,18 @@
<string name="lang_lb">Luksemburščina</string>
<string name="lang_os">Osetijščina</string>
<string name="lang_eo">Esperanto</string>
<string name="rendering_attr_currentTrackColor_name">Trenutna barva poti GPX</string>
<string name="rendering_attr_currentTrackColor_name">Barva poti GPX</string>
<string name="rendering_attr_currentTrackWidth_name">Širina poti GPX</string>
<string name="rendering_value_red_name">Rdeča</string>
<string name="rendering_value_translucent_red_name">Prosojna rdeča</string>
<string name="rendering_value_translucent_orange_name">Prosojna oranžna</string>
<string name="rendering_value_yellow_name">Rumena</string>
<string name="rendering_value_translucent_yellow_name">Prosojna rumena</string>
<string name="rendering_value_lightgreen_name">Svetlozelena</string>
<string name="rendering_value_translucent_lightgreen_name">Prosojna svetlozelena</string>
<string name="rendering_value_lightgreen_name">Svetlo zelena</string>
<string name="rendering_value_translucent_lightgreen_name">Prosojna svetlo zelena</string>
<string name="rendering_value_translucent_green_name">Prosojna zelena</string>
<string name="rendering_value_lightblue_name">Svetlomodra</string>
<string name="rendering_value_translucent_lightblue_name">Prosojna svetlomodra</string>
<string name="rendering_value_lightblue_name">Svetlo modra</string>
<string name="rendering_value_translucent_lightblue_name">Prosojna svetlo modra</string>
<string name="rendering_value_blue_name">Modra</string>
<string name="rendering_value_translucent_blue_name">Prosojna modra</string>
<string name="rendering_value_purple_name">Škrlatna</string>
@ -1929,4 +1929,5 @@
<string name="restart_is_required">Za uveljavitev sprememb je treba ponovno zagnati program.</string>
<string name="rendering_value_green_name">Zelena</string>
<string name="rendering_value_default13_name">Privzeto (13)</string>
<string name="rendering_value_defaultTranslucentCyan_name">Privzeto (prosojna sinja)</string>
</resources>