From: activityworkshop Date: Sat, 14 Feb 2015 14:52:02 +0000 (+0100) Subject: Version 11.2, September 2010 X-Git-Tag: v19.2~25 X-Git-Url: https://gitweb.fperrin.net/?p=GpsPrune.git;a=commitdiff_plain;h=3745d70b1427bb8ac1a085e47cbdc566936784e1 Version 11.2, September 2010 --- diff --git a/tim/prune/GpsPruner.java b/tim/prune/GpsPruner.java index 5e0c591..1242404 100644 --- a/tim/prune/GpsPruner.java +++ b/tim/prune/GpsPruner.java @@ -35,9 +35,9 @@ import tim.prune.gui.profile.ProfileChart; public class GpsPruner { /** Version number of application, used in about screen and for version check */ - public static final String VERSION_NUMBER = "11.1"; + public static final String VERSION_NUMBER = "11.2"; /** Build number, just used for about screen */ - public static final String BUILD_NUMBER = "205"; + public static final String BUILD_NUMBER = "205a"; /** Static reference to App object */ private static App APP = null; diff --git a/tim/prune/lang/prune-texts_pl.properties b/tim/prune/lang/prune-texts_pl.properties index 0cba78f..46ae39b 100644 --- a/tim/prune/lang/prune-texts_pl.properties +++ b/tim/prune/lang/prune-texts_pl.properties @@ -185,6 +185,7 @@ dialog.exportpov.modelstyle=Styl modelu dialog.exportpov.ballsandsticks=Kule i pa\u0142ki dialog.exportpov.tubesandwalls=Rurki i \u015bciany dialog.exportpov.warningtracksize=Ta \u015bcie\u017cka ma bardzo wiele punkt\u00f3w, kt\u00f3rych Java3D mo\u017ce nie wy\u015bwietli\u0107.\nCzy chcesz kontynuowa\u0107? +dialog.exportsvg.text=Wybierz parametry eksportu do pliku SVG dialog.exportsvg.phi=azymut \u03d5 dialog.exportsvg.theta=K\u0105t wzniesienia \u03b8 dialog.exportsvg.gradients=U\u017cyj gradientu jako wype\u0142nienia @@ -415,7 +416,7 @@ dialog.3dlines.title=Linie siatki dialog.3dlines.empty=Brak siatki do wy\u015bwietlenia! dialog.3dlines.intro=Linie siatki w widoku 3D -# Confirm messages || These are displayed as confirmation in the status bar +# Confirm messages confirm.loadfile=Za\u0142adowano dane z pliku confirm.save.ok1=Zapisano pomy\u015blnie confirm.save.ok2=punkt\u00f3w do pliku @@ -447,7 +448,7 @@ confirm.lookupsrtm1=Znaleziono confirm.lookupsrtm2=warto\u015bci wysoko\u015bci confirm.deletefieldvalues=Warto\u015bci p\u00f3l usuni\u0119to -# Buttons || These are all the texts for buttons +# Buttons button.ok=OK button.back=Poprzedni button.next=Nast\u0119pny @@ -489,7 +490,7 @@ filetype.gpx=Pliki GPX filetype.pov=Pliki POV filetype.svg=Pliki SVG -# Display components || These are all for the side panels showing point/range details +# Display components display.nodata=Nie za\u0142adowano danych display.noaltitudes=\u015acie\u017cki nie zawieraj\u0105 informacji o wysoko\u015bci display.notimestamps=\u015acie\u017cki nie zawieraj\u0105 informacji o czasie @@ -577,7 +578,7 @@ cardinal.s=S cardinal.e=E cardinal.w=W -# Undo operations || These will be displayed in the undo list after you've performed the operation, to tell you what you did +# Undo operations undo.load=za\u0142aduj dane undo.loadphotos=za\u0142aduj zdj\u0119cia undo.editpoint=edycja punktu diff --git a/tim/prune/lang/prune-texts_pt.properties b/tim/prune/lang/prune-texts_pt.properties index 0549635..dc60934 100644 --- a/tim/prune/lang/prune-texts_pt.properties +++ b/tim/prune/lang/prune-texts_pt.properties @@ -34,6 +34,7 @@ menu.photo.connect=Conectar ao ponto menu.photo.disconnect=Desconectar do ponto menu.photo.delete=Remover foto menu.view=Exibir +menu.view.showsidebars=Mostrar barras laterais menu.view.browser=Mapear no navegador menu.view.browser.google=Mapas do Google menu.view.browser.openstreetmap=Mapas do Openstreetmap @@ -79,11 +80,13 @@ function.sendtogps=Enviar dados para o GPS function.exportkml=Exportar para KML function.exportgpx=Exportar para GPX function.exportpov=Exportar para POV +function.exportsvg=Exportar para SVG function.editwaypointname=Editar nome do ponto function.compress=Comprimir rota function.addtimeoffset=Adicionar diferen\u00e7a de tempo function.addaltitudeoffset=Adicionar diferen\u00e7a de altitude function.convertnamestotimes=Converter nomes dos pontos para tempos +function.deletefieldvalues=Remover valores do campo function.findwaypoint=Encontrar ponto function.pastecoordinates=Inserir novas coordenadas function.charts=Gr\u00e1ficos @@ -94,6 +97,7 @@ function.setmapbg=Definir como fundo do mapa function.setkmzimagesize=Definir tamanho da imagem KMZ function.setpaths=Definir caminhos do programa function.getgpsies=Obter rotas Gpsies +function.uploadgpsies=Enviar rotas para o Gpsies function.lookupsrtm=Obter altitudes a partir do SRTM function.duplicatepoint=Duplicar ponto function.setcolours=Definir cores @@ -135,6 +139,8 @@ dialog.openoptions.deliminfo.fields=campos dialog.openoptions.deliminfo.norecords=Sem registros dialog.openoptions.altitudeunits=Unidades de altitude dialog.open.contentsdoubled=Este arquivo cont\u00e9m duas c\u00f3pias de cada ponto,\nsendo uma como ponto normal e uma como ponto de rota. +dialog.selecttracks.intro=Selecione a rota ou rotas para carregar +dialog.selecttracks.noname=Sem nome dialog.jpegload.subdirectories=Incluir subpastas dialog.jpegload.loadjpegswithoutcoords=Incluir fotos sem coordenadas dialog.jpegload.loadjpegsoutsidearea=Incluir fotos fora da \u00e1rea atual @@ -179,6 +185,10 @@ dialog.exportpov.modelstyle=Estilo do modelo dialog.exportpov.ballsandsticks=Bolas e galhos dialog.exportpov.tubesandwalls=Tubos e muros dialog.exportpov.warningtracksize=Esta rota possui um grande n\u00famero de pontos, os quais o Java3D n\u00e3o ser\u00e1 capaz de exibir.\n Voc\u00ea tem certeza que deseja continuar? +dialog.exportsvg.text=Selecione os par\u00e2metros para a exporta\u00e7\u00e3o para o SVG +dialog.exportsvg.phi=\u00c2ngulo do azimute \u03d5 +dialog.exportsvg.theta=\u00c2ngulo da eleva\u00e7\u00e3o \u03b8 +dialog.exportsvg.gradients=Usar gradientes para sombreamento dialog.pointtype.desc=Salvar os seguintes tipos de ponto: dialog.pointtype.track=Pontos de rotas dialog.pointtype.waypoint=Pontos @@ -255,6 +265,11 @@ dialog.gpsies.column.length=Extens\u00e3o dialog.gpsies.description=Descri\u00e7\u00e3o dialog.gpsies.nodescription=Sem descri\u00e7\u00e3o dialog.gpsies.nonefound=Nenhuma rota encontrada +dialog.gpsies.username=Nome do usu\u00e1rio Gpsies +dialog.gpsies.password=Senha do Gpsies +dialog.gpsies.keepprivate=Manter rota privada +dialog.gpsies.confirmopenpage=Abrir a p\u00e1gina para rotas enviadas? +dialog.gpsies.activities=Tipos de atividade dialog.gpsies.activity.trekking=Trilha dialog.gpsies.activity.walking=Caminhada dialog.gpsies.activity.jogging=Corrida @@ -370,6 +385,7 @@ dialog.setpaths.intro=Se voc\u00ea precisar, voc\u00ea pode escolher os caminhos dialog.setpaths.found=Caminho encontrado? dialog.addaltitude.noaltitudes=O intervalo selecionado n\u00e3o cont\u00e9m altitudes dialog.addaltitude.desc=Diferen\u00e7a de altitude a adicionar +dialog.lookupsrtm.overwritezeros=Sobrescrever os valores zerados de altitude? dialog.setcolours.intro=Clique em um trecho de cor para mudar a cor dialog.setcolours.background=Fundo dialog.setcolours.borders=Bordas @@ -392,15 +408,17 @@ dialog.diskcache.save=Salvar imagens do mapa para o disco dialog.diskcache.dir=Diret\u00f3rio da cache dialog.diskcache.createdir=Criar diret\u00f3rio dialog.diskcache.nocreate=Diret\u00f3rio da cache n\u00e3o foi criado +dialog.deletefieldvalues.intro=Selecione o campo a remover para o intervalo atual # 3d window dialog.3d.title=Vista 3D do Prune dialog.3d.altitudecap=Intervalo de altitude m\u00ednimo +dialog.3d.altitudefactor=Fator de exagera\u00e7\u00e3o de altitude dialog.3dlines.title=Linhas da grade do Prune dialog.3dlines.empty=Nenhuma linha de grade para exibir! dialog.3dlines.intro=Estas s\u00e3o as linhas da grade para a vista 3D. -# Confirm messages || These are displayed as confirmation in the status bar +# Confirm messages confirm.loadfile=Dados carregados do arquivo confirm.save.ok1=Salvo com sucesso confirm.save.ok2=pontos para arquivo @@ -430,8 +448,9 @@ confirm.rotatephoto=foto rotacionada confirm.running=Rodando... confirm.lookupsrtm1=Encontrado confirm.lookupsrtm2=valores de altitude +confirm.deletefieldvalues=Valores do campo removidos -# Buttons || These are all the texts for buttons +# Buttons button.ok=Ok button.back=Voltar button.next=P\u0155oximo @@ -454,6 +473,7 @@ button.selectall=Selecionar todos button.selectnone=Selecionar nenhum button.preview=Previs\u00e3o button.load=Carregar +button.upload=Enviar button.guessfields=Campos adivinhados button.showwebpage=Mostrar p\u00e1gina Web button.check=Verificar @@ -471,8 +491,9 @@ filetype.kmz=Arquivos KMZ filetype.gpx=Arquivos GPX filetype.pov=Arquivos POV filetype.svg=Arquivos SVG +filetype.audio=Arquivos MP3, OGG, WAV -# Display components || These are all for the side panels showing point/range details +# Display components display.nodata=Nenhum dado carregado display.noaltitudes=Dados da rota n\u00e3o incluem altitudes display.notimestamps=Dados da rota n\u00e3o incluem data-hora @@ -505,8 +526,8 @@ details.range.maxspeed=Velocidade m\u00e1xima details.range.numsegments=N\u00famero de segmentos details.range.pace=Passo details.range.gradient=Gradiente -details.waypointsphotos.waypoints=Pontos -details.waypointsphotos.photos=Fotos +details.lists.waypoints=Pontos +details.lists.photos=Fotos details.photodetails=Detalhes da foto details.nophoto=Nenhuma foto selecionada details.photo.loading=Carregando @@ -560,7 +581,7 @@ cardinal.s=S cardinal.e=L cardinal.w=O -# Undo operations || These will be displayed in the undo list after you've performed the operation, to tell you what you did +# Undo operations undo.load=carregar dados undo.loadphotos=carregar fotos undo.editpoint=editar ponto @@ -583,6 +604,7 @@ undo.createpoint=criar ponto undo.rotatephoto=rotacionar foto undo.convertnamestotimes=converter nomes para tempos undo.lookupsrtm=procurar altitudes a partir do STRM +undo.deletefieldvalues=remover valores do campo # Error messages error.save.dialogtitle=Erro ao salvar dados @@ -621,3 +643,6 @@ error.osmimage.failed=Falha ao carregar imagens do mapa. Por favor, verifique a error.language.wrongfile=O arquivo selecionado n\u00e3o parece ser um arquivo de idioma do Prune error.convertnamestotimes.nonames=Nenhum nome pode ser convertido para tempo error.lookupsrtm.nonefound=Nenhum valor de altitude encontrado +error.lookupsrtm.nonerequired=Todos os pontos j\u00e1 possuem altitude, assim n\u00e3o h\u00e1 nada a procurar +error.gpsies.uploadnotok=O servidor Gpsies retornou a mensagem +error.gpsies.uploadfailed=O envio falhou com o erro diff --git a/tim/prune/readme.txt b/tim/prune/readme.txt index be2942a..3e26b1e 100644 --- a/tim/prune/readme.txt +++ b/tim/prune/readme.txt @@ -1,4 +1,4 @@ -Prune version 11.1 +Prune version 11.2 ================== Prune is an application for viewing, editing and managing coordinate data from GPS systems, @@ -17,7 +17,7 @@ Running ======= To run Prune from the jar file, simply call it from a command prompt or shell: - java -jar prune_11.1.jar + java -jar prune_11.2.jar If the jar file is saved in a different directory, you will need to include the path. Depending on your system settings, you may be able to click or double-click on the jar file @@ -25,7 +25,14 @@ in a file manager window to execute it. A shortcut, menu item, alias, desktop i or other link can of course be made should you wish. To specify a language other than the default, use an additional parameter, eg: - java -jar prune_11.1.jar --lang=DE + java -jar prune_11.2.jar --lang=DE + +New with version 11.2 +===================== + +The following were added since version 11.1: + - Correction of xml encoding for ISO8859_15 systems so exported GPX is loadable by Google Earth + - Updating of Polish and Portuguese texts New with version 11.1 ===================== diff --git a/tim/prune/save/GpxExporter.java b/tim/prune/save/GpxExporter.java index a662e21..8203593 100644 --- a/tim/prune/save/GpxExporter.java +++ b/tim/prune/save/GpxExporter.java @@ -6,11 +6,14 @@ import java.awt.FlowLayout; import java.awt.GridLayout; import java.awt.event.ActionEvent; import java.awt.event.ActionListener; +import java.awt.event.KeyAdapter; +import java.awt.event.KeyEvent; import java.io.File; import java.io.FileOutputStream; import java.io.IOException; import java.io.OutputStreamWriter; import java.io.Writer; +import java.nio.charset.Charset; import javax.swing.BorderFactory; import javax.swing.Box; @@ -129,6 +132,14 @@ public class GpxExporter extends GenericFunction implements Runnable mainPanel.add(checkPanel); dialogPanel.add(mainPanel, BorderLayout.CENTER); + // close dialog if escape pressed + _nameField.addKeyListener(new KeyAdapter() { + public void keyReleased(KeyEvent e) { + if (e.getKeyCode() == KeyEvent.VK_ESCAPE) { + _dialog.dispose(); + } + } + }); // button panel at bottom JPanel buttonPanel = new JPanel(); buttonPanel.setLayout(new FlowLayout(FlowLayout.RIGHT)); @@ -144,8 +155,7 @@ public class GpxExporter extends GenericFunction implements Runnable buttonPanel.add(okButton); JButton cancelButton = new JButton(I18nManager.getText("button.cancel")); cancelButton.addActionListener(new ActionListener() { - public void actionPerformed(ActionEvent e) - { + public void actionPerformed(ActionEvent e) { _dialog.dispose(); } }); @@ -492,10 +502,10 @@ public class GpxExporter extends GenericFunction implements Runnable private static String getXmlHeaderString(OutputStreamWriter inWriter) { String encoding = inWriter.getEncoding(); - final String encodingUpper = encoding.toUpperCase(); - if (encodingUpper.equals("UTF8") || encodingUpper.equals("UTF-8")) { - encoding = "UTF-8"; + try { + encoding = Charset.forName(encoding).name(); } + catch (Exception e) {} // ignore failure to find encoding return "\n"; }