Android-builders-club/OsmAnd
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

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

Browse source
This commit is contained in:
GaidamakUA 2015-12-29 17:12:12 +02:00
commit 6b79355f33
18 changed files with 126 additions and 118 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

BIN
OsmAnd/res/drawable-hdpi/bg_shadow_onmap.9.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 1.1 KiB

BIN
OsmAnd/res/drawable-mdpi/bg_shadow_onmap.9.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 1 KiB

BIN
OsmAnd/res/drawable-xhdpi/bg_shadow_onmap.9.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 1.1 KiB

BIN
OsmAnd/res/drawable-xxhdpi/bg_shadow_onmap.9.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 1.1 KiB

3
OsmAnd/res/values-da/strings.xml
View file

@ -2217,4 +2217,5 @@
<string name="weekly">Ugentlig</string>
<string name="morning">Morgen</string>
<string name="Night">Aften</string>
</resources>
<string name="shared_string_not_selected">Ikke markeret</string>
</resources>

176
OsmAnd/res/values-de/strings.xml
View file

File diff suppressed because one or more lines are too long

2
OsmAnd/res/values-es/strings.xml
View file

@ -774,7 +774,7 @@
<string name="map_widget_compass">Brújula</string>
<string name="map_widget_reset">Restablecer a los valores predeterminados</string>
<string name="map_widget_parking">Aparcamiento</string>
<string name="map_widget_monitoring">Registrando GPX</string>
<string name="map_widget_monitoring">Registro GPX</string>
<string name="map_widget_speed">Velocidad</string>
<string name="map_widget_distance">Destino</string>
<string name="map_widget_altitude">Altitud</string>

3
OsmAnd/res/values-it/strings.xml
View file

@ -2130,4 +2130,5 @@
<string name="weekly">Settimanale</string>
<string name="morning">Mattina</string>
<string name="Night">Notte</string>
</resources>
<string name="shared_string_not_selected">Non selezionato</string>
</resources>

3
OsmAnd/res/values-lt/strings.xml
View file

@ -2067,4 +2067,5 @@
<string name="last_update">Paskutinįkart atnaujinta: %s</string>
<string name="update_date_pattern">Atnaujinta: %s</string>
<string name="update_time">Atnaujinimo laikas</string>
</resources>
<string name="shared_string_not_selected">Nepasirinkta</string>
</resources>

2
OsmAnd/res/values-nl/phrases.xml
View file

@ -157,7 +157,7 @@
<string name="poi_dam">Dam</string>
<string name="poi_power_plant">Elektriciteitscentrale</string>
<string name="poi_post_office">Postkantoor</string>
<string name="poi_post_box">Postbus</string>
<string name="poi_post_box">Brievenbus</string>
<string name="poi_telephone">Telefoon</string>
<string name="poi_communication_tower">Communicatietoren</string>
<string name="poi_pier">Pier</string>

10
OsmAnd/res/values-nl/strings.xml
View file

@ -2122,10 +2122,10 @@
<string name="av_audio_bitrate_descr">Kies audio bitrate</string>
<string name="looking_up_address">Adres wordt gezocht</string>
<string name="rendering_attr_horseRoutes_name">Ruiterroutes</string>
<string name="update_every">Hoe vaak Updaten?</string>
<string name="update_every">Controle op Update</string>
<string name="only_download_over_wifi">Alleen downloaden via WiFi</string>
<string name="live_update">Live Update</string>
<string name="update_now">Nu bijwerken</string>
<string name="update_now">Nu Controleren</string>
<string name="route_distance">Afstand:</string>
<string name="route_duration">Reistijd:</string>
<string name="missing_write_external_storage_permission">OsmAnd heeft geen toestemming om de SD-kaart te gebruiken</string>
@ -2138,11 +2138,11 @@
<string name="shared_string_sound">Stembegeleiding</string>
<string name="live_updates">Live Updates</string>
<string name="available_maps">Beschikbare Kaarten</string>
<string name="last_update">Laatste update: %s</string>
<string name="last_update">Laatste controle: %s</string>
<string name="update_date_pattern">Update: %s</string>
<string name="update_time">Tijd van update</string>
<string name="update_time">Controle-tijdstip</string>
<string name="updates_size_pattern">Updates: %s</string>
<string name="last_map_change">Laatste complete kaart: %s</string>
<string name="last_map_change">Laatste kaart-update: %s</string>
<string name="rec_split">Video-opname automatisch splitsen</string>
<string name="rec_split_title">Gebruik automatische splitsing</string>
<string name="rec_split_desc">Videoclips overschrijven als opslagruimte vol is</string>

