From: Frédéric Perrin <fred@fperrin.net>
Date: Sun, 5 Jan 2020 14:40:47 +0000 (+0000)
Subject: Merge branch 'add-1024-week-offset' into fp-integration
X-Git-Tag: v19.2.fp4
X-Git-Url: http://gitweb.fperrin.net/?p=GpsPrune.git;a=commitdiff_plain;h=22d91cbabcff03a472489640b7f46b3dbadc8e74;hp=-c

Merge branch 'add-1024-week-offset' into fp-integration
---

22d91cbabcff03a472489640b7f46b3dbadc8e74
diff --combined src/tim/prune/lang/prune-texts_en.properties
index 82219b2,aa440a3..fd50356
--- a/src/tim/prune/lang/prune-texts_en.properties
+++ b/src/tim/prune/lang/prune-texts_en.properties
@@@ -94,7 -94,6 +94,7 @@@ function.interpolate=Interpolate point
  function.deletebydate=Delete points by date
  function.addtimeoffset=Add time offset
  function.addaltitudeoffset=Add altitude offset
 +function.removealtitudes=Remove altitudes
  function.findwaypoint=Find waypoint
  function.rearrangewaypoints=Rearrange waypoints
  function.convertnamestotimes=Convert waypoint names to times
@@@ -115,9 -114,6 +115,9 @@@ function.getgpsies=Get Gpsies track
  function.uploadgpsies=Upload track to Gpsies
  function.lookupsrtm=Get altitudes from SRTM
  function.downloadsrtm=Download SRTM tiles
 +function.downloadsrtm.SRTMGL1_v003=Download SRTM 1 arc-second tiles
 +function.downloadsrtm.SRTMGL1_v003.needsetup=An Earthdata account is necessary to download SRTM 1 arc-second tiles
 +function.downloadsrtm.SRTM3_v21=Download SRTM 3 arc-second tiles
  function.getwikipedia=Get nearby Wikipedia articles
  function.searchwikipedianames=Search Wikipedia by name
  function.searchosmpois=Get nearby OSM points
@@@ -154,7 -150,6 +154,7 @@@ function.managetilecache=Manage tile ca
  function.getweatherforecast=Get weather forecast
  function.setaltitudetolerance=Set altitude tolerance
  function.selecttimezone=Set timezone
 +function.setearthdataauthentication=Set Earthdata authentication
  
  # Dialogs
  dialog.exit.confirm.title=Exit GpsPrune
@@@ -307,6 -302,7 +307,7 @@@ dialog.pointnameedit.lowercase=lower ca
  dialog.pointnameedit.titlecase=Title Case
  dialog.addtimeoffset.add=Add time
  dialog.addtimeoffset.subtract=Subtract time
+ dialog.addtimeoffset.1024week=1024-week block
  dialog.addtimeoffset.days=Days
  dialog.addtimeoffset.hours=Hours
  dialog.addtimeoffset.minutes=Minutes
@@@ -580,11 -576,6 +581,11 @@@ dialog.displaysettings.size.small=Smal
  dialog.displaysettings.size.medium=Medium
  dialog.displaysettings.size.large=Large
  dialog.downloadosm.desc=Confirm to download the raw OSM data for the specified area:
 +dialog.earthdataauth.intro=<p>Configure username and password to access your NASA Earthdata login account.</p><p> Create an account at <tt>https://urs.earthdata.nasa.gov/users/new</tt>.</p>
 +dialog.earthdataauth.user=Username
 +dialog.earthdataauth.password=Password
 +dialog.earthdataauth.authaccepted=Username and password accepted
 +dialog.earthdataauth.authrejected=Username and password rejected
  dialog.searchwikipedianames.search=Search for:
  dialog.weather.location=Location
  dialog.weather.update=Forecast updated
@@@ -642,7 -633,6 +643,7 @@@ confirm.mergetracksegments=Track segmen
  confirm.reverserange=Range reversed
  confirm.addtimeoffset=Time offset added
  confirm.addaltitudeoffset=Altitude offset added
 +confirm.removealtitudes=Altitudes removed
  confirm.rearrangewaypoints=Waypoints rearranged
  confirm.rearrangephotos=Photos rearranged
  confirm.splitsegments=%d segment splits were made
@@@ -863,7 -853,6 +864,7 @@@ undo.splitsegments=split track segment
  undo.sewsegments=sew track segments
  undo.addtimeoffset=add time offset
  undo.addaltitudeoffset=add altitude offset
 +undo.removealtitudes=remove altitudes
  undo.rearrangewaypoints=rearrange waypoints
  undo.cutandmove=move section
  undo.connect=connect