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

This commit is contained in:
Victor Shcherb 2014-12-03 21:26:22 +01:00
commit 9f79ef1aed
6 changed files with 18 additions and 6 deletions

View file

@ -1894,7 +1894,7 @@ La llista de països inclosos (bàsicament tot el món!): Afganistan, Albània,
<string name="wake_on_voice_never">Mai</string>
<string name="advanced_settings">Avançat</string>
<string name="osmo_use_https_descr">Utilitzeu una connexió segura amb el servidor</string>
<string name="osmo_use_https">Utilitzeu https</string>
<string name="osmo_use_https">Utilitzeu HTTPS</string>
<string name="home_button">Inici</string>
<string name="search_for">Cerca per</string>
<string name="show_map">MOSTRA EL MAPA</string>

View file

@ -1843,7 +1843,7 @@
<string name="wake_on_voice_never">Aldrig</string>
<string name="advanced_settings">Avanceret</string>
<string name="osmo_use_https_descr">Brug sikker forbindelse med server</string>
<string name="osmo_use_https">Brug https</string>
<string name="osmo_use_https">Brug HTTPS</string>
<string name="home_button">Start</string>
<string name="search_for">Søg efter</string>
<string name="show_map">VIS KORT</string>

View file

@ -2022,4 +2022,7 @@ Afghanistan, Ägypten, Albanien, Algerien, Andorra, Angola, Anguilla, Antigua an
<string name="show_all">ALLES ANZEIGEN</string>
<string name="coordinates">Koordinaten</string>
<string name="search_for">Suche nach</string>
<string name="everything_up_to_date">Alle Dateien sind auf dem neuesten Stand.</string>
<string name="use_opengl_render">OpenGL-Rendering aktivieren</string>
<string name="use_opengl_render_descr">Nutze Hardware-beschleunigtes OpenGL-Rendering (ggf. nicht auf allen Geräten verfügbar)</string>
</resources>

View file

@ -1821,4 +1821,8 @@
<string name="home_button">Дом</string>
<string name="search_for">Поиск</string>
<string name="everything_up_to_date">Всё обновлено</string>
<string name="use_opengl_render">Использовать OpenGL для рендеринга</string>
<string name="use_opengl_render_descr">Использовать аппаратное ускорение OpenGL для рендеринга (может не работать на некоторых устройствах)</string>
<string name="show_map">ПОКАЗАТЬ КАРТУ</string>
<string name="show_all">ПОКАЗАТЬ ВСЁ</string>
</resources>

View file

@ -1780,7 +1780,7 @@ Si cussigiat de annànghere unu o prus puntos intermedios pro megiorare sas pres
<string name="lock_screen_request_explanation">%1$s tenet bisòngiu de custa autorizatzione pro istudare s\'ischermu pro sa funtzionalidade de rispàrmiu energèticu.</string>
<string name="advanced_settings">Avantzadas</string>
<string name="osmo_use_https_descr">Imprea una cunnessione segura cun su server</string>
<string name="osmo_use_https">Imprea https</string>
<string name="osmo_use_https">Imprea HTTPS</string>
<string name="home_button">Domo</string>
<string name="search_for">Chirca pro</string>
<string name="show_map">AMMUSTRA SA MAPA</string>
@ -1789,7 +1789,7 @@ Si cussigiat de annànghere unu o prus puntos intermedios pro megiorare sas pres
<string name="map_update">Mapas</string>
<string name="error_avoid_specific_road">No est istada agatada peruna istrada a curtzu</string>
<string name="everything_up_to_date">Totu agiornadu</string>
<string name="use_opengl_render">Impreare sa renderizatzione opengl</string>
<string name="use_opengl_render_descr">Impreare sa renderizatzione opengl tràmite hardware (diat pòdere non funtzionare in carchi dispositivu)</string>
<string name="use_opengl_render">Imprea sa renderizatzione OpengL</string>
<string name="use_opengl_render_descr">Imprea sa renderizatzione OpengL tràmite hardware (diat pòdere non funtzionare in carchi dispositivu)</string>
<string name="dismiss">Abbandona</string>
</resources>

View file

@ -314,12 +314,16 @@
<string name="poi_10pin">Ten pin bowling</string>
<string name="poi_archery">Archery</string>
<string name="poi_athletics">Athletics</string>
<string name="poi_american_football">American football</string>
<string name="poi_australian_football">Australian football</string>
<string name="poi_base">Base jumping</string>
<string name="poi_baseball">Baseball</string>
<string name="poi_basketball">Basketball</string>
<string name="poi_beachvolleyball">Beach volleyball</string>
<string name="poi_bmx_sport">BMX</string>
<string name="poi_boules">Boules</string>
<string name="poi_bowls">Bowls</string>
<string name="poi_canadian_football">Canadian football</string>
<string name="poi_canoe">Canoe</string>
<string name="poi_chess">Chess</string>
<string name="poi_climbing">Climbing</string>
@ -354,6 +358,7 @@
<string name="poi_skateboard">Skateboard</string>
<string name="poi_skiing">Skiing</string>
<string name="poi_soccer">Soccer</string>
<string name="poi_surfing">Surfing</string>
<string name="poi_swimming">Swimming</string>
<string name="poi_table_tennis">Table tennis</string>
<string name="poi_tennis">Tennis</string>