6
OsmAnd/res/values-pl/strings.xml
View file

@ -957,7 +957,7 @@
<string name="map_widget_show_ruler">Linijka</string>
<string name="map_widget_view_direction">Kierunek patrzenia</string>
<string name="map_widget_transparent">Przezroczysty interfejs</string>
<string name="map_widget_transparent">Przezroczyste widget</string>
<string name="gps_wakeup_interval">Częstość wybudzania GPS: %s</string>
<string name="int_continuosly">Ciągły</string>
@ -2096,4 +2096,8 @@
<string name="no_location_permission">Aplikacja nie ma uprawnień do danych o lokalizacji.</string>
<string name="no_camera_permission">Aplikacja nie ma uprawnień do aparatu.</string>
<string name="no_microphone_permission">Aplikacja nie ma uprawnień dostępu do mikrofonu.</string>
<string name="available_maps">Dostępne mapy</string>
<string name="last_update">Ostatnia aktualizacja: %s</string>
<string name="update_time">Czas aktualizacj</string>
<string name="updates_size_pattern">Aktualizacje: %s</string>
</resources>

3
OsmAnd/res/values-pt-rBR/strings.xml
View file

@ -1984,4 +1984,5 @@
<string name="weekly">Semanalmente</string>
<string name="morning">Pela manhã</string>
<string name="Night">À noite</string>
</resources>
<string name="shared_string_not_selected">Nada selecionado</string>
</resources>

25
OsmAnd/res/values-pt/strings.xml
View file

@ -430,7 +430,7 @@
<string name="poi_dialog_comment_default">Alterar POI</string>
<string name="poi_dialog_other_tags_message">Todos os outros valores serão preservados</string>
<string name="default_buttons_commit">Enviar</string>
<string name="shared_string_clear">Limpar</string>
<string name="shared_string_clear">Apagar</string>
<string name="filter_current_poiButton">Filtro</string>
<string name="edit_filter_save_as_menu_item">Salvar como</string>
@ -1417,7 +1417,7 @@ Afghanistan, Albania, Algeria, Andorra, Angola, Anguilla, Antigua and Barbuda, A
<string name="osmo_settings">OsMo OpenStreetMap Monitorização (beta)</string>
<string name="osmo_plugin_description">"Este plugin fornece a funcionalidade para OsMo (monitoramento avançado ao vivo), veja mais em http://osmo.mobi.
\n\nVocê pode rastrear todos os dispositivos de um grupo em que participe, em tempo real, e comunicarem entre si. Tem várias opções para o rastreamento de sessão ou permanente.\n\nGrupos anónimos podem ser criados espontaneamente por um número específico de dias, e tem recursos limitados definidos, ou seja, não há controle remoto nem administrador de grupo. Por outro lado, grupos totalmente funcionais podem ser criados no website, aos quais apenas utilizadores registados podem ter acesso. "</string>
<string name="osmo_plugin_name">OsMO (rastreamento avançado ao vivo)</string>
<string name="osmo_plugin_name">OsMo (Monitorização OSM)</string>
<string name="always_center_position_on_map">Centrar sempre a posição no mapa</string>
<string name="voice_pref_title">Voz</string>
<string name="misc_pref_title">Vários</string>
@ -1934,4 +1934,25 @@ Afghanistan, Albania, Algeria, Andorra, Angola, Anguilla, Antigua and Barbuda, A
<string name="daily">Dia</string>
<string name="weekly">Semana</string>
<string name="morning">Manhã</string>
<string name="live_updates">Actualizações sincronizadas</string>
<string name="lang_ga">Irlandês</string>
<string name="lang_la">Latim</string>
<string name="lang_ta">Tamil</string>
<string name="archive_wikipedia_data">Tem dados antigos Wikipédia incompatíveis guardados. Quer arquivá-los?</string>
<string name="download_wikipedia_files">Quer baixar dados Wikipédia adicionais (%1$s MB)?</string>
<string name="gps_network_not_enabled">Serviço de localização não está activado. Quer ligá-lo?</string>
<string name="disable_recording_once_app_killed_descrp">Irá pausar o registo GPX quando o aplicativo é encerrado (via aplicativos recentes). (A indicação de serviço em segundo plano de Osmand desaparece da barra de notificação Android.)</string>
<string name="shared_string_import2osmand">Importar para Osmand</string>
<string name="read_full_article">Ler o artigo completo (on-line)</string>
<string name="shared_string_wikipedia">Wikipedia</string>
<string name="local_indexes_cat_wiki">Wikipedia</string>
<string name="shared_string_show_details">Mostrar detalhes</string>
<string name="osm_edit_context_menu_delete">Apagar edição OSM</string>
<string name="rendering_value_disabled_name">Desactivado</string>
<string name="rendering_value_walkingRoutesScopeOSMC_name">Colorir de acordo com o estilo de rota</string>
<string name="rendering_value_walkingRoutesOSMC_name">Colorir de acordo com a OSMC</string>
<string name="osmo_share_my_location">Partilhar a minha posição</string>
<string name="shared_string_logoff">Sair</string>
<string name="local_recordings_delete_all_confirm">Vai apagar %1$d nota(s). Continuar?</string>
<string name="plugin_touringview_descr">"Esta opção muda o estilo de mapa do Osmand para a \"visão Touring \', uma visão especial de alto detalhe, para viajantes e motoristas profissionais.\n\nEsta exibição fornece, em qualquer zoom de mapa, a quantidade máxima de informação de viagem disponível no mapa (particularmente estradas, trilhas, caminhos, e marcas de orientação).\n\nTambém separa claramente todos os tipos de estradas de forma inequívoca com um código de cores, que se revela útil para a condução de veículos grandes (por exemplo).\n\nOferece opções especiais de turismo, como mostrar ciclovias ou rotas alpinas de montanha.\n\nNão é necessário fazer download dum mapa especial, a exibição é feita a partir dos mapas padrão.\n\nEssa visão pode ser revertida, basta desactiva-la, ou alterar o estilo de mapa em \'Configurar mapa\'. "</string>
</resources>

1
OsmAnd/res/values-sv/strings.xml
View file

@ -2057,4 +2057,5 @@
<string name="daily">Varje dag</string>
<string name="weekly">Varje vecka</string>
<string name="morning">Morgon</string>
<string name="shared_string_not_selected">Inte markerad</string>
</resources>

3
OsmAnd/res/values-zh-rTW/strings.xml
View file

@ -2063,4 +2063,5 @@
<string name="weekly">每週</string>
<string name="morning">早上</string>
<string name="Night">夜間</string>
</resources>
<string name="shared_string_not_selected">未選取</string>
</resources>

2
OsmAnd/src/net/osmand/plus/audionotes/AudioVideoNoteRecordingMenu.java
View file

@ -299,7 +299,6 @@ public class AudioVideoNoteRecordingMenu {
private void startCounter() {
startTime = System.currentTimeMillis();
Log.e("111", "START");
if (recTimer != null) {
recTimer.cancel();
}
@ -322,7 +321,6 @@ public class AudioVideoNoteRecordingMenu {
}
private void stopCounter() {
Log.e("111", "STOP");
if (recTimer != null) {
recTimer.cancel();
recTimer = null;

5
OsmAnd/src/net/osmand/plus/audionotes/AudioVideoNotesPlugin.java
View file

@ -1200,12 +1200,9 @@ public class AudioVideoNotesPlugin extends OsmandPlugin {
// camera focus type
autofocus = true;
parameters.removeGpsData();
String locProvider = mapActivity.getMapViewTrackingUtilities().getLocationProvider();
if (!Algorithms.isEmpty(locProvider)) {
if (Build.VERSION.SDK_INT < Build.VERSION_CODES.M) {
parameters.setGpsLatitude(lat);
parameters.setGpsLongitude(lon);
parameters.setGpsProcessingMethod(locProvider.toUpperCase());
parameters.setGpsTimestamp(System.currentTimeMillis() / 1000);
}
switch (AV_CAMERA_FOCUS_TYPE.get()) {
case AV_CAMERA_FOCUS_HIPERFOCAL: