Menu
▾
▴
pytrainer-svn — Mailing list for svn activity
You can subscribe to this list here.
| 2008 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
(1) |
Nov
|
Dec
|
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2009 |
Jan
|
Feb
(1) |
Mar
(15) |
Apr
(20) |
May
(2) |
Jun
(9) |
Jul
(3) |
Aug
(2) |
Sep
(17) |
Oct
(16) |
Nov
(38) |
Dec
(40) |
| 2010 |
Jan
(51) |
Feb
(11) |
Mar
(24) |
Apr
(31) |
May
(24) |
Jun
(3) |
Jul
(9) |
Aug
(1) |
Sep
(29) |
Oct
(33) |
Nov
(81) |
Dec
(6) |
| 2011 |
Jan
(2) |
Feb
(4) |
Mar
(13) |
Apr
(4) |
May
(24) |
Jun
(4) |
Jul
(19) |
Aug
(46) |
Sep
(10) |
Oct
(28) |
Nov
(31) |
Dec
|
|
From: <dg...@us...> - 2009-08-03 17:39:22
|
Revision: 343
http://pytrainer.svn.sourceforge.net/pytrainer/?rev=343&view=rev
Author: dgranda
Date: 2009-08-03 17:39:15 +0000 (Mon, 03 Aug 2009)
Log Message:
-----------
Removal of decommissioned plugin (garmin301) and addition of new ones (garmingpx). Update of project data (version and url)
Modified Paths:
--------------
pytrainer/trunk/setup.py
Modified: pytrainer/trunk/setup.py
===================================================================
--- pytrainer/trunk/setup.py 2009-07-21 17:31:53 UTC (rev 342)
+++ pytrainer/trunk/setup.py 2009-08-03 17:39:15 UTC (rev 343)
@@ -15,10 +15,10 @@
return "share/pytrainer/extensions/%s"%extension_name, glob("extensions/%s/*"%extension_name)
setup( name="pytrainer",
- version="1.5",
+ version="1.6.0.9",
author="Fiz Vazquez",
author_email="vu...@si...",
- url="http://pytrainer.e-oss.net",
+ url="https://sourceforge.net/projects/pytrainer/",
license="GNU General Public License(GPL)",
packages=[ 'pytrainer',
'pytrainer.gui',
@@ -31,7 +31,7 @@
('share/pytrainer/glade/',glob("glade/*.png")),
('share/pytrainer/glade/',glob("glade/*.jpg")),
('share/pytrainer/',glob("*.style")),
- install_plugin("garmin301"),
+ install_plugin("garmingpx"),
install_plugin("garmin-hr"),
install_plugin("googleearth"),
install_plugin("ipod"),
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <dg...@us...> - 2009-07-21 17:31:59
|
Revision: 342
http://pytrainer.svn.sourceforge.net/pytrainer/?rev=342&view=rev
Author: dgranda
Date: 2009-07-21 17:31:53 +0000 (Tue, 21 Jul 2009)
Log Message:
-----------
Adding calories support suggested by JB
Modified Paths:
--------------
pytrainer/trunk/pytrainer/lib/gpx.py
pytrainer/trunk/pytrainer/record.py
Modified: pytrainer/trunk/pytrainer/lib/gpx.py
===================================================================
--- pytrainer/trunk/pytrainer/lib/gpx.py 2009-07-21 17:20:22 UTC (rev 341)
+++ pytrainer/trunk/pytrainer/lib/gpx.py 2009-07-21 17:31:53 UTC (rev 342)
@@ -57,6 +57,7 @@
self.maxvel = 0
self.maxhr = 0
self.date = ""
+ self.calories= 0
if filename != None:
if not os.path.isfile(self.filename):
return None
@@ -99,12 +100,20 @@
def getHeartRateAverage(self):
return self.hr_average
+
+ def getCalories(self):
+ return self.calories
def _getValues(self): # migrate to cElementTree
logging.debug(">>")
dom = self.dom
trkpoints = dom.getElementsByTagName("trkpt")
+ #start with the info at trkseg level
+ #calories - maybe more than one, currently adding them together
+ calorieCollection = dom.getElementsByTagName("gpxdata:calories")
+ for cal in calorieCollection:
+ self.calories += int(cal.firstChild.data)
retorno = []
his_vel = []
last_lat = "False"
Modified: pytrainer/trunk/pytrainer/record.py
===================================================================
--- pytrainer/trunk/pytrainer/record.py 2009-07-21 17:20:22 UTC (rev 341)
+++ pytrainer/trunk/pytrainer/record.py 2009-07-21 17:31:53 UTC (rev 342)
@@ -183,7 +183,8 @@
summaryRecord['rcd_gpxfile'] = gpxOrig
summaryRecord['rcd_sport'] = entry[0]
summaryRecord['rcd_date'] = gpx.getDate()
- summaryRecord['rcd_calories'] = '0.0' # not supported yet (29.03.2008)
+ summaryRecord['rcd_calories'] = gpx.getCalories()
+ logging.debug('rcd_calories: ' + str(summaryRecord['rcd_calories']))
summaryRecord['rcd_comments'] = ''
summaryRecord['rcd_title'] = ''
summaryRecord['rcd_time'] = time_hhmmss #ToDo: makes no sense to work with arrays
@@ -357,11 +358,13 @@
upositive,unegative = gpx.getUnevenness()
heartrate = gpx.getHeartRateAverage()
date = gpx.getDate()
+ calories = gpx.getCalories()
self.recordwindow.rcd_date.set_text(date)
self.recordwindow.rcd_upositive.set_text(str(upositive))
self.recordwindow.rcd_unegative.set_text(str(unegative))
self.recordwindow.rcd_beats.set_text(str(heartrate))
+ self.recordwindow.rcd_calories.set_text(str(calories))
self.recordwindow.set_distance(distance)
self.recordwindow.set_maxspeed(maxspeed)
self.recordwindow.set_maxhr(maxheartrate)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <dg...@us...> - 2009-07-21 17:20:25
|
Revision: 341
http://pytrainer.svn.sourceforge.net/pytrainer/?rev=341&view=rev
Author: dgranda
Date: 2009-07-21 17:20:22 +0000 (Tue, 21 Jul 2009)
Log Message:
-----------
Maximum is misspelled Maximun, see http://bugs.debian.org/537723
Modified Paths:
--------------
pytrainer/trunk/glade/pytrainer.glade
pytrainer/trunk/locale/ca/LC_MESSAGES/pytrainer_ca.pot
pytrainer/trunk/locale/de/LC_MESSAGES/pytrainer_de.pot
pytrainer/trunk/locale/es/LC_MESSAGES/pytrainer_es.po
pytrainer/trunk/locale/es/LC_MESSAGES/pytrainer_es.pot
pytrainer/trunk/locale/eu/LC_MESSAGES/pytrainer_eu.pot
pytrainer/trunk/locale/fr/LC_MESSAGES/pytrainer_fr.po
pytrainer/trunk/locale/fr/LC_MESSAGES/pytrainer_fr.pot
pytrainer/trunk/locale/no/LC_MESSAGES/pytrainer_no.pot
pytrainer/trunk/locale/ru/LC_MESSAGES/pytrainer_pl.pot
pytrainer/trunk/locale/ru/LC_MESSAGES/pytrainer_ru.po
pytrainer/trunk/locale/ru/LC_MESSAGES/pytrainer_ru.pot
pytrainer/trunk/messages.pot
Modified: pytrainer/trunk/glade/pytrainer.glade
===================================================================
--- pytrainer/trunk/glade/pytrainer.glade 2009-07-20 16:26:19 UTC (rev 340)
+++ pytrainer/trunk/glade/pytrainer.glade 2009-07-21 17:20:22 UTC (rev 341)
@@ -11379,7 +11379,7 @@
<child>
<widget class="GtkLabel" id="label-2147483641">
<property name="visible">True</property>
- <property name="label" translatable="yes">Maximun heart rate:</property>
+ <property name="label" translatable="yes">Maximum heart rate:</property>
<property name="use_underline">False</property>
<property name="use_markup">False</property>
<property name="justify">GTK_JUSTIFY_LEFT</property>
@@ -11481,7 +11481,7 @@
<child>
<widget class="GtkLabel" id="label-2147483639">
<property name="visible">True</property>
- <property name="label" translatable="yes"><small><b>Note:</b> Maximun heart rate is calculated by subtracting the number 220 minus your age. </small></property>
+ <property name="label" translatable="yes"><small><b>Note:</b> Maximum heart rate is calculated by subtracting the number 220 minus your age. </small></property>
<property name="use_underline">False</property>
<property name="use_markup">True</property>
<property name="justify">GTK_JUSTIFY_LEFT</property>
Modified: pytrainer/trunk/locale/ca/LC_MESSAGES/pytrainer_ca.pot
===================================================================
--- pytrainer/trunk/locale/ca/LC_MESSAGES/pytrainer_ca.pot 2009-07-20 16:26:19 UTC (rev 340)
+++ pytrainer/trunk/locale/ca/LC_MESSAGES/pytrainer_ca.pot 2009-07-21 17:20:22 UTC (rev 341)
@@ -729,7 +729,7 @@
msgstr ""
#: glade/pytrainer.glade:11384
-msgid "Maximun heart rate:"
+msgid "Maximum heart rate:"
msgstr ""
#: glade/pytrainer.glade:11412
@@ -738,7 +738,7 @@
#: glade/pytrainer.glade:11486
msgid ""
-"<small><b>Note:</b> Maximun heart rate is calculated by subtracting the "
+"<small><b>Note:</b> Maximum heart rate is calculated by subtracting the "
"number 220 minus your age. </small>"
msgstr ""
Modified: pytrainer/trunk/locale/de/LC_MESSAGES/pytrainer_de.pot
===================================================================
--- pytrainer/trunk/locale/de/LC_MESSAGES/pytrainer_de.pot 2009-07-20 16:26:19 UTC (rev 340)
+++ pytrainer/trunk/locale/de/LC_MESSAGES/pytrainer_de.pot 2009-07-21 17:20:22 UTC (rev 341)
@@ -730,7 +730,7 @@
msgstr ""
#: glade/pytrainer.glade:11384
-msgid "Maximun heart rate:"
+msgid "Maximum heart rate:"
msgstr ""
#: glade/pytrainer.glade:11412
@@ -739,7 +739,7 @@
#: glade/pytrainer.glade:11486
msgid ""
-"<small><b>Note:</b> Maximun heart rate is calculated by subtracting the "
+"<small><b>Note:</b> Maximum heart rate is calculated by subtracting the "
"number 220 minus your age. </small>"
msgstr ""
Modified: pytrainer/trunk/locale/es/LC_MESSAGES/pytrainer_es.po
===================================================================
--- pytrainer/trunk/locale/es/LC_MESSAGES/pytrainer_es.po 2009-07-20 16:26:19 UTC (rev 340)
+++ pytrainer/trunk/locale/es/LC_MESSAGES/pytrainer_es.po 2009-07-21 17:20:22 UTC (rev 341)
@@ -811,7 +811,7 @@
msgstr "Deportes"
#: glade/pytrainer.glade:11382
-msgid "Maximun heart rate:"
+msgid "Maximum heart rate:"
msgstr "Pulsaciones máximas:"
#: glade/pytrainer.glade:11410
@@ -820,7 +820,7 @@
#: glade/pytrainer.glade:11484
msgid ""
-"<small><b>Note:</b> Maximun heart rate is calculated by subtracting the "
+"<small><b>Note:</b> Maximum heart rate is calculated by subtracting the "
"number 220 minus your age. </small>"
msgstr "<small><b>Nota:</b> EL número máximo de pulsaciones se calcula con la "
"siguiente fórmula: 220 menos su edad. </small>"
Modified: pytrainer/trunk/locale/es/LC_MESSAGES/pytrainer_es.pot
===================================================================
--- pytrainer/trunk/locale/es/LC_MESSAGES/pytrainer_es.pot 2009-07-20 16:26:19 UTC (rev 340)
+++ pytrainer/trunk/locale/es/LC_MESSAGES/pytrainer_es.pot 2009-07-21 17:20:22 UTC (rev 341)
@@ -727,7 +727,7 @@
msgstr ""
#: glade/pytrainer.glade:11382
-msgid "Maximun heart rate:"
+msgid "Maximum heart rate:"
msgstr ""
#: glade/pytrainer.glade:11410
@@ -736,7 +736,7 @@
#: glade/pytrainer.glade:11484
msgid ""
-"<small><b>Note:</b> Maximun heart rate is calculated by subtracting the "
+"<small><b>Note:</b> Maximum heart rate is calculated by subtracting the "
"number 220 minus your age. </small>"
msgstr ""
Modified: pytrainer/trunk/locale/eu/LC_MESSAGES/pytrainer_eu.pot
===================================================================
--- pytrainer/trunk/locale/eu/LC_MESSAGES/pytrainer_eu.pot 2009-07-20 16:26:19 UTC (rev 340)
+++ pytrainer/trunk/locale/eu/LC_MESSAGES/pytrainer_eu.pot 2009-07-21 17:20:22 UTC (rev 341)
@@ -729,7 +729,7 @@
msgstr ""
#: glade/pytrainer.glade:11384
-msgid "Maximun heart rate:"
+msgid "Maximum heart rate:"
msgstr ""
#: glade/pytrainer.glade:11412
@@ -738,7 +738,7 @@
#: glade/pytrainer.glade:11486
msgid ""
-"<small><b>Note:</b> Maximun heart rate is calculated by subtracting the "
+"<small><b>Note:</b> Maximum heart rate is calculated by subtracting the "
"number 220 minus your age. </small>"
msgstr ""
Modified: pytrainer/trunk/locale/fr/LC_MESSAGES/pytrainer_fr.po
===================================================================
--- pytrainer/trunk/locale/fr/LC_MESSAGES/pytrainer_fr.po 2009-07-20 16:26:19 UTC (rev 340)
+++ pytrainer/trunk/locale/fr/LC_MESSAGES/pytrainer_fr.po 2009-07-21 17:20:22 UTC (rev 341)
@@ -843,7 +843,7 @@
msgstr "Sports"
#: glade/pytrainer.glade:11384
-msgid "Maximun heart rate:"
+msgid "Maximum heart rate:"
msgstr "Fréquence Cardiaque Maximale:"
#: glade/pytrainer.glade:11412
@@ -851,7 +851,7 @@
msgstr "Fréquence Cardiaque au Repos:"
#: glade/pytrainer.glade:11486
-msgid "<small><b>Note:</b> Maximun heart rate is calculated by subtracting the number 220 minus your age. </small>"
+msgid "<small><b>Note:</b> Maximum heart rate is calculated by subtracting the number 220 minus your age. </small>"
msgstr "<small><b>Note:</b> Le calcul de votre fréquence cardiaque maximale est effectué grâce à la formule 220 moins votre âge. </small>"
#: glade/pytrainer.glade:11625
Modified: pytrainer/trunk/locale/fr/LC_MESSAGES/pytrainer_fr.pot
===================================================================
--- pytrainer/trunk/locale/fr/LC_MESSAGES/pytrainer_fr.pot 2009-07-20 16:26:19 UTC (rev 340)
+++ pytrainer/trunk/locale/fr/LC_MESSAGES/pytrainer_fr.pot 2009-07-21 17:20:22 UTC (rev 341)
@@ -730,7 +730,7 @@
msgstr ""
#: glade/pytrainer.glade:11384
-msgid "Maximun heart rate:"
+msgid "Maximum heart rate:"
msgstr ""
#: glade/pytrainer.glade:11412
@@ -739,7 +739,7 @@
#: glade/pytrainer.glade:11486
msgid ""
-"<small><b>Note:</b> Maximun heart rate is calculated by subtracting the "
+"<small><b>Note:</b> Maximum heart rate is calculated by subtracting the "
"number 220 minus your age. </small>"
msgstr ""
Modified: pytrainer/trunk/locale/no/LC_MESSAGES/pytrainer_no.pot
===================================================================
--- pytrainer/trunk/locale/no/LC_MESSAGES/pytrainer_no.pot 2009-07-20 16:26:19 UTC (rev 340)
+++ pytrainer/trunk/locale/no/LC_MESSAGES/pytrainer_no.pot 2009-07-21 17:20:22 UTC (rev 341)
@@ -730,7 +730,7 @@
msgstr ""
#: glade/pytrainer.glade:11384
-msgid "Maximun heart rate:"
+msgid "Maximum heart rate:"
msgstr ""
#: glade/pytrainer.glade:11412
@@ -739,7 +739,7 @@
#: glade/pytrainer.glade:11486
msgid ""
-"<small><b>Note:</b> Maximun heart rate is calculated by subtracting the "
+"<small><b>Note:</b> Maximum heart rate is calculated by subtracting the "
"number 220 minus your age. </small>"
msgstr ""
Modified: pytrainer/trunk/locale/ru/LC_MESSAGES/pytrainer_pl.pot
===================================================================
--- pytrainer/trunk/locale/ru/LC_MESSAGES/pytrainer_pl.pot 2009-07-20 16:26:19 UTC (rev 340)
+++ pytrainer/trunk/locale/ru/LC_MESSAGES/pytrainer_pl.pot 2009-07-21 17:20:22 UTC (rev 341)
@@ -731,7 +731,7 @@
msgstr ""
#: glade/pytrainer.glade:11384
-msgid "Maximun heart rate:"
+msgid "Maximum heart rate:"
msgstr ""
#: glade/pytrainer.glade:11412
@@ -740,7 +740,7 @@
#: glade/pytrainer.glade:11486
msgid ""
-"<small><b>Note:</b> Maximun heart rate is calculated by subtracting the "
+"<small><b>Note:</b> Maximum heart rate is calculated by subtracting the "
"number 220 minus your age. </small>"
msgstr ""
Modified: pytrainer/trunk/locale/ru/LC_MESSAGES/pytrainer_ru.po
===================================================================
--- pytrainer/trunk/locale/ru/LC_MESSAGES/pytrainer_ru.po 2009-07-20 16:26:19 UTC (rev 340)
+++ pytrainer/trunk/locale/ru/LC_MESSAGES/pytrainer_ru.po 2009-07-21 17:20:22 UTC (rev 341)
@@ -179,7 +179,7 @@
#: glade/pytrainer.glade:1621
#, fuzzy
-msgid "<b>Maximun:</b>"
+msgid "<b>Maximum:</b>"
msgstr "<b>Время:</b>"
#: glade/pytrainer.glade:1705
Modified: pytrainer/trunk/locale/ru/LC_MESSAGES/pytrainer_ru.pot
===================================================================
--- pytrainer/trunk/locale/ru/LC_MESSAGES/pytrainer_ru.pot 2009-07-20 16:26:19 UTC (rev 340)
+++ pytrainer/trunk/locale/ru/LC_MESSAGES/pytrainer_ru.pot 2009-07-21 17:20:22 UTC (rev 341)
@@ -731,7 +731,7 @@
msgstr ""
#: glade/pytrainer.glade:11384
-msgid "Maximun heart rate:"
+msgid "Maximum heart rate:"
msgstr ""
#: glade/pytrainer.glade:11412
@@ -740,7 +740,7 @@
#: glade/pytrainer.glade:11486
msgid ""
-"<small><b>Note:</b> Maximun heart rate is calculated by subtracting the "
+"<small><b>Note:</b> Maximum heart rate is calculated by subtracting the "
"number 220 minus your age. </small>"
msgstr ""
Modified: pytrainer/trunk/messages.pot
===================================================================
--- pytrainer/trunk/messages.pot 2009-07-20 16:26:19 UTC (rev 340)
+++ pytrainer/trunk/messages.pot 2009-07-21 17:20:22 UTC (rev 341)
@@ -727,7 +727,7 @@
msgstr ""
#: glade/pytrainer.glade:11382
-msgid "Maximun heart rate:"
+msgid "Maximum heart rate:"
msgstr ""
#: glade/pytrainer.glade:11410
@@ -736,7 +736,7 @@
#: glade/pytrainer.glade:11484
msgid ""
-"<small><b>Note:</b> Maximun heart rate is calculated by subtracting the "
+"<small><b>Note:</b> Maximum heart rate is calculated by subtracting the "
"number 220 minus your age. </small>"
msgstr ""
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <dg...@us...> - 2009-07-20 16:26:27
|
Revision: 340
http://pytrainer.svn.sourceforge.net/pytrainer/?rev=340&view=rev
Author: dgranda
Date: 2009-07-20 16:26:19 +0000 (Mon, 20 Jul 2009)
Log Message:
-----------
Fixed some hardcoded stuff that prevents pytrainer to copy entries to ~/.pytrainer/gpx (thanks to JB)
Modified Paths:
--------------
pytrainer/trunk/pytrainer/record.py
Modified: pytrainer/trunk/pytrainer/record.py
===================================================================
--- pytrainer/trunk/pytrainer/record.py 2009-06-30 21:54:01 UTC (rev 339)
+++ pytrainer/trunk/pytrainer/record.py 2009-07-20 16:26:19 UTC (rev 340)
@@ -150,12 +150,13 @@
cells,values = self._formatRecordNew(list_options)
self.ddbb.insert("records",cells,values)
logging.debug('DB updated: '+str(cells)+' | '+str(values))
- gpxOrig = self.conf.tmpdir+"/new_entry.gpx"
+ gpxOrig = list_options["rcd_gpxfile"]
if os.path.isfile(gpxOrig):
gpxDest = self.conf.getValue("gpxdir")
id_record = self.ddbb.lastRecord("records")
- shutil.copy2(gpxOrig, gpxDest+"/%d.gpx"%id_record)
- logging.debug('Moving '+gpxOrig+' to '+gpxDest+"/"+str(id_record))
+ gpxNew = gpxDest+"/%d.gpx"%id_record
+ shutil.copy2(gpxOrig, gpxNew)
+ logging.debug('Moving '+gpxOrig+' to '+gpxNew)
#self.parent.refreshListRecords()
logging.debug('<<')
return self.ddbb.lastRecord("records")
@@ -206,9 +207,9 @@
def updateRecord(self, list_options, id_record):
logging.debug('>>')
gpxfile = self.conf.getValue("gpxdir")+"/%d.gpx"%int(id_record)
- if os.path.isfile(list_options["rcd_gpxfile"]):
- if gpxfile != list_options["rcd_gpxfile"]:
- gpxOrig = self.conf.tmpdir+"/newgpx.gpx"
+ gpxOrig = list_options["rcd_gpxfile"]
+ if os.path.isfile(gpxOrig):
+ if gpxfile != gpxOrig:
shutil.copy2(gpxOrig, gpxfile)
else:
if (list_options["rcd_gpxfile"]==""):
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <vu...@us...> - 2009-06-30 21:54:04
|
Revision: 339
http://pytrainer.svn.sourceforge.net/pytrainer/?rev=339&view=rev
Author: vud1
Date: 2009-06-30 21:54:01 +0000 (Tue, 30 Jun 2009)
Log Message:
-----------
"tool navigation bar for month and year graph"
Modified Paths:
--------------
pytrainer/trunk/pytrainer/gui/drawArea.py
pytrainer/trunk/pytrainer/recordgraph.py
Modified: pytrainer/trunk/pytrainer/gui/drawArea.py
===================================================================
--- pytrainer/trunk/pytrainer/gui/drawArea.py 2009-06-30 17:39:27 UTC (rev 338)
+++ pytrainer/trunk/pytrainer/gui/drawArea.py 2009-06-30 21:54:01 UTC (rev 339)
@@ -19,11 +19,10 @@
import matplotlib
matplotlib.use('GTK')
from matplotlib.figure import Figure
-from matplotlib.axes import Subplot
from matplotlib.backends.backend_gtk import FigureCanvasGTK
-from matplotlib.numerix import *
+#from matplotlib.numerix import *
import matplotlib.pyplot as plt
-from pylab import *
+#from pylab import *
import logging
from matplotlib.backends.backend_gtkagg import NavigationToolbar2GTKAgg as NavigationToolbar
@@ -31,11 +30,11 @@
class DrawArea:
def __init__(self, vbox = None, window = None):
logging.debug('>>')
- self.figure = Figure(figsize=(6,4), dpi=72)
- self.axis = self.figure.add_subplot(111)
+ #self.figure = Figure(figsize=(6,4), dpi=72)
+ #self.axis = self.figure.add_subplot(111)
self.vbox = vbox
self.window = window
- self.canvas = FigureCanvasGTK(self.figure) # a gtk.DrawingArea
+ #self.canvas = FigureCanvasGTK(self.figure) # a gtk.DrawingArea
#self.drawDefault()
logging.debug('<<')
@@ -57,94 +56,109 @@
def drawBars(self,xvalues,yvalues,xlabel,ylabel,title,color):
logging.debug('>>')
- self.canvas.destroy()
- self.vbox.remove(self.canvas)
- self.figure = Figure(figsize=(6,4), dpi=72)
- self.canvas = FigureCanvasGTK(self.figure) # a gtk.DrawingArea
- self.axis.clear()
- width = 1
+
+ for child in self.vbox.get_children():
+ if self.vbox.get_children()[0] != child:
+ self.vbox.remove(child)
+
+ figure = Figure(figsize=(6,4), dpi=72)
+ canvas = FigureCanvasGTK(figure) # a gtk.DrawingArea
+
+ xmod = 0.4
+ if len(xvalues) > 1:
+ width = 0.40
+ else:
+ width = 0.80
i=0
+
for value in xvalues:
- if len(xvalues) == 1:
- self.axis = self.figure.add_subplot(111)
- else:
- self.axis =self.figure.add_subplot(211 + i)
- self.axis.set_xlim(-width,len(xvalues[i]))
- self.axis.set_xlabel(xlabel[i])
- self.axis.set_ylabel(ylabel[i])
- self.axis.set_title(title[i])
- p1 = self.axis.bar(xvalues[i], yvalues[i], width, color=color[i])
+ if i<1:
+ axis = figure.add_subplot(111)
+ axis.set_xlim(-width,len(xvalues[i]))
+ axis.set_xlabel(xlabel[i])
+ axis.set_ylabel(ylabel[i])
+ axis.set_title(title[i])
+ j=0
+ for x in xvalues[i]:
+ xvalues[i][j]=x-xmod
+ j+=1
+ axis.bar(xvalues[i], yvalues[i], width, color=color[i])
+
+ axis.grid(True)
+ for tl in axis.get_yticklabels():
+ tl.set_color('%s' %color[i])
+ if i>=1:
+ ax2 = axis.twinx()
+ ax2.bar(xvalues[i], yvalues[i], width, color=color[i])
+ for tl in ax2.get_yticklabels():
+ tl.set_color('%s' %color[i])
+ axis.set_xlabel(xlabel[i])
i+=1
- self.canvas = FigureCanvasGTK(self.figure) # a gtk.DrawingArea
- self.canvas.show()
- self.vbox.pack_start(self.canvas, True, True)
+ if (len(xvalues)>1):
+ axis.set_title("%s vs %s" %(ylabel[0],ylabel[1]))
+ else:
+ axis.set_title("%s" %(ylabel[0]))
+
+
+ canvas = FigureCanvasGTK(figure) # a gtk.DrawingArea
+ canvas.show()
+ self.vbox.pack_start(canvas, True, True)
+ toolbar = NavigationToolbar(canvas, self.window)
+ self.vbox.pack_start(toolbar, False, False)
logging.debug('<<')
def drawPlot(self,xvalues,yvalues,xlabel,ylabel,title,color,zones=None):
logging.debug('>>')
- #self.canvas.destroy()
- #self.vbox.remove(self.canvas)
+
for child in self.vbox.get_children():
if self.vbox.get_children()[0] != child:
self.vbox.remove(child)
- #self.figure = plt.figure()
- self.figure = Figure()
- self.axis.clear()
+ figure = Figure()
i = 0
for value in xvalues:
- if i==0:
- self.axis = self.figure.add_subplot(111)
- self.axis.plot(xvalues[i],yvalues[i], color=color[i])
- self.axis.set_xlabel(xlabel[i])
- #self.axis.set_ylabel(ylabel[i],color=color[i])
- if (len(xvalues)>1):
- self.axis.set_title("%s vs %s" %(ylabel[0],ylabel[1]))
- else:
- self.axis.set_title("%s" %(ylabel[0]))
+ if i<1:
+ axis = figure.add_subplot(111)
+ axis.plot(xvalues[i],yvalues[i], color=color[i])
- self.axis.grid(True)
- for tl in self.axis.get_yticklabels():
+ axis.grid(True)
+ for tl in axis.get_yticklabels():
tl.set_color('%s' %color[i])
- if i==1:
- ax2 = self.axis.twinx()
+ if i>=1:
+ ax2 = axis.twinx()
ax2.plot(xvalues[i], yvalues[i], color=color[i])
for tl in ax2.get_yticklabels():
tl.set_color('%s' %color[i])
- self.axis.set_xlabel(xlabel[i])
- # axis2 = self.axis.twinx()
- # axis2.plot(xvalues[i],yvalues[i], color=color[i])
- #axis2.set_ylabel(ylabel[i],color=color[i])
- #else:
- # self.axis =self.figure.add_subplot(211 + i)
+ axis.set_xlabel(xlabel[i])
i+=1
+
+ if (len(xvalues)>1):
+ axis.set_title("%s vs %s" %(ylabel[0],ylabel[1]))
+ else:
+ axis.set_title("%s" %(ylabel[0]))
-
- #if zones!=None:
- # for zone in zones:
- # p = self.axis.axhspan(zone[0], zone[1], facecolor=zone[2], alpha=0.5, label=zone[3])
- # l = self.axis.legend(loc='lower right')
- self.canvas = FigureCanvasGTK(self.figure) # a gtk.DrawingArea
- self.canvas.show()
- self.vbox.pack_start(self.canvas, True, True)
- toolbar = NavigationToolbar(self.canvas, self.window)
+ canvas = FigureCanvasGTK(figure) # a gtk.DrawingArea
+ canvas.show()
+ self.vbox.pack_start(canvas, True, True)
+ toolbar = NavigationToolbar(canvas, self.window)
self.vbox.pack_start(toolbar, False, False)
if title[0] == 'Stage Profile':
- self.figure.savefig('/tmp/stage.png', dpi=75)
+ figure.savefig('/tmp/stage.png', dpi=75)
if title[0] == 'Heart Rate':
- self.figure.savefig('/tmp/hr.png', dpi=75)
+ figure.savefig('/tmp/hr.png', dpi=75)
logging.debug('<<')
def drawPie(self,xvalues,yvalues,xlabel,ylabel,title,color,zones=None):
logging.debug('>>')
- self.canvas.destroy()
- self.vbox.remove(self.canvas)
- self.figure = Figure(figsize=(6,4), dpi=72)
- #self.canvas = FigureCanvasGTK(self.figure) # a gtk.DrawingArea
- #self.axis.clear()
- self.axis = self.figure.add_subplot(111)
+
+ for child in self.vbox.get_children():
+ if self.vbox.get_children()[0] != child:
+ self.vbox.remove(child)
+ figure = Figure(figsize=(6,4), dpi=72)
+ axis = figure.add_subplot(111)
+
labels = ["rest"]
colors = ["#ffffff"]
frac0 = 0
@@ -173,11 +187,11 @@
fracs = [frac0,frac1,frac2,frac3,frac4, frac5]
explode=(0, 0, 0, 0,0,0)
- self.axis.pie(fracs, explode=explode, labels=labels, colors=colors, autopct='%1.1f%%', shadow=True)
+ axis.pie(fracs, explode=explode, labels=labels, colors=colors, autopct='%1.1f%%', shadow=True)
- self.canvas = FigureCanvasGTK(self.figure) # a gtk.DrawingArea
- self.canvas.show()
- self.vbox.pack_start(self.canvas, True, True)
+ canvas = FigureCanvasGTK(figure) # a gtk.DrawingArea
+ canvas.show()
+ self.vbox.pack_start(canvas, True, True)
logging.debug('<<')
def drawDefault(self):
Modified: pytrainer/trunk/pytrainer/recordgraph.py
===================================================================
--- pytrainer/trunk/pytrainer/recordgraph.py 2009-06-30 17:39:27 UTC (rev 338)
+++ pytrainer/trunk/pytrainer/recordgraph.py 2009-06-30 21:54:01 UTC (rev 339)
@@ -76,13 +76,13 @@
def get_value_params(self,value):
if value == 0:
- return _("Distance (km)"),_("Height (m)"),_("Stage Profile"),"#747400"
+ return _("Distance (km)"),_("Height (m)"),_("Stage Profile"),"#ff0000"
if value == 1:
- return _("Distance (km)"),_("Speed (Km/h)"),_("Speed"),"#007474"
+ return _("Distance (km)"),_("Speed (Km/h)"),_("Speed"),"#00ff00"
if value == 2:
- return _("Distance (km)"),_("Pace (min/km)"),_("Pace"),"#747400"
+ return _("Distance (km)"),_("Pace (min/km)"),_("Pace"),"#0000ff"
if value == 3:
- return _("Distance (km)"),_("Beats (bpm)"),_("Heart Rate"),"#740074"
+ return _("Distance (km)"),_("Beats (bpm)"),_("Heart Rate"),"#ff0000"
def get_values(self,values, value_selected):
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <dg...@us...> - 2009-06-30 17:39:28
|
Revision: 338
http://pytrainer.svn.sourceforge.net/pytrainer/?rev=338&view=rev
Author: dgranda
Date: 2009-06-30 17:39:27 +0000 (Tue, 30 Jun 2009)
Log Message:
-----------
Adding No?\195?\168l to translator credits (DE)
Modified Paths:
--------------
pytrainer/trunk/pytrainer/gui/aboutdialog.py
Modified: pytrainer/trunk/pytrainer/gui/aboutdialog.py
===================================================================
--- pytrainer/trunk/pytrainer/gui/aboutdialog.py 2009-06-30 17:38:32 UTC (rev 337)
+++ pytrainer/trunk/pytrainer/gui/aboutdialog.py 2009-06-30 17:39:27 UTC (rev 338)
@@ -33,8 +33,8 @@
def run(self):
authors = ["Fiz Vázquez <vu...@si...>\nDavid García Granda <dg...@gm...>"]
- translator_credits = "Basque: Jabier Santamaria <men...@gm...>\nCatalan: Eloi Crespillo Itchart <el...@ik...>\nCzech: Lobus Pokorny <sp...@se...>\nFrench: Dj <dj...@dj...>\nFrench: Pierre Gaigé <pg...@fr...>\nNorwegian: Havard Davidsen <hav...@gm...>\nPolish: Seweryn Kokot <sk...@po...>\nGerman: Aleks <al...@sc...>\nSpanish: Fiz Vázquez <vu...@si...>"
- license = "PyTrainer - The free sport tracking center\nCopyright (C) 2005-08 Fiz Vázquez\n\nThis program is free software; you can redistribute it and/or modify\nit under the terms of the GNU General Public License as published by\nthe Free Software Foundation; either version 2 of the License, or\n(at your option) any later version.\n\nThis program is distributed in the hope that it will be useful,\nbut WITHOUT ANY WARRANTY; without even the implied warranty of\nMERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the\nGNU General Public License for more details.\n\nYou should have received a copy of the GNU General Public License\nalong with this program; if not, write to the Free Software\nFoundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA"
+ translator_credits = "Basque: Jabier Santamaria <men...@gm...>\nCatalan: Eloi Crespillo Itchart <el...@ik...>\nCzech: Lobus Pokorny <sp...@se...>\nFrench: Dj <dj...@dj...>\nFrench: Pierre Gaigé <pg...@fr...>\nNorwegian: Havard Davidsen <hav...@gm...>\nPolish: Seweryn Kokot <sk...@po...>\nGerman: Aleks <al...@sc...>, Noèl Köthe <no...@de...>\nSpanish: Fiz Vázquez <vu...@si...>"
+ license = "PyTrainer - The free sport tracking center\nCopyright (C) 2005-09 Fiz Vázquez\n\nThis program is free software; you can redistribute it and/or modify\nit under the terms of the GNU General Public License as published by\nthe Free Software Foundation; either version 2 of the License, or\n(at your option) any later version.\n\nThis program is distributed in the hope that it will be useful,\nbut WITHOUT ANY WARRANTY; without even the implied warranty of\nMERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the\nGNU General Public License for more details.\n\nYou should have received a copy of the GNU General Public License\nalong with this program; if not, write to the Free Software\nFoundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA"
about_dialog = gtk.AboutDialog()
about_dialog.set_destroy_with_parent(True)
about_dialog.set_name("pyTrainer")
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <dg...@us...> - 2009-06-30 17:38:34
|
Revision: 337
http://pytrainer.svn.sourceforge.net/pytrainer/?rev=337&view=rev
Author: dgranda
Date: 2009-06-30 17:38:32 +0000 (Tue, 30 Jun 2009)
Log Message:
-----------
One of the addresses mentioned for the FSF was wrong, fixed
Modified Paths:
--------------
pytrainer/trunk/COPYING
Modified: pytrainer/trunk/COPYING
===================================================================
--- pytrainer/trunk/COPYING 2009-06-29 21:35:50 UTC (rev 336)
+++ pytrainer/trunk/COPYING 2009-06-30 17:38:32 UTC (rev 337)
@@ -303,11 +303,10 @@
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
- You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ You should have received a copy of the GNU General Public License along
+ with this program; if not, write to the Free Software Foundation, Inc.,
+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-
Also add information on how to contact you by electronic and paper mail.
If the program is interactive, make it output a short notice like this
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <vu...@us...> - 2009-06-29 21:36:08
|
Revision: 336
http://pytrainer.svn.sourceforge.net/pytrainer/?rev=336&view=rev
Author: vud1
Date: 2009-06-29 21:35:50 +0000 (Mon, 29 Jun 2009)
Log Message:
-----------
"Experimental navigation bar in plot graphs"
Modified Paths:
--------------
pytrainer/trunk/pytrainer/daygraph.py
pytrainer/trunk/pytrainer/gui/drawArea.py
pytrainer/trunk/pytrainer/gui/windowmain.py
pytrainer/trunk/pytrainer/heartrategraph.py
pytrainer/trunk/pytrainer/monthgraph.py
pytrainer/trunk/pytrainer/recordgraph.py
pytrainer/trunk/pytrainer/yeargraph.py
Modified: pytrainer/trunk/pytrainer/daygraph.py
===================================================================
--- pytrainer/trunk/pytrainer/daygraph.py 2009-06-28 17:54:03 UTC (rev 335)
+++ pytrainer/trunk/pytrainer/daygraph.py 2009-06-29 21:35:50 UTC (rev 336)
@@ -25,8 +25,6 @@
def drawgraph(self,values):
value_selected = self.combovalue.get_active()
- print "value selected "
- print value_selected
if value_selected < 0:
self.combovalue.set_active(0)
value_selected = 0
Modified: pytrainer/trunk/pytrainer/gui/drawArea.py
===================================================================
--- pytrainer/trunk/pytrainer/gui/drawArea.py 2009-06-28 17:54:03 UTC (rev 335)
+++ pytrainer/trunk/pytrainer/gui/drawArea.py 2009-06-29 21:35:50 UTC (rev 336)
@@ -20,20 +20,21 @@
matplotlib.use('GTK')
from matplotlib.figure import Figure
from matplotlib.axes import Subplot
-from matplotlib.backends.backend_gtk import FigureCanvasGTK, NavigationToolbar
+from matplotlib.backends.backend_gtk import FigureCanvasGTK
from matplotlib.numerix import *
import matplotlib.pyplot as plt
from pylab import *
import logging
-import numpy as np
+from matplotlib.backends.backend_gtkagg import NavigationToolbar2GTKAgg as NavigationToolbar
class DrawArea:
- def __init__(self, vbox = None):
+ def __init__(self, vbox = None, window = None):
logging.debug('>>')
self.figure = Figure(figsize=(6,4), dpi=72)
self.axis = self.figure.add_subplot(111)
self.vbox = vbox
+ self.window = window
self.canvas = FigureCanvasGTK(self.figure) # a gtk.DrawingArea
#self.drawDefault()
logging.debug('<<')
@@ -82,9 +83,14 @@
def drawPlot(self,xvalues,yvalues,xlabel,ylabel,title,color,zones=None):
logging.debug('>>')
- self.canvas.destroy()
- self.vbox.remove(self.canvas)
- self.figure = plt.figure()
+ #self.canvas.destroy()
+ #self.vbox.remove(self.canvas)
+ for child in self.vbox.get_children():
+ if self.vbox.get_children()[0] != child:
+ self.vbox.remove(child)
+
+ #self.figure = plt.figure()
+ self.figure = Figure()
self.axis.clear()
i = 0
for value in xvalues:
@@ -106,6 +112,7 @@
ax2.plot(xvalues[i], yvalues[i], color=color[i])
for tl in ax2.get_yticklabels():
tl.set_color('%s' %color[i])
+ self.axis.set_xlabel(xlabel[i])
# axis2 = self.axis.twinx()
# axis2.plot(xvalues[i],yvalues[i], color=color[i])
#axis2.set_ylabel(ylabel[i],color=color[i])
@@ -121,6 +128,8 @@
self.canvas = FigureCanvasGTK(self.figure) # a gtk.DrawingArea
self.canvas.show()
self.vbox.pack_start(self.canvas, True, True)
+ toolbar = NavigationToolbar(self.canvas, self.window)
+ self.vbox.pack_start(toolbar, False, False)
if title[0] == 'Stage Profile':
self.figure.savefig('/tmp/stage.png', dpi=75)
if title[0] == 'Heart Rate':
Modified: pytrainer/trunk/pytrainer/gui/windowmain.py
===================================================================
--- pytrainer/trunk/pytrainer/gui/windowmain.py 2009-06-28 17:54:03 UTC (rev 335)
+++ pytrainer/trunk/pytrainer/gui/windowmain.py 2009-06-29 21:35:50 UTC (rev 336)
@@ -101,12 +101,12 @@
self.parent.runExtension(extension,id)
def createGraphs(self,RecordGraph,DayGraph,MonthGraph,YearGraph,HeartRateGraph):
- self.drawarearecord = RecordGraph(self.record_vbox, self.record_combovalue, self.record_combovalue2)
- self.drawareaheartrate = HeartRateGraph(self.heartrate_vbox,self.heartrate_vbox2)
+ self.drawarearecord = RecordGraph(self.record_vbox, self.window1, self.record_combovalue, self.record_combovalue2)
+ self.drawareaheartrate = HeartRateGraph(self.heartrate_vbox, self.window1, self.heartrate_vbox2)
#self.drawareaday = DayGraph(self.day_vbox, self.day_combovalue)
self.day_vbox.hide()
- self.drawareamonth = MonthGraph(self.month_vbox, self.month_combovalue,self.month_combovalue2)
- self.drawareayear = YearGraph(self.year_vbox, self.year_combovalue,self.year_combovalue2)
+ self.drawareamonth = MonthGraph(self.month_vbox, self.window1, self.month_combovalue,self.month_combovalue2)
+ self.drawareayear = YearGraph(self.year_vbox, self.window1, self.year_combovalue,self.year_combovalue2)
def createMap(self,Googlemaps,waypoint):
self.googlemaps = Googlemaps(self.data_path, self.map_vbox,waypoint)
Modified: pytrainer/trunk/pytrainer/heartrategraph.py
===================================================================
--- pytrainer/trunk/pytrainer/heartrategraph.py 2009-06-28 17:54:03 UTC (rev 335)
+++ pytrainer/trunk/pytrainer/heartrategraph.py 2009-06-29 21:35:50 UTC (rev 336)
@@ -22,9 +22,9 @@
from lib.heartrate import *
class HeartRateGraph:
- def __init__(self, vbox = None, vbox2 = None):
- self.drawarea = DrawArea(vbox)
- self.drawarea2 = DrawArea(vbox2)
+ def __init__(self, vbox = None, window = None, vbox2 = None):
+ self.drawarea = DrawArea(vbox, window)
+ self.drawarea2 = DrawArea(vbox2, window)
def drawgraph(self,values):
zones = getZones()
Modified: pytrainer/trunk/pytrainer/monthgraph.py
===================================================================
--- pytrainer/trunk/pytrainer/monthgraph.py 2009-06-28 17:54:03 UTC (rev 335)
+++ pytrainer/trunk/pytrainer/monthgraph.py 2009-06-29 21:35:50 UTC (rev 336)
@@ -19,8 +19,8 @@
from gui.drawArea import DrawArea
class MonthGraph:
- def __init__(self, vbox = None, combovalue = None, combovalue2 = None):
- self.drawarea = DrawArea(vbox)
+ def __init__(self, vbox = None, window = None, combovalue = None, combovalue2 = None):
+ self.drawarea = DrawArea(vbox, window)
self.combovalue = combovalue
self.combovalue2 = combovalue2
Modified: pytrainer/trunk/pytrainer/recordgraph.py
===================================================================
--- pytrainer/trunk/pytrainer/recordgraph.py 2009-06-28 17:54:03 UTC (rev 335)
+++ pytrainer/trunk/pytrainer/recordgraph.py 2009-06-29 21:35:50 UTC (rev 336)
@@ -20,9 +20,9 @@
from gui.drawArea import DrawArea
class RecordGraph:
- def __init__(self, vbox = None, combovalue = None, combovalue2 = None):
+ def __init__(self, vbox = None, window = None, combovalue = None, combovalue2 = None):
logging.debug(">>")
- self.drawarea = DrawArea(vbox)
+ self.drawarea = DrawArea(vbox, window)
self.combovalue = combovalue
self.combovalue2 = combovalue2
logging.debug("<<")
Modified: pytrainer/trunk/pytrainer/yeargraph.py
===================================================================
--- pytrainer/trunk/pytrainer/yeargraph.py 2009-06-28 17:54:03 UTC (rev 335)
+++ pytrainer/trunk/pytrainer/yeargraph.py 2009-06-29 21:35:50 UTC (rev 336)
@@ -19,8 +19,8 @@
from gui.drawArea import DrawArea
class YearGraph:
- def __init__(self, vbox = None, combovalue = None, combovalue2 = None):
- self.drawarea = DrawArea(vbox)
+ def __init__(self, vbox = None, window = None, combovalue = None, combovalue2 = None):
+ self.drawarea = DrawArea(vbox, window)
self.combovalue = combovalue
self.combovalue2 = combovalue2
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <dg...@us...> - 2009-06-28 19:50:24
|
Revision: 334
http://pytrainer.svn.sourceforge.net/pytrainer/?rev=334&view=rev
Author: dgranda
Date: 2009-06-28 17:52:29 +0000 (Sun, 28 Jun 2009)
Log Message:
-----------
Added hack to open urls in browser
Modified Paths:
--------------
pytrainer/trunk/pytrainer/lib/webUtils.py
Modified: pytrainer/trunk/pytrainer/lib/webUtils.py
===================================================================
--- pytrainer/trunk/pytrainer/lib/webUtils.py 2009-06-26 16:44:18 UTC (rev 333)
+++ pytrainer/trunk/pytrainer/lib/webUtils.py 2009-06-28 17:52:29 UTC (rev 334)
@@ -19,6 +19,7 @@
from BaseHTTPServer import BaseHTTPRequestHandler, HTTPServer
from threading import Thread
from pytrainer.lib.system import checkConf
+import webbrowser
class MyHandler(BaseHTTPRequestHandler):
def do_GET(self):
@@ -45,3 +46,18 @@
# time.sleep(1)
#print "Iniciamos3"
+def open_url_in_browser(url):
+ """
+ Opens a url in the desktop's default browser
+
+ :param url: the url to open
+ """
+
+ class BrowserThread(threading.Thread):
+ def __init__(self, url):
+ Thread.__init__(self)
+ self.url = url
+ def run(self):
+ webbrowser.open(self.url)
+ BrowserThread(url).start()
+
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <dg...@us...> - 2009-06-28 19:50:20
|
Revision: 335
http://pytrainer.svn.sourceforge.net/pytrainer/?rev=335&view=rev
Author: dgranda
Date: 2009-06-28 17:54:03 +0000 (Sun, 28 Jun 2009)
Log Message:
-----------
Making project's url clickable
Modified Paths:
--------------
pytrainer/trunk/pytrainer/gui/aboutdialog.py
Modified: pytrainer/trunk/pytrainer/gui/aboutdialog.py
===================================================================
--- pytrainer/trunk/pytrainer/gui/aboutdialog.py 2009-06-28 17:52:29 UTC (rev 334)
+++ pytrainer/trunk/pytrainer/gui/aboutdialog.py 2009-06-28 17:54:03 UTC (rev 335)
@@ -20,9 +20,14 @@
#Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
import gtk
+import pytrainer.lib.webUtils
class About:
def __init__(self,data_path = None, version = None):
+ def url_hook(dialog, url):
+ pytrainer.lib.webUtils.open_url_in_browser(url)
+ # Available in PyGTK 2.6 and above
+ gtk.about_dialog_set_url_hook(url_hook)
self.data_path = data_path
self.version = version
@@ -34,8 +39,9 @@
about_dialog.set_destroy_with_parent(True)
about_dialog.set_name("pyTrainer")
about_dialog.set_version(self.version)
- about_dialog.set_copyright("Copyright \xc2\xa9 2005-8 Fiz Vázquez")
+ about_dialog.set_copyright("Copyright \xc2\xa9 2005-9 Fiz Vázquez")
about_dialog.set_website("http://sourceforge.net/projects/pytrainer")
+ about_dialog.set_website_label("http://sourceforge.net/projects/pytrainer")
about_dialog.set_comments("The free sport tracking center")
about_dialog.set_license(license)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <dg...@us...> - 2009-06-26 16:44:25
|
Revision: 333
http://pytrainer.svn.sourceforge.net/pytrainer/?rev=333&view=rev
Author: dgranda
Date: 2009-06-26 16:44:18 +0000 (Fri, 26 Jun 2009)
Log Message:
-----------
Updated german translation - bug ID: 2811507
Modified Paths:
--------------
pytrainer/trunk/locale/de/LC_MESSAGES/pytrainer_de.po
Modified: pytrainer/trunk/locale/de/LC_MESSAGES/pytrainer_de.po
===================================================================
--- pytrainer/trunk/locale/de/LC_MESSAGES/pytrainer_de.po 2009-06-25 22:29:24 UTC (rev 332)
+++ pytrainer/trunk/locale/de/LC_MESSAGES/pytrainer_de.po 2009-06-26 16:44:18 UTC (rev 333)
@@ -8,8 +8,8 @@
"Project-Id-Version: vud 1\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2006-10-21 11:53+0200\n"
-"PO-Revision-Date: 2006-08-18 10:01+0200\n"
-"Last-Translator: Fiz Vazquez <vu...@si...>\n"
+"PO-Revision-Date: 2009-06-24 14:55+0100\n"
+"Last-Translator: Noèl Köthe <no...@de...>\n"
"Language-Team: German <tra...@li...>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=ASCII\n"
@@ -22,33 +22,35 @@
#: glade/pytrainer.glade:40
msgid "_File"
-msgstr ""
+msgstr "_Datei"
#: glade/pytrainer.glade:64
msgid "_Export as text separated by commas"
-msgstr ""
+msgstr "_Export als kommaseparierte Liste"
#: glade/pytrainer.glade:104
msgid "_Edit"
-msgstr ""
+msgstr "_Bearbeiten"
#: glade/pytrainer.glade:126
msgid "_View"
-msgstr ""
+msgstr "_Ansicht"
#: glade/pytrainer.glade:135
msgid "_Classic View"
-msgstr ""
+msgstr "_Klassisch"
#: glade/pytrainer.glade:145
msgid "_List View"
-msgstr ""
+msgstr "_Liste"
#: glade/pytrainer.glade:160
msgid "_Help"
-msgstr ""
+msgstr "_Hilfe"
-#: glade/pytrainer.glade:283 glade/pytrainer.glade:3262 pytrainer/main.py:69
+#: glade/pytrainer.glade:283
+#: glade/pytrainer.glade:3262
+#: pytrainer/main.py:69
#: pytrainer/main.py:72
msgid "Sport"
msgstr "Sportart"
@@ -57,14 +59,18 @@
msgid "All Sports"
msgstr "Alle Sportarten"
-#: glade/pytrainer.glade:404 glade/pytrainer.glade:1061
-#: glade/pytrainer.glade:1322 glade/pytrainer.glade:2045
+#: glade/pytrainer.glade:404
+#: glade/pytrainer.glade:1061
+#: glade/pytrainer.glade:1322
+#: glade/pytrainer.glade:2045
#: glade/pytrainer.glade:2306
msgid "<b>Distance:</b>"
msgstr "<b>Distanz:</b>"
-#: glade/pytrainer.glade:432 glade/pytrainer.glade:1140
-#: glade/pytrainer.glade:1350 glade/pytrainer.glade:2124
+#: glade/pytrainer.glade:432
+#: glade/pytrainer.glade:1140
+#: glade/pytrainer.glade:1350
+#: glade/pytrainer.glade:2124
#: glade/pytrainer.glade:2334
msgid "<b>Time:</b>"
msgstr "<b>Zeit:</b>"
@@ -73,39 +79,48 @@
msgid "<b>Beats avg:</b>"
msgstr "<b>Durschn. Puls:</b>"
-#: glade/pytrainer.glade:488 glade/pytrainer.glade:1406
+#: glade/pytrainer.glade:488
+#: glade/pytrainer.glade:1406
#: glade/pytrainer.glade:2390
msgid "<b>Average:</b>"
msgstr "<b>Durchschnitt:</b>"
-#: glade/pytrainer.glade:516 glade/pytrainer.glade:1434
+#: glade/pytrainer.glade:516
+#: glade/pytrainer.glade:1434
#: glade/pytrainer.glade:2418
msgid "<b>Calories: </b>"
msgstr "<b>Kalorien: </b>"
-#: glade/pytrainer.glade:544 glade/pytrainer.glade:1089
+#: glade/pytrainer.glade:544
+#: glade/pytrainer.glade:1089
#: glade/pytrainer.glade:2073
msgid "Km"
-msgstr ""
+msgstr "km"
#: glade/pytrainer.glade:572
msgid "bpm"
-msgstr ""
+msgstr "bpm"
#: glade/pytrainer.glade:600
msgid "km/h"
-msgstr ""
+msgstr "km/h"
#: glade/pytrainer.glade:628
msgid "Cal"
-msgstr ""
+msgstr "Kal"
-#: glade/pytrainer.glade:705 glade/pytrainer.glade:750
-#: glade/pytrainer.glade:1194 glade/pytrainer.glade:1239
-#: glade/pytrainer.glade:1623 glade/pytrainer.glade:1668
-#: glade/pytrainer.glade:2178 glade/pytrainer.glade:2223
-#: glade/pytrainer.glade:2607 glade/pytrainer.glade:2652
-#: glade/pytrainer.glade:3538 glade/pytrainer.glade:3583
+#: glade/pytrainer.glade:705
+#: glade/pytrainer.glade:750
+#: glade/pytrainer.glade:1194
+#: glade/pytrainer.glade:1239
+#: glade/pytrainer.glade:1623
+#: glade/pytrainer.glade:1668
+#: glade/pytrainer.glade:2178
+#: glade/pytrainer.glade:2223
+#: glade/pytrainer.glade:2607
+#: glade/pytrainer.glade:2652
+#: glade/pytrainer.glade:3538
+#: glade/pytrainer.glade:3583
msgid ":"
msgstr ""
@@ -117,28 +132,33 @@
msgid "Day"
msgstr "Tag"
-#: glade/pytrainer.glade:1378 glade/pytrainer.glade:2362
+#: glade/pytrainer.glade:1378
+#: glade/pytrainer.glade:2362
msgid "<b>Beats:</b>"
msgstr "<b>Puls:</b>"
-#: glade/pytrainer.glade:1462 glade/pytrainer.glade:2446
+#: glade/pytrainer.glade:1462
+#: glade/pytrainer.glade:2446
msgid "Km/day"
-msgstr "Km/Tag"
+msgstr "km/Tag"
-#: glade/pytrainer.glade:1490 glade/pytrainer.glade:2474
+#: glade/pytrainer.glade:1490
+#: glade/pytrainer.glade:2474
msgid "bpm/day"
msgstr "bpm/Tag"
-#: glade/pytrainer.glade:1518 glade/pytrainer.glade:2502
+#: glade/pytrainer.glade:1518
+#: glade/pytrainer.glade:2502
msgid "km/h/day"
-msgstr "Km/h/Tag"
+msgstr "km/h/Tag"
-#: glade/pytrainer.glade:1546 glade/pytrainer.glade:2530
-#, fuzzy
+#: glade/pytrainer.glade:1546
+#: glade/pytrainer.glade:2530
msgid "cal/day"
-msgstr "Km/Tag"
+msgstr "Kalorien/Tag"
-#: glade/pytrainer.glade:1723 glade/pytrainer.glade:2707
+#: glade/pytrainer.glade:1723
+#: glade/pytrainer.glade:2707
msgid "time/day"
msgstr "Zeit/Tag"
@@ -146,11 +166,13 @@
msgid "<b>Month:</b>"
msgstr "<b>Monat:</b>"
-#: glade/pytrainer.glade:1912 glade/pytrainer.glade:2896
+#: glade/pytrainer.glade:1912
+#: glade/pytrainer.glade:2896
msgid "Value"
-msgstr ""
+msgstr "Wert"
-#: glade/pytrainer.glade:1937 glade/pytrainer.glade:2921
+#: glade/pytrainer.glade:1937
+#: glade/pytrainer.glade:2921
msgid ""
"Kilometers\n"
"Time\n"
@@ -184,11 +206,13 @@
msgid "label155"
msgstr ""
-#: glade/pytrainer.glade:3105 glade/pytrainer.glade:3894
+#: glade/pytrainer.glade:3105
+#: glade/pytrainer.glade:3894
msgid "New Entry"
msgstr "Neuer Eintrag"
-#: glade/pytrainer.glade:3152 pytrainer/main.py:72
+#: glade/pytrainer.glade:3152
+#: pytrainer/main.py:72
msgid "Date"
msgstr "Datum"
@@ -196,18 +220,18 @@
msgid " "
msgstr ""
-#: glade/pytrainer.glade:3317 pytrainer/main.py:72
-#, fuzzy
+#: glade/pytrainer.glade:3317
+#: pytrainer/main.py:72
msgid "Title"
-msgstr "Zeit"
+msgstr "Titel"
#: glade/pytrainer.glade:3378
msgid "Beats avg (bpm)"
-msgstr "Durchschn. Puls (bpm)"
+msgstr "Durchschnittlicher Puls (bpm)"
#: glade/pytrainer.glade:3434
msgid "Distance (Km)"
-msgstr "Distanz (Km)"
+msgstr "Distanz (km)"
#: glade/pytrainer.glade:3484
msgid "Time"
@@ -237,29 +261,30 @@
msgid "<b>Comments</b>"
msgstr "<b>Komentare</b>"
-#: glade/pytrainer.glade:3999 glade/pytrainer.glade:5586
+#: glade/pytrainer.glade:3999
+#: glade/pytrainer.glade:5586
msgid "window2"
msgstr ""
#: glade/pytrainer.glade:4044
msgid "Name"
-msgstr ""
+msgstr "Name"
#: glade/pytrainer.glade:4072
msgid "Gender"
-msgstr ""
+msgstr "Geschlecht"
#: glade/pytrainer.glade:4100
msgid "Weight"
-msgstr ""
+msgstr "Gewicht"
#: glade/pytrainer.glade:4128
msgid "Height"
-msgstr ""
+msgstr "Größe"
#: glade/pytrainer.glade:4219
msgid "Age"
-msgstr ""
+msgstr "Alter"
#: glade/pytrainer.glade:4292
msgid "Profile"
@@ -294,27 +319,24 @@
msgstr "Datenbank"
#: glade/pytrainer.glade:4650
-#, fuzzy
msgid "<b>Sport list</b>"
-msgstr "<b>Kalorien: </b>"
+msgstr "<b>Sportartenliste: </b>"
#: glade/pytrainer.glade:4801
msgid "llist"
msgstr ""
#: glade/pytrainer.glade:4830
-#, fuzzy
msgid "<b>Add new Sport</b>"
-msgstr "<b>Sportarten bearbeiten</b>"
+msgstr "<b>Sportart hinzufügen</b>"
#: glade/pytrainer.glade:4990
msgid "new"
-msgstr ""
+msgstr "neu"
#: glade/pytrainer.glade:5025
-#, fuzzy
msgid "<b>Delete sport</b>"
-msgstr "<b>Sportarten bearbeiten</b>"
+msgstr "<b>Sportart löschen</b>"
#: glade/pytrainer.glade:5088
msgid ""
@@ -322,23 +344,25 @@
"sport you delete the records asociated. Are you sure \n"
"that you want do it?"
msgstr ""
+"Sie löschen eine Sportart. Wenn Sie eine Sportart \n"
+"löschen, dann werden auch die gespeicherten Daten \n"
+"dieser gelöscht. Sind Sie sicher, dass Sie das möchten?"
#: glade/pytrainer.glade:5225
msgid "delete"
-msgstr ""
+msgstr "löschen"
#: glade/pytrainer.glade:5260
-#, fuzzy
msgid "<b>Edit sport</b>"
-msgstr "<b>Sportarten bearbeiten</b>"
+msgstr "<b>Sportart bearbeiten</b>"
#: glade/pytrainer.glade:5323
msgid "New name"
-msgstr ""
+msgstr "Neuer Name"
#: glade/pytrainer.glade:5452
msgid "edit"
-msgstr ""
+msgstr "bearbeiten"
#: glade/pytrainer.glade:5481
msgid "Sports"
@@ -346,15 +370,15 @@
#: glade/pytrainer.glade:5710
msgid "pytrainer"
-msgstr ""
+msgstr "pytrainer"
#: glade/pytrainer.glade:5711
msgid "(c) Fiz Vazquez <vu...@si...>"
-msgstr ""
+msgstr "© Fiz Vazquez <vu...@si...>"
#: glade/pytrainer.glade:5712
msgid "The training tool for the gnu people"
-msgstr ""
+msgstr "Das Trainingstoll für die GNU Leute"
#: glade/pytrainer.glade:5713
msgid ""
@@ -379,7 +403,7 @@
#: glade/pytrainer.glade:5733
msgid "pytrainer.e-oss.net"
-msgstr ""
+msgstr "pytrainer.e-oss.net"
#: glade/pytrainer.glade:5735
msgid ""
@@ -391,34 +415,33 @@
msgstr ""
#: glade/pytrainer.glade:5750
-#, fuzzy
msgid "Export "
-msgstr "Sportart"
+msgstr "Exportieren"
#: glade/pytrainer.glade:5821
msgid "Edit Record"
-msgstr ""
+msgstr "Bearbeite Eintrag"
#: glade/pytrainer.glade:5842
msgid "Show in classic view"
-msgstr ""
+msgstr "Zeige in klassischer Ansicht"
#: glade/pytrainer.glade:5878
msgid "dialog1"
msgstr ""
-#: pytrainer/main.py:69 pytrainer/main.py:72
+#: pytrainer/main.py:69
+#: pytrainer/main.py:72
msgid "id"
-msgstr ""
+msgstr "ID"
#: pytrainer/main.py:69
msgid "Kilometer"
-msgstr ""
+msgstr "Kilometer"
#: pytrainer/main.py:72
-#, fuzzy
msgid "Distance"
-msgstr "Distanz (Km)"
+msgstr "Distanz (km)"
#: pytrainer/main.py:196
msgid "January"
@@ -430,11 +453,11 @@
#: pytrainer/main.py:198
msgid "March"
-msgstr "Marz"
+msgstr "März"
#: pytrainer/main.py:199
msgid "April"
-msgstr ""
+msgstr "April"
#: pytrainer/main.py:200
msgid "May"
@@ -454,7 +477,7 @@
#: pytrainer/main.py:204
msgid "September"
-msgstr ""
+msgstr "September"
#: pytrainer/main.py:205
msgid "October"
@@ -462,7 +485,7 @@
#: pytrainer/main.py:206
msgid "November"
-msgstr ""
+msgstr "November"
#: pytrainer/main.py:207
msgid "December"
@@ -470,82 +493,91 @@
#: pytrainer/main.py:317
msgid "You are going to remove one database entry. Are you sure yo want do it?"
-msgstr ""
+msgstr "Sie entfernen einen Datenbankeintrag. Sind Sie sicher?"
-#: pytrainer/monthgraph.py:37 pytrainer/monthgraph.py:39
-#: pytrainer/monthgraph.py:41 pytrainer/monthgraph.py:43
+#: pytrainer/monthgraph.py:37
+#: pytrainer/monthgraph.py:39
+#: pytrainer/monthgraph.py:41
+#: pytrainer/monthgraph.py:43
#: pytrainer/monthgraph.py:45
msgid "day"
msgstr "Tag"
-#: pytrainer/monthgraph.py:37 pytrainer/yeargraph.py:37
+#: pytrainer/monthgraph.py:37
+#: pytrainer/yeargraph.py:37
msgid "kilometers"
-msgstr ""
+msgstr "Kilometer"
#: pytrainer/monthgraph.py:37
msgid "daily kilometers"
-msgstr ""
+msgstr "tägliche Kilometer"
-#: pytrainer/monthgraph.py:39 pytrainer/yeargraph.py:39
+#: pytrainer/monthgraph.py:39
+#: pytrainer/yeargraph.py:39
msgid "time in hours"
-msgstr ""
+msgstr "Zeit in Stunden"
#: pytrainer/monthgraph.py:39
msgid "daily time"
-msgstr ""
+msgstr "tägliche Zeit"
-#: pytrainer/monthgraph.py:41 pytrainer/yeargraph.py:41
+#: pytrainer/monthgraph.py:41
+#: pytrainer/yeargraph.py:41
msgid "beats per minute"
-msgstr ""
+msgstr "Herzschläge pro Minute"
#: pytrainer/monthgraph.py:41
msgid "daily beats"
-msgstr ""
+msgstr "täglicher Puls"
-#: pytrainer/monthgraph.py:43 pytrainer/yeargraph.py:43
+#: pytrainer/monthgraph.py:43
+#: pytrainer/yeargraph.py:43
msgid "average (hm/h)"
-msgstr ""
+msgstr "Durchschnitt (km/h)"
#: pytrainer/monthgraph.py:43
msgid "daily averages"
-msgstr ""
+msgstr "täglicher Durchschnitt"
-#: pytrainer/monthgraph.py:45 pytrainer/yeargraph.py:45
+#: pytrainer/monthgraph.py:45
+#: pytrainer/yeargraph.py:45
msgid "calories"
-msgstr ""
+msgstr "Kalorien"
#: pytrainer/monthgraph.py:45
msgid "daily calories"
-msgstr ""
+msgstr "tägliche Kalorien"
-#: pytrainer/yeargraph.py:37 pytrainer/yeargraph.py:39
-#: pytrainer/yeargraph.py:41 pytrainer/yeargraph.py:43
+#: pytrainer/yeargraph.py:37
+#: pytrainer/yeargraph.py:39
+#: pytrainer/yeargraph.py:41
+#: pytrainer/yeargraph.py:43
#: pytrainer/yeargraph.py:45
msgid "month"
-msgstr ""
+msgstr "Monat"
#: pytrainer/yeargraph.py:37
msgid "monthly kilometers"
-msgstr ""
+msgstr "monatliche Kilometer"
#: pytrainer/yeargraph.py:39
msgid "monthly time"
-msgstr ""
+msgstr "monatliche Zeit"
#: pytrainer/yeargraph.py:41
msgid "monthly beats"
-msgstr ""
+msgstr "monatlicher Puls"
#: pytrainer/yeargraph.py:43
msgid "monthly averages"
-msgstr ""
+msgstr "monatlicher Durchschnitt"
#: pytrainer/yeargraph.py:45
msgid "monthly calories"
-msgstr ""
+msgstr "monatliche Kalorien"
#~ msgid "Kj/day"
#~ msgstr "Kj/Tag"
-
#~ msgid "Press Here to create the database"
#~ msgstr "Klicken, um die Datenbank zu kreieren"
+
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <vu...@us...> - 2009-06-25 22:29:27
|
Revision: 332
http://pytrainer.svn.sourceforge.net/pytrainer/?rev=332&view=rev
Author: vud1
Date: 2009-06-25 22:29:24 +0000 (Thu, 25 Jun 2009)
Log Message:
-----------
"Testing multi y-axis graphs"
Modified Paths:
--------------
pytrainer/trunk/pytrainer/gui/drawArea.py
pytrainer/trunk/pytrainer.sh
Modified: pytrainer/trunk/pytrainer/gui/drawArea.py
===================================================================
--- pytrainer/trunk/pytrainer/gui/drawArea.py 2009-06-20 10:38:44 UTC (rev 331)
+++ pytrainer/trunk/pytrainer/gui/drawArea.py 2009-06-25 22:29:24 UTC (rev 332)
@@ -22,9 +22,12 @@
from matplotlib.axes import Subplot
from matplotlib.backends.backend_gtk import FigureCanvasGTK, NavigationToolbar
from matplotlib.numerix import *
+import matplotlib.pyplot as plt
from pylab import *
import logging
+import numpy as np
+
class DrawArea:
def __init__(self, vbox = None):
logging.debug('>>')
@@ -81,26 +84,40 @@
logging.debug('>>')
self.canvas.destroy()
self.vbox.remove(self.canvas)
- self.figure = Figure(figsize=(6,4), dpi=72)
- #self.axis.clear()
+ self.figure = plt.figure()
+ self.axis.clear()
i = 0
for value in xvalues:
- #logging.debug('xvalues: '+str(xvalues))
- if len(xvalues) == 1:
+ if i==0:
self.axis = self.figure.add_subplot(111)
- else:
- self.axis =self.figure.add_subplot(211 + i)
- self.axis.set_xlabel(xlabel[i])
- self.axis.set_ylabel(ylabel[i])
- self.axis.set_title(title[i])
- self.axis.grid(True)
- self.axis.plot(xvalues[i],yvalues[i], color=color[i])
+ self.axis.plot(xvalues[i],yvalues[i], color=color[i])
+ self.axis.set_xlabel(xlabel[i])
+ #self.axis.set_ylabel(ylabel[i],color=color[i])
+ if (len(xvalues)>1):
+ self.axis.set_title("%s vs %s" %(ylabel[0],ylabel[1]))
+ else:
+ self.axis.set_title("%s" %(ylabel[0]))
+
+ self.axis.grid(True)
+ for tl in self.axis.get_yticklabels():
+ tl.set_color('%s' %color[i])
+ if i==1:
+ ax2 = self.axis.twinx()
+ ax2.plot(xvalues[i], yvalues[i], color=color[i])
+ for tl in ax2.get_yticklabels():
+ tl.set_color('%s' %color[i])
+ # axis2 = self.axis.twinx()
+ # axis2.plot(xvalues[i],yvalues[i], color=color[i])
+ #axis2.set_ylabel(ylabel[i],color=color[i])
+ #else:
+ # self.axis =self.figure.add_subplot(211 + i)
i+=1
-
- if zones!=None:
- for zone in zones:
- p = self.axis.axhspan(zone[0], zone[1], facecolor=zone[2], alpha=0.5, label=zone[3])
- l = self.axis.legend(loc='lower right')
+
+
+ #if zones!=None:
+ # for zone in zones:
+ # p = self.axis.axhspan(zone[0], zone[1], facecolor=zone[2], alpha=0.5, label=zone[3])
+ # l = self.axis.legend(loc='lower right')
self.canvas = FigureCanvasGTK(self.figure) # a gtk.DrawingArea
self.canvas.show()
self.vbox.pack_start(self.canvas, True, True)
Modified: pytrainer/trunk/pytrainer.sh
===================================================================
--- pytrainer/trunk/pytrainer.sh 2009-06-20 10:38:44 UTC (rev 331)
+++ pytrainer/trunk/pytrainer.sh 2009-06-25 22:29:24 UTC (rev 332)
@@ -1,5 +1,6 @@
#/bin/sh
# First arg is log level, e.g. -d for DEBUG
+
export LD_LIBRARY_PATH=/usr/lib/firefox
# Building xulrunner path to avoid problems when upgrading
PATH_XULRUNNER=/usr/lib
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <dg...@us...> - 2009-06-20 10:38:46
|
Revision: 331
http://pytrainer.svn.sourceforge.net/pytrainer/?rev=331&view=rev
Author: dgranda
Date: 2009-06-20 10:38:44 +0000 (Sat, 20 Jun 2009)
Log Message:
-----------
Dirty fix for bug #2717135: widgets (graphs) not being destroyed properly, forcing removal
Modified Paths:
--------------
pytrainer/trunk/pytrainer/gui/drawArea.py
pytrainer/trunk/pytrainer/main.py
pytrainer/trunk/pytrainer/recordgraph.py
Modified: pytrainer/trunk/pytrainer/gui/drawArea.py
===================================================================
--- pytrainer/trunk/pytrainer/gui/drawArea.py 2009-05-17 17:06:07 UTC (rev 330)
+++ pytrainer/trunk/pytrainer/gui/drawArea.py 2009-06-20 10:38:44 UTC (rev 331)
@@ -29,24 +29,20 @@
def __init__(self, vbox = None):
logging.debug('>>')
self.figure = Figure(figsize=(6,4), dpi=72)
- self.axis = self.figure.add_subplot(111)
+ self.axis = self.figure.add_subplot(111)
self.vbox = vbox
- self.canvas = FigureCanvasGTK(self.figure) # a gtk.DrawingArea
- self.drawDefault()
+ self.canvas = FigureCanvasGTK(self.figure) # a gtk.DrawingArea
+ #self.drawDefault()
logging.debug('<<')
def stadistics(self,type,xvalues,yvalues,xlabel,ylabel,title,color,zones=None):
logging.debug('>>')
if len(xvalues[0]) < 1:
- self.drawDefault()
+ #self.drawDefault()
return False
- logging.debug('xvalues: '+str(xvalues))
- logging.debug('yvalues: '+str(yvalues))
- logging.debug('xlabel: '+str(xlabel))
- logging.debug('ylabel: '+str(ylabel))
- logging.debug('title: '+str(title))
- logging.debug('color: '+str(color))
- logging.debug('zones: '+str(zones))
+ #logging.debug('xvalues: '+str(xvalues))
+ #logging.debug('yvalues: '+str(yvalues))
+ logging.info("Type: "+type+" | title: "+str(title)+" | col: "+str(color)+" | xlabel: "+str(xlabel)+" | ylabel: "+str(ylabel))
if type == "bars":
self.drawBars(xvalues,yvalues,xlabel,ylabel,title,color)
elif type == "plot":
@@ -58,6 +54,7 @@
def drawBars(self,xvalues,yvalues,xlabel,ylabel,title,color):
logging.debug('>>')
self.canvas.destroy()
+ self.vbox.remove(self.canvas)
self.figure = Figure(figsize=(6,4), dpi=72)
self.canvas = FigureCanvasGTK(self.figure) # a gtk.DrawingArea
self.axis.clear()
@@ -83,11 +80,12 @@
def drawPlot(self,xvalues,yvalues,xlabel,ylabel,title,color,zones=None):
logging.debug('>>')
self.canvas.destroy()
+ self.vbox.remove(self.canvas)
self.figure = Figure(figsize=(6,4), dpi=72)
- #self.canvas = FigureCanvasGTK(self.figure) # a gtk.DrawingArea
#self.axis.clear()
i = 0
for value in xvalues:
+ #logging.debug('xvalues: '+str(xvalues))
if len(xvalues) == 1:
self.axis = self.figure.add_subplot(111)
else:
@@ -115,6 +113,7 @@
def drawPie(self,xvalues,yvalues,xlabel,ylabel,title,color,zones=None):
logging.debug('>>')
self.canvas.destroy()
+ self.vbox.remove(self.canvas)
self.figure = Figure(figsize=(6,4), dpi=72)
#self.canvas = FigureCanvasGTK(self.figure) # a gtk.DrawingArea
#self.axis.clear()
Modified: pytrainer/trunk/pytrainer/main.py
===================================================================
--- pytrainer/trunk/pytrainer/main.py 2009-05-17 17:06:07 UTC (rev 330)
+++ pytrainer/trunk/pytrainer/main.py 2009-06-20 10:38:44 UTC (rev 331)
@@ -221,6 +221,7 @@
def refreshRecordGraphView(self, view):
logging.debug('>>')
+ logging.info('Working on '+view+' graph')
if view=="info":
selected,iter = self.windowmain.recordTreeView.get_selection().get_selected()
record_list=[]
Modified: pytrainer/trunk/pytrainer/recordgraph.py
===================================================================
--- pytrainer/trunk/pytrainer/recordgraph.py 2009-05-17 17:06:07 UTC (rev 330)
+++ pytrainer/trunk/pytrainer/recordgraph.py 2009-06-20 10:38:44 UTC (rev 331)
@@ -36,7 +36,9 @@
tit = []
col = []
value_selected = self.combovalue.get_active()
+ logging.debug("Value selected 1: "+ str(value_selected))
value_selected2 = self.combovalue2.get_active()
+ logging.debug("Value selected 2: "+ str(value_selected2))
if value_selected < 0:
self.combovalue.set_active(0)
value_selected = 0
@@ -68,6 +70,7 @@
ylab.append(ylabel)
tit.append("")
col.append(color)
+ logging.info("To show: tit: "+str(tit)+" | col: "+str(col)+" | xlab: "+str(xlab)+" | ylab: "+str(ylab))
self.drawarea.stadistics("plot",xval,yval,xlab,ylab,tit,col)
logging.debug("<<")
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <dg...@us...> - 2009-05-17 17:06:15
|
Revision: 330
http://pytrainer.svn.sourceforge.net/pytrainer/?rev=330&view=rev
Author: dgranda
Date: 2009-05-17 17:06:07 +0000 (Sun, 17 May 2009)
Log Message:
-----------
Removed executable bit
Property Changed:
----------------
pytrainer/trunk/glade/logo.png
pytrainer/trunk/glade/pixmaps/logo.png
Property changes on: pytrainer/trunk/glade/logo.png
___________________________________________________________________
Deleted: svn:executable
- *
Property changes on: pytrainer/trunk/glade/pixmaps/logo.png
___________________________________________________________________
Deleted: svn:executable
- *
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <dg...@us...> - 2009-05-17 16:48:52
|
Revision: 329
http://pytrainer.svn.sourceforge.net/pytrainer/?rev=329&view=rev
Author: dgranda
Date: 2009-05-17 16:48:27 +0000 (Sun, 17 May 2009)
Log Message:
-----------
Changing address of FSF - Bug ID 2791401
Modified Paths:
--------------
pytrainer/trunk/COPYING
pytrainer/trunk/pytrainer/gui/aboutdialog.py
Modified: pytrainer/trunk/COPYING
===================================================================
--- pytrainer/trunk/COPYING 2009-04-19 20:16:15 UTC (rev 328)
+++ pytrainer/trunk/COPYING 2009-05-17 16:48:27 UTC (rev 329)
@@ -2,7 +2,7 @@
Version 2, June 1991
Copyright (C) 1989, 1991 Free Software Foundation, Inc.
- 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
Everyone is permitted to copy and distribute verbatim copies
of this license document, but changing it is not allowed.
@@ -55,7 +55,7 @@
The precise terms and conditions for copying, distribution and
modification follow.
-
+
GNU GENERAL PUBLIC LICENSE
TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
@@ -110,7 +110,7 @@
License. (Exception: if the Program itself is interactive but
does not normally print such an announcement, your work based on
the Program is not required to print an announcement.)
-
+
These requirements apply to the modified work as a whole. If
identifiable sections of that work are not derived from the Program,
and can be reasonably considered independent and separate works in
@@ -168,7 +168,7 @@
access to copy the source code from the same place counts as
distribution of the source code, even though third parties are not
compelled to copy the source along with the object code.
-
+
4. You may not copy, modify, sublicense, or distribute the Program
except as expressly provided under this License. Any attempt
otherwise to copy, modify, sublicense or distribute the Program is
@@ -225,7 +225,7 @@
This section is intended to make thoroughly clear what is believed to
be a consequence of the rest of this License.
-
+
8. If the distribution and/or use of the Program is restricted in
certain countries either by patents or by copyrighted interfaces, the
original copyright holder who places the Program under this License
@@ -278,7 +278,7 @@
POSSIBILITY OF SUCH DAMAGES.
END OF TERMS AND CONDITIONS
-
+
How to Apply These Terms to Your New Programs
If you develop a new program, and you want it to be of the greatest
Modified: pytrainer/trunk/pytrainer/gui/aboutdialog.py
===================================================================
--- pytrainer/trunk/pytrainer/gui/aboutdialog.py 2009-04-19 20:16:15 UTC (rev 328)
+++ pytrainer/trunk/pytrainer/gui/aboutdialog.py 2009-05-17 16:48:27 UTC (rev 329)
@@ -17,7 +17,7 @@
#You should have received a copy of the GNU General Public License
#along with this program; if not, write to the Free Software
-#Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+#Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
import gtk
@@ -29,7 +29,7 @@
def run(self):
authors = ["Fiz Vázquez <vu...@si...>\nDavid García Granda <dg...@gm...>"]
translator_credits = "Basque: Jabier Santamaria <men...@gm...>\nCatalan: Eloi Crespillo Itchart <el...@ik...>\nCzech: Lobus Pokorny <sp...@se...>\nFrench: Dj <dj...@dj...>\nFrench: Pierre Gaigé <pg...@fr...>\nNorwegian: Havard Davidsen <hav...@gm...>\nPolish: Seweryn Kokot <sk...@po...>\nGerman: Aleks <al...@sc...>\nSpanish: Fiz Vázquez <vu...@si...>"
- license = "PyTrainer - The free sport tracking center\nCopyright (C) 2005-08 Fiz Vázquez\n\nThis program is free software; you can redistribute it and/or modify\nit under the terms of the GNU General Public License as published by\nthe Free Software Foundation; either version 2 of the License, or\n(at your option) any later version.\n\nThis program is distributed in the hope that it will be useful,\nbut WITHOUT ANY WARRANTY; without even the implied warranty of\nMERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the\nGNU General Public License for more details.\n\nYou should have received a copy of the GNU General Public License\nalong with this program; if not, write to the Free Software\nFoundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA"
+ license = "PyTrainer - The free sport tracking center\nCopyright (C) 2005-08 Fiz Vázquez\n\nThis program is free software; you can redistribute it and/or modify\nit under the terms of the GNU General Public License as published by\nthe Free Software Foundation; either version 2 of the License, or\n(at your option) any later version.\n\nThis program is distributed in the hope that it will be useful,\nbut WITHOUT ANY WARRANTY; without even the implied warranty of\nMERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the\nGNU General Public License for more details.\n\nYou should have received a copy of the GNU General Public License\nalong with this program; if not, write to the Free Software\nFoundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA"
about_dialog = gtk.AboutDialog()
about_dialog.set_destroy_with_parent(True)
about_dialog.set_name("pyTrainer")
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <dg...@us...> - 2009-04-19 20:16:19
|
Revision: 328
http://pytrainer.svn.sourceforge.net/pytrainer/?rev=328&view=rev
Author: dgranda
Date: 2009-04-19 20:16:15 +0000 (Sun, 19 Apr 2009)
Log Message:
-----------
Tagging 1.6.0.8 release
Added Paths:
-----------
pytrainer/tags/1.6.0.8/
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <dg...@us...> - 2009-04-19 20:15:04
|
Revision: 327
http://pytrainer.svn.sourceforge.net/pytrainer/?rev=327&view=rev
Author: dgranda
Date: 2009-04-19 20:14:55 +0000 (Sun, 19 Apr 2009)
Log Message:
-----------
updating latest changes for 1.6.0.8
Modified Paths:
--------------
pytrainer/trunk/CHANGES
Modified: pytrainer/trunk/CHANGES
===================================================================
--- pytrainer/trunk/CHANGES 2009-04-19 16:30:59 UTC (rev 326)
+++ pytrainer/trunk/CHANGES 2009-04-19 20:14:55 UTC (rev 327)
@@ -2,7 +2,7 @@
Rotating log file support added (rev 322, http://sourceforge.net/tracker/?func=detail&aid=2717142&group_id=213157&atid=1024595)
Translations reviewed and added script to facilitate them (rev 319-321,323)
-Several improvements to Wordpress extension (rev 315,317)
+Several improvements to Wordpress extension (rev 315,317,326)
Changed potential problems when dealing with date objects using MySQL as DB (rev 311-314)
Removing redundant calls improving graphical performance (rev 310, linked to http://sourceforge.net/tracker/?func=detail&aid=2717135&group_id=213157&atid=1024592, not yet fully fixed)
Optimizing xml files parsing when retrieving data from them (rev 309)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <vu...@us...> - 2009-04-19 16:31:14
|
Revision: 326
http://pytrainer.svn.sourceforge.net/pytrainer/?rev=326&view=rev
Author: vud1
Date: 2009-04-19 16:30:59 +0000 (Sun, 19 Apr 2009)
Log Message:
-----------
"hr image and profile image are now independient in wordpress extension"
Modified Paths:
--------------
pytrainer/trunk/extensions/wordpress/main.py
Modified: pytrainer/trunk/extensions/wordpress/main.py
===================================================================
--- pytrainer/trunk/extensions/wordpress/main.py 2009-04-19 10:37:23 UTC (rev 325)
+++ pytrainer/trunk/extensions/wordpress/main.py 2009-04-19 16:30:59 UTC (rev 326)
@@ -114,20 +114,28 @@
''' %(self.sport,self.date,self.distance,self.time,self.maxspeed,self.average,self.maxpace,self.pace,self.maxbeats,self.beats,self.upositive,self.unegative)
return description_table
- def createFigures(self):
+ def createFigureHR(self):
hr_fig_path = "/tmp/hr.png"
+ blog_figures = ''
+ # If there are no graphs, return empty string.
+ if os.path.isfile(hr_fig_path):
+ #the graph files are created because the graph tabs are automatically visited (which invokes graph generation)
+ hrfile = self.wp.newMediaObject(hr_fig_path)
+ blog_figures = '''<br/> <img src='%s' /> ''' %hrfile
+ return blog_figures
+
+ def createFigureStage(self):
stage_fig_path = "/tmp/stage.png"
blog_figures = ''
# If there are no graphs, return empty string.
- if os.path.isfile(hr_fig_path) and os.path.isfile(stage_fig_path):
+ if os.path.isfile(stage_fig_path):
#the graph files are created because the graph tabs are automatically visited (which invokes graph generation)
- hrfile = self.wp.newMediaObject(hr_fig_path)
stagefile = self.wp.newMediaObject(stage_fig_path)
- blog_figures = '''<br/> <img src='%s' /> <img src='%s' /> <br/>''' %(hrfile, stagefile)
+ blog_figures = '''<br/> <img src='%s' /> ''' %stagefile
return blog_figures
def createFoot(self):
- return ''' <center>Powered by <a href='http://sourceforge.net/projects/pytrainer/'>Pytrainer</a></center>'''
+ return ''' <br/><center>Powered by <a href='http://sourceforge.net/projects/pytrainer/'>Pytrainer</a></center>'''
def createTitle(self):
if self.title==None:
@@ -151,13 +159,14 @@
blog_route = self.createRoute()
blog_body = self.createBody()
blog_table = self.createTable()
- blog_figures = self.createFigures()
+ blog_figureHR = self.createFigureHR()
+ blog_figureStage = self.createFigureStage()
blog_foot = self.createFoot()
self.wp.selectBlog(0)
post = wordpresslib.WordPressPost()
post.title = blog_title
- post.description = blog_body+blog_table+blog_route+blog_figures+blog_foot
+ post.description = blog_body+blog_table+blog_route+blog_figureHR+blog_figureStage+blog_foot
post.categories = blog_category
idNewPost = self.wp.newPost(post, True)
return "The post has been submited"
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <dg...@us...> - 2009-04-19 10:37:35
|
Revision: 325
http://pytrainer.svn.sourceforge.net/pytrainer/?rev=325&view=rev
Author: dgranda
Date: 2009-04-19 10:37:23 +0000 (Sun, 19 Apr 2009)
Log Message:
-----------
Updating changelog and version to 1.6.0.8
Modified Paths:
--------------
pytrainer/trunk/CHANGES
pytrainer/trunk/pytrainer/main.py
Modified: pytrainer/trunk/CHANGES
===================================================================
--- pytrainer/trunk/CHANGES 2009-04-19 10:32:07 UTC (rev 324)
+++ pytrainer/trunk/CHANGES 2009-04-19 10:37:23 UTC (rev 325)
@@ -1,3 +1,12 @@
+- PyTrainer tasks for 1.6.0.8:
+
+Rotating log file support added (rev 322, http://sourceforge.net/tracker/?func=detail&aid=2717142&group_id=213157&atid=1024595)
+Translations reviewed and added script to facilitate them (rev 319-321,323)
+Several improvements to Wordpress extension (rev 315,317)
+Changed potential problems when dealing with date objects using MySQL as DB (rev 311-314)
+Removing redundant calls improving graphical performance (rev 310, linked to http://sourceforge.net/tracker/?func=detail&aid=2717135&group_id=213157&atid=1024592, not yet fully fixed)
+Optimizing xml files parsing when retrieving data from them (rev 309)
+
- PyTrainer tasks for 1.6.0.7:
Removing pytrainer gui minimal window size (svn rev 304)
Modified: pytrainer/trunk/pytrainer/main.py
===================================================================
--- pytrainer/trunk/pytrainer/main.py 2009-04-19 10:32:07 UTC (rev 324)
+++ pytrainer/trunk/pytrainer/main.py 2009-04-19 10:37:23 UTC (rev 325)
@@ -86,7 +86,7 @@
def __init__(self,filename = None, data_path = None):
logging.debug('>>')
self.data_path = data_path
- self.version ="1.6.0.7" # 20.10.2008
+ self.version ="1.6.0.8" # 19.04.2009
self.date = Date()
# Checking profile
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <dg...@us...> - 2009-04-19 10:32:17
|
Revision: 324
http://pytrainer.svn.sourceforge.net/pytrainer/?rev=324&view=rev
Author: dgranda
Date: 2009-04-19 10:32:07 +0000 (Sun, 19 Apr 2009)
Log Message:
-----------
Logging improved
Modified Paths:
--------------
pytrainer/trunk/pytrainer/gui/drawArea.py
pytrainer/trunk/pytrainer/gui/windowmain.py
pytrainer/trunk/pytrainer/main.py
pytrainer/trunk/pytrainer/recordgraph.py
Modified: pytrainer/trunk/pytrainer/gui/drawArea.py
===================================================================
--- pytrainer/trunk/pytrainer/gui/drawArea.py 2009-04-18 20:26:19 UTC (rev 323)
+++ pytrainer/trunk/pytrainer/gui/drawArea.py 2009-04-19 10:32:07 UTC (rev 324)
@@ -23,28 +23,41 @@
from matplotlib.backends.backend_gtk import FigureCanvasGTK, NavigationToolbar
from matplotlib.numerix import *
from pylab import *
+import logging
class DrawArea:
def __init__(self, vbox = None):
+ logging.debug('>>')
self.figure = Figure(figsize=(6,4), dpi=72)
self.axis = self.figure.add_subplot(111)
self.vbox = vbox
self.canvas = FigureCanvasGTK(self.figure) # a gtk.DrawingArea
self.drawDefault()
+ logging.debug('<<')
def stadistics(self,type,xvalues,yvalues,xlabel,ylabel,title,color,zones=None):
+ logging.debug('>>')
if len(xvalues[0]) < 1:
self.drawDefault()
return False
+ logging.debug('xvalues: '+str(xvalues))
+ logging.debug('yvalues: '+str(yvalues))
+ logging.debug('xlabel: '+str(xlabel))
+ logging.debug('ylabel: '+str(ylabel))
+ logging.debug('title: '+str(title))
+ logging.debug('color: '+str(color))
+ logging.debug('zones: '+str(zones))
if type == "bars":
self.drawBars(xvalues,yvalues,xlabel,ylabel,title,color)
elif type == "plot":
self.drawPlot(xvalues,yvalues,xlabel,ylabel,title,color,zones)
elif type == "pie":
self.drawPie(xvalues,yvalues,xlabel,ylabel,title,color,zones)
+ logging.debug('<<')
def drawBars(self,xvalues,yvalues,xlabel,ylabel,title,color):
- self.canvas.destroy()
+ logging.debug('>>')
+ self.canvas.destroy()
self.figure = Figure(figsize=(6,4), dpi=72)
self.canvas = FigureCanvasGTK(self.figure) # a gtk.DrawingArea
self.axis.clear()
@@ -52,55 +65,60 @@
i=0
for value in xvalues:
if len(xvalues) == 1:
- self.axis = self.figure.add_subplot(111)
+ self.axis = self.figure.add_subplot(111)
else:
- self.axis =self.figure.add_subplot(211 + i)
- self.axis.set_xlim(-width,len(xvalues[i]))
+ self.axis =self.figure.add_subplot(211 + i)
+ self.axis.set_xlim(-width,len(xvalues[i]))
self.axis.set_xlabel(xlabel[i])
self.axis.set_ylabel(ylabel[i])
- self.axis.set_title(title[i])
+ self.axis.set_title(title[i])
+ p1 = self.axis.bar(xvalues[i], yvalues[i], width, color=color[i])
+ i+=1
- p1 = self.axis.bar(xvalues[i], yvalues[i], width, color=color[i])
- i+=1
self.canvas = FigureCanvasGTK(self.figure) # a gtk.DrawingArea
- self.canvas.show()
- self.vbox.pack_start(self.canvas, True, True)
+ self.canvas.show()
+ self.vbox.pack_start(self.canvas, True, True)
+ logging.debug('<<')
def drawPlot(self,xvalues,yvalues,xlabel,ylabel,title,color,zones=None):
- self.canvas.destroy()
+ logging.debug('>>')
+ self.canvas.destroy()
self.figure = Figure(figsize=(6,4), dpi=72)
- #self.canvas = FigureCanvasGTK(self.figure) # a gtk.DrawingArea
+ #self.canvas = FigureCanvasGTK(self.figure) # a gtk.DrawingArea
#self.axis.clear()
i = 0
for value in xvalues:
if len(xvalues) == 1:
- self.axis = self.figure.add_subplot(111)
+ self.axis = self.figure.add_subplot(111)
else:
- self.axis =self.figure.add_subplot(211 + i)
+ self.axis =self.figure.add_subplot(211 + i)
self.axis.set_xlabel(xlabel[i])
self.axis.set_ylabel(ylabel[i])
self.axis.set_title(title[i])
- self.axis.grid(True)
- self.axis.plot(xvalues[i],yvalues[i], color=color[i])
+ self.axis.grid(True)
+ self.axis.plot(xvalues[i],yvalues[i], color=color[i])
i+=1
+
if zones!=None:
for zone in zones:
- p = self.axis.axhspan(zone[0], zone[1], facecolor=zone[2], alpha=0.5, label=zone[3])
+ p = self.axis.axhspan(zone[0], zone[1], facecolor=zone[2], alpha=0.5, label=zone[3])
l = self.axis.legend(loc='lower right')
self.canvas = FigureCanvasGTK(self.figure) # a gtk.DrawingArea
self.canvas.show()
- self.vbox.pack_start(self.canvas, True, True)
+ self.vbox.pack_start(self.canvas, True, True)
if title[0] == 'Stage Profile':
self.figure.savefig('/tmp/stage.png', dpi=75)
if title[0] == 'Heart Rate':
self.figure.savefig('/tmp/hr.png', dpi=75)
+ logging.debug('<<')
def drawPie(self,xvalues,yvalues,xlabel,ylabel,title,color,zones=None):
- self.canvas.destroy()
+ logging.debug('>>')
+ self.canvas.destroy()
self.figure = Figure(figsize=(6,4), dpi=72)
- #self.canvas = FigureCanvasGTK(self.figure) # a gtk.DrawingArea
+ #self.canvas = FigureCanvasGTK(self.figure) # a gtk.DrawingArea
#self.axis.clear()
- self.axis = self.figure.add_subplot(111)
+ self.axis = self.figure.add_subplot(111)
labels = ["rest"]
colors = ["#ffffff"]
@@ -134,40 +152,44 @@
self.canvas = FigureCanvasGTK(self.figure) # a gtk.DrawingArea
self.canvas.show()
- self.vbox.pack_start(self.canvas, True, True)
+ self.vbox.pack_start(self.canvas, True, True)
+ logging.debug('<<')
def drawDefault(self):
- #self.axis.clear()
- self.axis=self.figure.add_subplot(111)
- self.axis.set_xlabel('Yepper')
- self.axis.set_ylabel('Flabber')
- self.axis.set_title('An Empty Graph')
- self.axis.grid(True)
- self.canvas.destroy()
- self.canvas = FigureCanvasGTK(self.figure) # a gtk.DrawingArea
- self.canvas.show()
- self.vbox.pack_start(self.canvas, True, True)
+ logging.debug('>>')
+ self.axis=self.figure.add_subplot(111)
+ self.axis.set_xlabel('Yepper')
+ self.axis.set_ylabel('Flabber')
+ self.axis.set_title('An Empty Graph')
+ self.axis.grid(True)
+ self.canvas.destroy()
+ self.canvas = FigureCanvasGTK(self.figure) # a gtk.DrawingArea
+ self.canvas.show()
+ self.vbox.pack_start(self.canvas, True, True)
+ logging.debug('<<')
def fill_over(self, ax, x, y, val, color, over=True):
- """
- Plot filled x,y for all y over val
- if over = False, fill all areas < val
- """
- ybase = asarray(y)-val
- crossings = nonzero(less(ybase[:-1] * ybase[1:],0))
+ """
+ Plot filled x,y for all y over val
+ if over = False, fill all areas < val
+ """
+ logging.debug('>>')
+ ybase = asarray(y)-val
+ crossings = nonzero(less(ybase[:-1] * ybase[1:],0))
- if ybase[0]>=0: fillon = over
- else: fillon = not over
+ if ybase[0]>=0:
+ fillon = over
+ else:
+ fillon = not over
+ indLast = 0
+ for ind in crossings:
+ if fillon:
+ thisX = x[indLast:ind+1]
+ thisY = y[indLast:ind+1]
+ thisY[0] = val
+ thisY[-1] = val
+ ax.fill(thisX, thisY, color)
+ fillon = not fillon
+ indLast = ind
+ logging.debug('<<')
-
- indLast = 0
- for ind in crossings:
- if fillon:
- thisX = x[indLast:ind+1]
- thisY = y[indLast:ind+1]
- thisY[0] = val
- thisY[-1] = val
- ax.fill(thisX, thisY, color)
- fillon = not fillon
- indLast = ind
-
Modified: pytrainer/trunk/pytrainer/gui/windowmain.py
===================================================================
--- pytrainer/trunk/pytrainer/gui/windowmain.py 2009-04-18 20:26:19 UTC (rev 323)
+++ pytrainer/trunk/pytrainer/gui/windowmain.py 2009-04-19 10:32:07 UTC (rev 324)
@@ -112,14 +112,15 @@
self.googlemaps = Googlemaps(self.data_path, self.map_vbox,waypoint)
def updateSportList(self,listSport):
+ logging.debug(">>")
self.sportlist.set_active(1)
while (self.sportlist.get_active() == 1):
self.sportlist.remove_text(1)
self.sportlist.set_active(1)
-
for i in listSport:
self.sportlist.append_text(i[0])
self.sportlist.set_active(0)
+ logging.debug("<<")
def create_treeview(self,treeview,column_names):
i=0
@@ -211,6 +212,7 @@
self.record_vbox.set_sensitive(1)
else:
self.record_vbox.set_sensitive(0)
+ #logging.debug("Going to draw "+str(record_list))
self.drawarearecord.drawgraph(record_list)
logging.debug("<<")
Modified: pytrainer/trunk/pytrainer/main.py
===================================================================
--- pytrainer/trunk/pytrainer/main.py 2009-04-18 20:26:19 UTC (rev 323)
+++ pytrainer/trunk/pytrainer/main.py 2009-04-19 10:32:07 UTC (rev 324)
@@ -140,7 +140,7 @@
logging.debug('>>')
activeplugins = self.plugins.getActivePlugins()
if (len(activeplugins)<1):
- print _("No Active Plugins")
+ logging.info("No active plugins")
else:
for plugin in activeplugins:
txtbutton = self.plugins.loadPlugin(plugin)
@@ -151,7 +151,7 @@
logging.debug('>>')
activeextensions = self.extension.getActiveExtensions()
if (len(activeextensions)<1):
- print _("No Active Extensions")
+ logging.info("No active extensions")
else:
for extension in activeextensions:
txtbutton = self.extension.loadExtension(extension)
Modified: pytrainer/trunk/pytrainer/recordgraph.py
===================================================================
--- pytrainer/trunk/pytrainer/recordgraph.py 2009-04-18 20:26:19 UTC (rev 323)
+++ pytrainer/trunk/pytrainer/recordgraph.py 2009-04-19 10:32:07 UTC (rev 324)
@@ -16,15 +16,19 @@
#along with this program; if not, write to the Free Software
#Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+import logging
from gui.drawArea import DrawArea
class RecordGraph:
def __init__(self, vbox = None, combovalue = None, combovalue2 = None):
+ logging.debug(">>")
self.drawarea = DrawArea(vbox)
self.combovalue = combovalue
self.combovalue2 = combovalue2
+ logging.debug("<<")
def drawgraph(self,values):
+ logging.debug(">>")
xval = []
yval = []
xlab = []
@@ -63,9 +67,9 @@
xlab.append(xlabel)
ylab.append(ylabel)
tit.append("")
- col.append(color)
-
+ col.append(color)
self.drawarea.stadistics("plot",xval,yval,xlab,ylab,tit,col)
+ logging.debug("<<")
def get_value_params(self,value):
if value == 0:
@@ -79,6 +83,7 @@
def get_values(self,values, value_selected):
+ logging.debug(">>")
xvalue = []
yvalue = []
for value in values:
@@ -94,6 +99,7 @@
yvalue.append(0)
if value_selected==3:
yvalue.append(value[6])
+ logging.debug("<<")
return xvalue,yvalue
def getFloatValue(self, value):
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <vu...@us...> - 2009-04-18 20:26:24
|
Revision: 323
http://pytrainer.svn.sourceforge.net/pytrainer/?rev=323&view=rev
Author: vud1
Date: 2009-04-18 20:26:19 +0000 (Sat, 18 Apr 2009)
Log Message:
-----------
"translation util updated"
Modified Paths:
--------------
pytrainer/trunk/utils/translator.sh
Modified: pytrainer/trunk/utils/translator.sh
===================================================================
--- pytrainer/trunk/utils/translator.sh 2009-04-18 11:36:01 UTC (rev 322)
+++ pytrainer/trunk/utils/translator.sh 2009-04-18 20:26:19 UTC (rev 323)
@@ -1,7 +1,7 @@
#!/bin/sh
-SOFTWARE=$(zenity --list --text="Select your translation software" --radiolist --column "Pick" --column "Software" TRUE "gtranslator" FALSE "kbabel")
+SOFTWARE=$(zenity --list --text="Select your translation software" --radiolist --column "Pick" --column "Software" TRUE "gtranslator" FALSE "kbabel" FALSE "poedit")
if [ $? != 0 ]; then exit ; fi
LANGUAGE=$(zenity --list --text="Select your language" --radiolist --column "Pick" --column "Language" TRUE "es" FALSE "eu" FALSE "ca" FALSE "fr" FALSE "da" FALSE "de" FALSE "pl" FALSE "no" FALSE "cs" FALSE "ru" FALSE "pl")
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <dg...@us...> - 2009-04-18 11:36:03
|
Revision: 322
http://pytrainer.svn.sourceforge.net/pytrainer/?rev=322&view=rev
Author: dgranda
Date: 2009-04-18 11:36:01 +0000 (Sat, 18 Apr 2009)
Log Message:
-----------
Rotating log file support added
Modified Paths:
--------------
pytrainer/trunk/pytrainer/main.py
Modified: pytrainer/trunk/pytrainer/main.py
===================================================================
--- pytrainer/trunk/pytrainer/main.py 2009-04-16 20:38:15 UTC (rev 321)
+++ pytrainer/trunk/pytrainer/main.py 2009-04-18 11:36:01 UTC (rev 322)
@@ -26,8 +26,11 @@
import gtk
import gtk.glade
import logging
+import logging.handlers
import traceback
+from os import path
+
from record import Record
from waypoint import Waypoint
from extension import Extension
@@ -54,25 +57,30 @@
from lib.system import checkConf
from lib.heartrate import *
-# 21.03.2008 - dgranda
-# setting up logging
+# 21.03.2008 - dgranda (updated 17.04.2008)
# Only one parameter from command line is accepted
# ERROR is the default log level
-debug_level = logging.ERROR
-if len(sys.argv) >1:
+log_level = logging.ERROR
+PATH = os.environ['HOME']+"/.pytrainer"
+if not os.path.exists(PATH):
+ os.mkdir(PATH)
+LOG_FILENAME = PATH + "/log.out"
+if len(sys.argv) > 1:
if sys.argv[1]=='-d':
- debug_level = logging.DEBUG
+ log_level = logging.DEBUG
elif sys.argv[1]=='-i':
- debug_level = logging.INFO
+ log_level = logging.INFO
elif sys.argv[1]=='-w':
- debug_level = logging.WARNING
+ log_level = logging.WARNING
else:
print "CLI - Unknown parameter "+sys.argv[1]
-print "*** Log level set to "+ logging.getLevelName(debug_level) +" ***"
-logging.basicConfig(level=debug_level,
- format='%(asctime)s|%(levelname)s|%(module)s|%(funcName)s|%(message)s',
- filemode='w')
+# Adding rotating support to default logger with customized format
+rotHandler = logging.handlers.RotatingFileHandler(LOG_FILENAME, maxBytes=100000, backupCount=5)
+formatter = logging.Formatter('%(asctime)s|%(levelname)s|%(module)s|%(funcName)s|%(message)s')
+rotHandler.setFormatter(formatter)
+logging.getLogger('').addHandler(rotHandler)
+logging.getLogger('').setLevel(log_level)
class pyTrainer:
def __init__(self,filename = None, data_path = None):
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <vu...@us...> - 2009-04-16 20:38:29
|
Revision: 321
http://pytrainer.svn.sourceforge.net/pytrainer/?rev=321&view=rev
Author: vud1
Date: 2009-04-16 20:38:15 +0000 (Thu, 16 Apr 2009)
Log Message:
-----------
Adding translaters script
Modified Paths:
--------------
pytrainer/trunk/messages.pot
Added Paths:
-----------
pytrainer/trunk/utils/
pytrainer/trunk/utils/translator.sh
Modified: pytrainer/trunk/messages.pot
===================================================================
--- pytrainer/trunk/messages.pot 2009-04-16 20:36:20 UTC (rev 320)
+++ pytrainer/trunk/messages.pot 2009-04-16 20:38:15 UTC (rev 321)
@@ -8,203 +8,201 @@
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-03-03 19:57+0100\n"
+"POT-Creation-Date: 2009-04-16 22:27+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL...@li...>\n"
"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Type: text/plain; charset=CHARSET\n"
"Content-Transfer-Encoding: 8bit\n"
-#: glade/pytrainer.glade:10
+#: glade/pytrainer.glade:8
msgid "window1"
msgstr ""
-#: glade/pytrainer.glade:50
+#: glade/pytrainer.glade:48
msgid "_File"
msgstr ""
-#: glade/pytrainer.glade:74
+#: glade/pytrainer.glade:72
msgid "_Export as Text Separated by Commas"
msgstr ""
-#: glade/pytrainer.glade:114
+#: glade/pytrainer.glade:112
msgid "_Edit"
msgstr ""
-#: glade/pytrainer.glade:136
+#: glade/pytrainer.glade:134
msgid "_View"
msgstr ""
-#: glade/pytrainer.glade:145
+#: glade/pytrainer.glade:143
msgid " _Classic View"
msgstr ""
-#: glade/pytrainer.glade:156
+#: glade/pytrainer.glade:154
msgid " _List View"
msgstr ""
-#: glade/pytrainer.glade:168
+#: glade/pytrainer.glade:166
msgid " _Waypoints Editor"
msgstr ""
-#: glade/pytrainer.glade:184
+#: glade/pytrainer.glade:182
msgid "Tools"
msgstr ""
-#: glade/pytrainer.glade:194 glade/pytrainer.glade:12298
+#: glade/pytrainer.glade:192 glade/pytrainer.glade:12254
msgid "Extensions"
msgstr ""
-#: glade/pytrainer.glade:204
+#: glade/pytrainer.glade:202
msgid "GPS Device Plugins"
msgstr ""
-#: glade/pytrainer.glade:218
+#: glade/pytrainer.glade:216
msgid "_Help"
msgstr ""
-#: glade/pytrainer.glade:338 pytrainer/gui/windowmain.py:49
-#: pytrainer/gui/windowmain.py:52 pytrainer/gui/windowmain.py:471
-#: pytrainer/gui/windowprofile.py:67
+#: glade/pytrainer.glade:336
msgid "Sport"
msgstr ""
-#: glade/pytrainer.glade:364
+#: glade/pytrainer.glade:362
msgid "All Sports"
msgstr ""
-#: glade/pytrainer.glade:473 glade/pytrainer.glade:838
-#: glade/pytrainer.glade:866
+#: glade/pytrainer.glade:471 glade/pytrainer.glade:836
+#: glade/pytrainer.glade:864
msgid " "
msgstr ""
-#: glade/pytrainer.glade:501 glade/pytrainer.glade:894
+#: glade/pytrainer.glade:499 glade/pytrainer.glade:892
msgid " "
msgstr ""
-#: glade/pytrainer.glade:529
+#: glade/pytrainer.glade:527
msgid "<b>Sport:</b>"
msgstr ""
-#: glade/pytrainer.glade:557 glade/pytrainer.glade:2996
-#: glade/pytrainer.glade:4124 glade/pytrainer.glade:5419
+#: glade/pytrainer.glade:555 glade/pytrainer.glade:2994
+#: glade/pytrainer.glade:4122 glade/pytrainer.glade:5417
msgid "<b>Time:</b>"
msgstr ""
-#: glade/pytrainer.glade:586 glade/pytrainer.glade:3193
-#: glade/pytrainer.glade:4294 glade/pytrainer.glade:5643
+#: glade/pytrainer.glade:584 glade/pytrainer.glade:3191
+#: glade/pytrainer.glade:4292 glade/pytrainer.glade:5641
msgid "<b>Speed:</b>"
msgstr ""
-#: glade/pytrainer.glade:614 glade/pytrainer.glade:3502
-#: glade/pytrainer.glade:4658 glade/pytrainer.glade:5813
+#: glade/pytrainer.glade:612 glade/pytrainer.glade:3500
+#: glade/pytrainer.glade:4656 glade/pytrainer.glade:5811
msgid "<b>Pace:</b>"
msgstr ""
-#: glade/pytrainer.glade:642
+#: glade/pytrainer.glade:640
msgid "<b>Ascent:</b>"
msgstr ""
-#: glade/pytrainer.glade:670
+#: glade/pytrainer.glade:668
msgid "<b>Comments:</b>"
msgstr ""
-#: glade/pytrainer.glade:698 glade/pytrainer.glade:1381
-#: glade/pytrainer.glade:3249 glade/pytrainer.glade:3306
-#: glade/pytrainer.glade:4350 glade/pytrainer.glade:4519
-#: glade/pytrainer.glade:5699 glade/pytrainer.glade:5727
+#: glade/pytrainer.glade:696 glade/pytrainer.glade:1379
+#: glade/pytrainer.glade:3247 glade/pytrainer.glade:3304
+#: glade/pytrainer.glade:4348 glade/pytrainer.glade:4517
+#: glade/pytrainer.glade:5697 glade/pytrainer.glade:5725
msgid "km/h"
msgstr ""
-#: glade/pytrainer.glade:726 glade/pytrainer.glade:1091
-#: glade/pytrainer.glade:3530 glade/pytrainer.glade:3586
-#: glade/pytrainer.glade:4714 glade/pytrainer.glade:4742
-#: glade/pytrainer.glade:5870 glade/pytrainer.glade:5898
+#: glade/pytrainer.glade:724 glade/pytrainer.glade:1089
+#: glade/pytrainer.glade:3528 glade/pytrainer.glade:3584
+#: glade/pytrainer.glade:4712 glade/pytrainer.glade:4740
+#: glade/pytrainer.glade:5868 glade/pytrainer.glade:5896
msgid "min/km"
msgstr ""
-#: glade/pytrainer.glade:754 glade/pytrainer.glade:1147
+#: glade/pytrainer.glade:752 glade/pytrainer.glade:1145
msgid "m"
msgstr ""
-#: glade/pytrainer.glade:782
+#: glade/pytrainer.glade:780
msgid " "
msgstr ""
-#: glade/pytrainer.glade:810 glade/pytrainer.glade:1119
-#: glade/pytrainer.glade:2042 glade/pytrainer.glade:2070
-#: glade/pytrainer.glade:2098 glade/pytrainer.glade:2266
-#: glade/pytrainer.glade:3698 glade/pytrainer.glade:4854
+#: glade/pytrainer.glade:808 glade/pytrainer.glade:1117
+#: glade/pytrainer.glade:2040 glade/pytrainer.glade:2068
+#: glade/pytrainer.glade:2096 glade/pytrainer.glade:2264
+#: glade/pytrainer.glade:3696 glade/pytrainer.glade:4852
msgid " "
msgstr ""
-#: glade/pytrainer.glade:922
+#: glade/pytrainer.glade:920
msgid "<b>Date:</b>"
msgstr ""
-#: glade/pytrainer.glade:950 glade/pytrainer.glade:2968
-#: glade/pytrainer.glade:4096 glade/pytrainer.glade:5391
+#: glade/pytrainer.glade:948 glade/pytrainer.glade:2966
+#: glade/pytrainer.glade:4094 glade/pytrainer.glade:5389
msgid "<b>Distance:</b>"
msgstr ""
-#: glade/pytrainer.glade:979
+#: glade/pytrainer.glade:977
msgid "<b>Max Speed</b>"
msgstr ""
-#: glade/pytrainer.glade:1007 glade/pytrainer.glade:3558
-#: glade/pytrainer.glade:4686 glade/pytrainer.glade:5842
+#: glade/pytrainer.glade:1005 glade/pytrainer.glade:3556
+#: glade/pytrainer.glade:4684 glade/pytrainer.glade:5840
msgid "<b>Max Pace:</b>"
msgstr ""
-#: glade/pytrainer.glade:1035
+#: glade/pytrainer.glade:1033
msgid "<b>Descent:</b>"
msgstr ""
-#: glade/pytrainer.glade:1063
+#: glade/pytrainer.glade:1061
msgid " "
msgstr ""
-#: glade/pytrainer.glade:1213 glade/pytrainer.glade:2912
-#: glade/pytrainer.glade:4040 glade/pytrainer.glade:5615
+#: glade/pytrainer.glade:1211 glade/pytrainer.glade:2910
+#: glade/pytrainer.glade:4038 glade/pytrainer.glade:5613
msgid "Km"
msgstr ""
-#: glade/pytrainer.glade:1246 glade/pytrainer.glade:1296
-#: glade/pytrainer.glade:1346 glade/pytrainer.glade:3030
-#: glade/pytrainer.glade:3080 glade/pytrainer.glade:3130
-#: glade/pytrainer.glade:4208 glade/pytrainer.glade:4258
-#: glade/pytrainer.glade:5503 glade/pytrainer.glade:5553
+#: glade/pytrainer.glade:1244 glade/pytrainer.glade:1294
+#: glade/pytrainer.glade:1344 glade/pytrainer.glade:3028
+#: glade/pytrainer.glade:3078 glade/pytrainer.glade:3128
+#: glade/pytrainer.glade:4206 glade/pytrainer.glade:4256
+#: glade/pytrainer.glade:5501 glade/pytrainer.glade:5551
msgid "00"
msgstr ""
-#: glade/pytrainer.glade:1271 glade/pytrainer.glade:1321
-#: glade/pytrainer.glade:3055 glade/pytrainer.glade:3105
-#: glade/pytrainer.glade:4183 glade/pytrainer.glade:4233
-#: glade/pytrainer.glade:5478 glade/pytrainer.glade:5528
-#: glade/pytrainer.glade:7648 glade/pytrainer.glade:7693
+#: glade/pytrainer.glade:1269 glade/pytrainer.glade:1319
+#: glade/pytrainer.glade:3053 glade/pytrainer.glade:3103
+#: glade/pytrainer.glade:4181 glade/pytrainer.glade:4231
+#: glade/pytrainer.glade:5476 glade/pytrainer.glade:5526
+#: glade/pytrainer.glade:7646 glade/pytrainer.glade:7691
msgid ":"
msgstr ""
-#: glade/pytrainer.glade:1415 glade/pytrainer.glade:2377
-#: glade/pytrainer.glade:2939 glade/pytrainer.glade:3221
-#: glade/pytrainer.glade:3362 glade/pytrainer.glade:3446
-#: glade/pytrainer.glade:3726 glade/pytrainer.glade:3754
-#: glade/pytrainer.glade:4067 glade/pytrainer.glade:4322
-#: glade/pytrainer.glade:4406 glade/pytrainer.glade:4602
-#: glade/pytrainer.glade:4882 glade/pytrainer.glade:5222
-#: glade/pytrainer.glade:5306 glade/pytrainer.glade:5362
-#: glade/pytrainer.glade:5671 glade/pytrainer.glade:5954
-#: glade/pytrainer.glade:5982 glade/pytrainer.glade:6010
-#: glade/pytrainer.glade:6038
+#: glade/pytrainer.glade:1413 glade/pytrainer.glade:2375
+#: glade/pytrainer.glade:2937 glade/pytrainer.glade:3219
+#: glade/pytrainer.glade:3360 glade/pytrainer.glade:3444
+#: glade/pytrainer.glade:3724 glade/pytrainer.glade:3752
+#: glade/pytrainer.glade:4065 glade/pytrainer.glade:4320
+#: glade/pytrainer.glade:4404 glade/pytrainer.glade:4600
+#: glade/pytrainer.glade:4880 glade/pytrainer.glade:5220
+#: glade/pytrainer.glade:5304 glade/pytrainer.glade:5360
+#: glade/pytrainer.glade:5669 glade/pytrainer.glade:5952
+#: glade/pytrainer.glade:5980 glade/pytrainer.glade:6008
+#: glade/pytrainer.glade:6036
msgid " "
msgstr ""
-#: glade/pytrainer.glade:1522
+#: glade/pytrainer.glade:1520
msgid " <b>Title:</b>"
msgstr ""
-#: glade/pytrainer.glade:1636
+#: glade/pytrainer.glade:1634
msgid ""
"Profile\n"
"Speed\n"
@@ -212,12 +210,12 @@
"Heart Rate"
msgstr ""
-#: glade/pytrainer.glade:1655 glade/pytrainer.glade:5040
-#: glade/pytrainer.glade:6196
+#: glade/pytrainer.glade:1653 glade/pytrainer.glade:5038
+#: glade/pytrainer.glade:6194
msgid "Versus"
msgstr ""
-#: glade/pytrainer.glade:1680
+#: glade/pytrainer.glade:1678
msgid ""
"None\n"
"Profile\n"
@@ -226,135 +224,135 @@
"Heart Rate\n"
msgstr ""
-#: glade/pytrainer.glade:1845
+#: glade/pytrainer.glade:1843
msgid "<b>Beats:</b>"
msgstr ""
-#: glade/pytrainer.glade:1873 glade/pytrainer.glade:3334
-#: glade/pytrainer.glade:4378 glade/pytrainer.glade:5194
+#: glade/pytrainer.glade:1871 glade/pytrainer.glade:3332
+#: glade/pytrainer.glade:4376 glade/pytrainer.glade:5192
msgid "<b>Calories: </b>"
msgstr ""
-#: glade/pytrainer.glade:1901 glade/pytrainer.glade:3614
-#: glade/pytrainer.glade:4798 glade/pytrainer.glade:5926
+#: glade/pytrainer.glade:1899 glade/pytrainer.glade:3612
+#: glade/pytrainer.glade:4796 glade/pytrainer.glade:5924
msgid "<b>Max Beats:</b>"
msgstr ""
-#: glade/pytrainer.glade:1929
+#: glade/pytrainer.glade:1927
msgid "<b>HR Zones Method:</b>"
msgstr ""
-#: glade/pytrainer.glade:1958
+#: glade/pytrainer.glade:1956
msgid "<b>HR Zone5:</b>"
msgstr ""
-#: glade/pytrainer.glade:1986 glade/pytrainer.glade:2350
+#: glade/pytrainer.glade:1984 glade/pytrainer.glade:2348
msgid " bpm"
msgstr ""
-#: glade/pytrainer.glade:2014
+#: glade/pytrainer.glade:2012
msgid " Cal"
msgstr ""
-#: glade/pytrainer.glade:2126
+#: glade/pytrainer.glade:2124
msgid "<b>HR Zone4:</b>"
msgstr ""
-#: glade/pytrainer.glade:2154
+#: glade/pytrainer.glade:2152
msgid "<b>HR Zone3:</b>"
msgstr ""
-#: glade/pytrainer.glade:2182
+#: glade/pytrainer.glade:2180
msgid "<b>HR Zone2:</b>"
msgstr ""
-#: glade/pytrainer.glade:2210
+#: glade/pytrainer.glade:2208
msgid "<b>HR Zone1:</b>"
msgstr ""
-#: glade/pytrainer.glade:2238 glade/pytrainer.glade:2294
-#: glade/pytrainer.glade:2322 glade/pytrainer.glade:3670
-#: glade/pytrainer.glade:4491 glade/pytrainer.glade:4826
+#: glade/pytrainer.glade:2236 glade/pytrainer.glade:2292
+#: glade/pytrainer.glade:2320 glade/pytrainer.glade:3668
+#: glade/pytrainer.glade:4489 glade/pytrainer.glade:4824
msgid " "
msgstr ""
-#: glade/pytrainer.glade:2405 glade/pytrainer.glade:2432
-#: glade/pytrainer.glade:2460 glade/pytrainer.glade:2488
-#: glade/pytrainer.glade:2516 glade/pytrainer.glade:3474
-#: glade/pytrainer.glade:3642 glade/pytrainer.glade:4630
-#: glade/pytrainer.glade:4770 glade/pytrainer.glade:5334
-#: glade/pytrainer.glade:5755
+#: glade/pytrainer.glade:2403 glade/pytrainer.glade:2430
+#: glade/pytrainer.glade:2458 glade/pytrainer.glade:2486
+#: glade/pytrainer.glade:2514 glade/pytrainer.glade:3472
+#: glade/pytrainer.glade:3640 glade/pytrainer.glade:4628
+#: glade/pytrainer.glade:4768 glade/pytrainer.glade:5332
+#: glade/pytrainer.glade:5753
msgid "bpm"
msgstr ""
-#: glade/pytrainer.glade:2544
+#: glade/pytrainer.glade:2542
msgid " "
msgstr ""
-#: glade/pytrainer.glade:2582
+#: glade/pytrainer.glade:2580
msgid " <b>Heart Rate:</b>"
msgstr ""
-#: glade/pytrainer.glade:2759 glade/pytrainer.glade:7010
-#: glade/pytrainer.glade:10877
+#: glade/pytrainer.glade:2757 glade/pytrainer.glade:7008
+#: glade/pytrainer.glade:10875
msgid "label-2147483648"
msgstr ""
-#: glade/pytrainer.glade:2797
+#: glade/pytrainer.glade:2795
msgid "label-2147483647"
msgstr ""
-#: glade/pytrainer.glade:2853
+#: glade/pytrainer.glade:2851
msgid "Record"
msgstr ""
-#: glade/pytrainer.glade:3278 glade/pytrainer.glade:4463
-#: glade/pytrainer.glade:5784
+#: glade/pytrainer.glade:3276 glade/pytrainer.glade:4461
+#: glade/pytrainer.glade:5782
msgid "<b>Max Speed:</b>"
msgstr ""
-#: glade/pytrainer.glade:3390 glade/pytrainer.glade:4434
-#: glade/pytrainer.glade:5250
+#: glade/pytrainer.glade:3388 glade/pytrainer.glade:4432
+#: glade/pytrainer.glade:5248
msgid "Cal"
msgstr ""
-#: glade/pytrainer.glade:3418 glade/pytrainer.glade:4574
-#: glade/pytrainer.glade:5278
+#: glade/pytrainer.glade:3416 glade/pytrainer.glade:4572
+#: glade/pytrainer.glade:5276
msgid "<b>Beats avg:</b>"
msgstr ""
-#: glade/pytrainer.glade:3792
+#: glade/pytrainer.glade:3790
msgid " <b>Date:</b>"
msgstr ""
-#: glade/pytrainer.glade:3867
+#: glade/pytrainer.glade:3865
msgid "Value"
msgstr ""
-#: glade/pytrainer.glade:3892
+#: glade/pytrainer.glade:3890
msgid ""
"Stage Profile\n"
"Stage Velocity\n"
"Stage Profile/velocity"
msgstr ""
-#: glade/pytrainer.glade:3981
+#: glade/pytrainer.glade:3979
msgid "Day"
msgstr ""
-#: glade/pytrainer.glade:4158 glade/pytrainer.glade:5453
+#: glade/pytrainer.glade:4156 glade/pytrainer.glade:5451
msgid "000"
msgstr ""
-#: glade/pytrainer.glade:4547 glade/pytrainer.glade:7846
+#: glade/pytrainer.glade:4545 glade/pytrainer.glade:7844
msgid " "
msgstr ""
-#: glade/pytrainer.glade:4920
+#: glade/pytrainer.glade:4918
msgid " <b>Month:</b>"
msgstr ""
-#: glade/pytrainer.glade:5020 glade/pytrainer.glade:6176
+#: glade/pytrainer.glade:5018 glade/pytrainer.glade:6174
msgid ""
"Kilometers\n"
"Time\n"
@@ -363,7 +361,7 @@
"Calories"
msgstr ""
-#: glade/pytrainer.glade:5065 glade/pytrainer.glade:6221
+#: glade/pytrainer.glade:5063 glade/pytrainer.glade:6219
msgid ""
"None\n"
"Kilometers\n"
@@ -373,43 +371,43 @@
"Calories"
msgstr ""
-#: glade/pytrainer.glade:5135
+#: glade/pytrainer.glade:5133
msgid "Month"
msgstr ""
-#: glade/pytrainer.glade:6076
+#: glade/pytrainer.glade:6074
msgid " <b>Year:</b>"
msgstr ""
-#: glade/pytrainer.glade:6291
+#: glade/pytrainer.glade:6289
msgid "Year"
msgstr ""
-#: glade/pytrainer.glade:6334
+#: glade/pytrainer.glade:6332
msgid "label154"
msgstr ""
-#: glade/pytrainer.glade:6371
+#: glade/pytrainer.glade:6369
msgid "<b>Title:</b>"
msgstr ""
-#: glade/pytrainer.glade:6416
+#: glade/pytrainer.glade:6414
msgid "Search"
msgstr ""
-#: glade/pytrainer.glade:6463
+#: glade/pytrainer.glade:6461
msgid "Columns"
msgstr ""
-#: glade/pytrainer.glade:6538
+#: glade/pytrainer.glade:6536
msgid "label155"
msgstr ""
-#: glade/pytrainer.glade:6672
+#: glade/pytrainer.glade:6670
msgid "Type:"
msgstr ""
-#: glade/pytrainer.glade:6700
+#: glade/pytrainer.glade:6698
msgid ""
"Font\n"
"Restaurant\n"
@@ -417,776 +415,409 @@
"Summit"
msgstr ""
-#: glade/pytrainer.glade:6721
+#: glade/pytrainer.glade:6719
msgid "Latitude: "
msgstr ""
-#: glade/pytrainer.glade:6749
+#: glade/pytrainer.glade:6747
msgid " Name:"
msgstr ""
-#: glade/pytrainer.glade:6777
+#: glade/pytrainer.glade:6775
msgid "Longitude:"
msgstr ""
-#: glade/pytrainer.glade:6805 glade/pytrainer.glade:12486
-#: glade/pytrainer.glade:12809
+#: glade/pytrainer.glade:6803 glade/pytrainer.glade:12442
+#: glade/pytrainer.glade:12765
msgid "Description:"
msgstr ""
-#: glade/pytrainer.glade:6925
+#: glade/pytrainer.glade:6923
msgid "<b> Waypoint: </b>"
msgstr ""
-#: glade/pytrainer.glade:7058
+#: glade/pytrainer.glade:7056
msgid "label162"
msgstr ""
-#: glade/pytrainer.glade:7198
+#: glade/pytrainer.glade:7196
msgid "label163"
msgstr ""
-#: glade/pytrainer.glade:7223
+#: glade/pytrainer.glade:7221
msgid "New Entry"
msgstr ""
-#: glade/pytrainer.glade:7296
+#: glade/pytrainer.glade:7294
msgid "Title:"
msgstr ""
-#: glade/pytrainer.glade:7345
+#: glade/pytrainer.glade:7343
msgid "GPX File:"
msgstr ""
-#: glade/pytrainer.glade:7415
+#: glade/pytrainer.glade:7413
msgid "Calculate Values"
msgstr ""
-#: glade/pytrainer.glade:7434
+#: glade/pytrainer.glade:7432
msgid "Sport:"
msgstr ""
-#: glade/pytrainer.glade:7485
+#: glade/pytrainer.glade:7483
msgid "<b>Main</b>"
msgstr ""
-#: glade/pytrainer.glade:7546
+#: glade/pytrainer.glade:7544
msgid "Distance (Km):"
msgstr ""
-#: glade/pytrainer.glade:7575 glade/pytrainer.glade:7772
-#: glade/pytrainer.glade:8053 glade/pytrainer.glade:8299
-#: glade/pytrainer.glade:8767 glade/pytrainer.glade:11515
+#: glade/pytrainer.glade:7573 glade/pytrainer.glade:7770
+#: glade/pytrainer.glade:8051 glade/pytrainer.glade:8297
+#: glade/pytrainer.glade:8765 glade/pytrainer.glade:11513
msgid "Calculate"
msgstr ""
-#: glade/pytrainer.glade:7594
+#: glade/pytrainer.glade:7592
msgid "Time:"
msgstr ""
-#: glade/pytrainer.glade:7792
+#: glade/pytrainer.glade:7790
msgid "Date:"
msgstr ""
-#: glade/pytrainer.glade:7912 glade/pytrainer.glade:11565
+#: glade/pytrainer.glade:7910 glade/pytrainer.glade:11563
msgid "<b>General</b>"
msgstr ""
-#: glade/pytrainer.glade:7973
+#: glade/pytrainer.glade:7971
msgid "Max (km/h):"
msgstr ""
-#: glade/pytrainer.glade:8024
+#: glade/pytrainer.glade:8022
msgid "Velocity (km/h)"
msgstr ""
-#: glade/pytrainer.glade:8099
+#: glade/pytrainer.glade:8097
msgid "<b>Velocity</b>"
msgstr ""
-#: glade/pytrainer.glade:8135
+#: glade/pytrainer.glade:8133
msgid "Quick Entry"
msgstr ""
-#: glade/pytrainer.glade:8195
+#: glade/pytrainer.glade:8193
msgid "Max (min/km):"
msgstr ""
-#: glade/pytrainer.glade:8247
+#: glade/pytrainer.glade:8245
msgid "Pace (min/km):"
msgstr ""
-#: glade/pytrainer.glade:8322
+#: glade/pytrainer.glade:8320
msgid "<b>Pace</b>"
msgstr ""
-#: glade/pytrainer.glade:8383
+#: glade/pytrainer.glade:8381
msgid "Ascent:"
msgstr ""
-#: glade/pytrainer.glade:8435
+#: glade/pytrainer.glade:8433
msgid "Descent:"
msgstr ""
-#: glade/pytrainer.glade:8490
+#: glade/pytrainer.glade:8488
msgid "<b>Accumulated Altitude Change</b>"
msgstr ""
-#: glade/pytrainer.glade:8551
+#: glade/pytrainer.glade:8549
msgid "Max (bpm):"
msgstr ""
-#: glade/pytrainer.glade:8580
+#: glade/pytrainer.glade:8578
msgid "Heart rate:"
msgstr ""
-#: glade/pytrainer.glade:8654 pytrainer/gui/windowmain.py:475
-#: pytrainer/monthgraph.py:77
+#: glade/pytrainer.glade:8652
msgid "Calories"
msgstr ""
-#: glade/pytrainer.glade:8705
+#: glade/pytrainer.glade:8703
msgid ""
"<small><b>Note:</b> In order to calculate the calories you must set the "
"sport MET (in Preferences->Sport) </small>"
msgstr ""
-#: glade/pytrainer.glade:8822
+#: glade/pytrainer.glade:8820
msgid "<b>Heart Rate</b>"
msgstr ""
-#: glade/pytrainer.glade:8858
+#: glade/pytrainer.glade:8856
msgid "Advanced"
msgstr ""
-#: glade/pytrainer.glade:8955
+#: glade/pytrainer.glade:8953
msgid "<b>Comments</b>"
msgstr ""
-#: glade/pytrainer.glade:8984
+#: glade/pytrainer.glade:8982
msgid "Comments"
msgstr ""
-#: glade/pytrainer.glade:9089
+#: glade/pytrainer.glade:9087
msgid "Preferences"
msgstr ""
-#: glade/pytrainer.glade:9163
+#: glade/pytrainer.glade:9161
msgid "Metric system"
msgstr ""
-#: glade/pytrainer.glade:9185
+#: glade/pytrainer.glade:9183
msgid "U.S. customary units"
msgstr ""
-#: glade/pytrainer.glade:9211
+#: glade/pytrainer.glade:9209
msgid "<b>System of Measurement</b>"
msgstr ""
-#: glade/pytrainer.glade:9271
+#: glade/pytrainer.glade:9269
msgid "Database type:"
msgstr ""
-#: glade/pytrainer.glade:9299
+#: glade/pytrainer.glade:9297
msgid "Database host:"
msgstr ""
-#: glade/pytrainer.glade:9348
+#: glade/pytrainer.glade:9346
msgid "Database name:"
msgstr ""
-#: glade/pytrainer.glade:9416
+#: glade/pytrainer.glade:9414
msgid "Database user:"
msgstr ""
-#: glade/pytrainer.glade:9444
+#: glade/pytrainer.glade:9442
msgid "Database pass:"
msgstr ""
-#: glade/pytrainer.glade:9518
+#: glade/pytrainer.glade:9516
msgid "<b>Database</b>"
msgstr ""
-#: glade/pytrainer.glade:9578
+#: glade/pytrainer.glade:9576
msgid "Use this port for internal connections: "
msgstr ""
-#: glade/pytrainer.glade:9629
+#: glade/pytrainer.glade:9627
msgid ""
"<small><b>Note:</b> Change this only if you know what you are doing</small>"
msgstr ""
-#: glade/pytrainer.glade:9661
+#: glade/pytrainer.glade:9659
msgid "<b>Port Connnection</b>"
msgstr ""
-#: glade/pytrainer.glade:9697
+#: glade/pytrainer.glade:9695
msgid "General"
msgstr ""
-#: glade/pytrainer.glade:9750
+#: glade/pytrainer.glade:9748
msgid "User name:"
msgstr ""
-#: glade/pytrainer.glade:9778
+#: glade/pytrainer.glade:9776
msgid "Gender:"
msgstr ""
-#: glade/pytrainer.glade:9824
+#: glade/pytrainer.glade:9822
msgid "Height:"
msgstr ""
-#: glade/pytrainer.glade:9895
+#: glade/pytrainer.glade:9893
msgid "Date of birth:"
msgstr ""
-#: glade/pytrainer.glade:10007
+#: glade/pytrainer.glade:10005
msgid "Weight:"
msgstr ""
-#: glade/pytrainer.glade:10039
+#: glade/pytrainer.glade:10037
msgid "<b>Athlete Details</b>"
msgstr ""
-#: glade/pytrainer.glade:10068
+#: glade/pytrainer.glade:10066
msgid "Athlete"
msgstr ""
-#: glade/pytrainer.glade:10251
+#: glade/pytrainer.glade:10249
msgid "<b>Sport List</b>"
msgstr ""
-#: glade/pytrainer.glade:10280
+#: glade/pytrainer.glade:10278
msgid "llist"
msgstr ""
-#: glade/pytrainer.glade:10360 glade/pytrainer.glade:12430
-#: glade/pytrainer.glade:12921
+#: glade/pytrainer.glade:10358 glade/pytrainer.glade:12386
+#: glade/pytrainer.glade:12877
msgid "Name:"
msgstr ""
-#: glade/pytrainer.glade:10388
+#: glade/pytrainer.glade:10386
msgid "M.E.T.:"
msgstr ""
-#: glade/pytrainer.glade:10437
+#: glade/pytrainer.glade:10435
msgid "Extra Weight:"
msgstr ""
-#: glade/pytrainer.glade:10513 glade/pytrainer.glade:11119
+#: glade/pytrainer.glade:10511 glade/pytrainer.glade:11117
msgid ""
"<small><b>Note:</b> You can get your M.E.T. sport Coefficient here: http://"
"pytrainer.e-oss.net/met.pdf</small>"
msgstr ""
-#: glade/pytrainer.glade:10624
+#: glade/pytrainer.glade:10622
msgid "<b>Add New Sport</b>"
msgstr ""
-#: glade/pytrainer.glade:10653
+#: glade/pytrainer.glade:10651
msgid "new"
msgstr ""
-#: glade/pytrainer.glade:10713
+#: glade/pytrainer.glade:10711
msgid ""
"Deleting a sport removes associated records.\n"
"Continue?"
msgstr ""
-#: glade/pytrainer.glade:10853
+#: glade/pytrainer.glade:10851
msgid "<b>Delete Sport</b>"
msgstr ""
-#: glade/pytrainer.glade:10913
+#: glade/pytrainer.glade:10911
msgid "delete"
msgstr ""
-#: glade/pytrainer.glade:10972
+#: glade/pytrainer.glade:10970
msgid "Name"
msgstr ""
-#: glade/pytrainer.glade:11021
+#: glade/pytrainer.glade:11019
msgid "M.E.T."
msgstr ""
-#: glade/pytrainer.glade:11070 pytrainer/gui/windowprofile.py:67
+#: glade/pytrainer.glade:11068
msgid "Extra Weight"
msgstr ""
-#: glade/pytrainer.glade:11236
+#: glade/pytrainer.glade:11234
msgid "<b>Edit Sport</b>"
msgstr ""
-#: glade/pytrainer.glade:11260
+#: glade/pytrainer.glade:11258
msgid "<b>lalaal</b>"
msgstr ""
-#: glade/pytrainer.glade:11296
+#: glade/pytrainer.glade:11294
msgid "edit"
msgstr ""
-#: glade/pytrainer.glade:11325
+#: glade/pytrainer.glade:11323
msgid "Sports"
msgstr ""
-#: glade/pytrainer.glade:11384
+#: glade/pytrainer.glade:11382
msgid "Maximun heart rate:"
msgstr ""
-#: glade/pytrainer.glade:11412
+#: glade/pytrainer.glade:11410
msgid "Resting heart rate:"
msgstr ""
-#: glade/pytrainer.glade:11486
+#: glade/pytrainer.glade:11484
msgid ""
"<small><b>Note:</b> Maximun heart rate is calculated by subtracting the "
"number 220 minus your age. </small>"
msgstr ""
-#: glade/pytrainer.glade:11625
+#: glade/pytrainer.glade:11623
msgid ""
"<small><b>NOTE:</b> in order to use the Karvonen method you must cover the "
"Resting hr field.</small>"
msgstr ""
-#: glade/pytrainer.glade:11654
+#: glade/pytrainer.glade:11652
msgid "Percentages based method"
msgstr ""
-#: glade/pytrainer.glade:11676 pytrainer/gui/windowmain.py:194
+#: glade/pytrainer.glade:11674
msgid "Karvonen method"
msgstr ""
-#: glade/pytrainer.glade:11698
+#: glade/pytrainer.glade:11696
msgid "Select how to calculate your heart rate zones."
msgstr ""
-#: glade/pytrainer.glade:11730
+#: glade/pytrainer.glade:11728
msgid "<b>Heart Rate Zones</b>"
msgstr ""
-#: glade/pytrainer.glade:11766 pytrainer/daygraph.py:58
-#: pytrainer/heartrategraph.py:33 pytrainer/recordgraph.py:78
+#: glade/pytrainer.glade:11764
msgid "Heart Rate"
msgstr ""
-#: glade/pytrainer.glade:11871
+#: glade/pytrainer.glade:11869
msgid "Calendar"
msgstr ""
-#: glade/pytrainer.glade:11997
-msgid "pytrainer"
-msgstr ""
-
-#: glade/pytrainer.glade:11998
-msgid "(c) Fiz Vazquez <vu...@si...>"
-msgstr ""
-
-#: glade/pytrainer.glade:11999
-msgid "Track sporting activities and performance"
-msgstr ""
-
-#: glade/pytrainer.glade:12000
-msgid ""
-"(C) Fiz Vazquez\n"
-"\n"
-" This program is free software; you can redistribute \n"
-" it and/or modify it under the terms of the GNU \n"
-" General Public License as published by the Free \n"
-" Software Foundation; either version 2 of the License, \n"
-" or (at your option) any later version.\n"
-"\n"
-" This program is distributed in the hope that it will be \n"
-" useful, but WITHOUT ANY WARRANTY; without even the\n"
-" implied warranty of MERCHANTABILITY or FITNESS FOR \n"
-" A PARTICULAR PURPOSE. See the GNU General Public \n"
-" License <http://www.opensource.org/gpl-license.html>\n"
-" for more details.\n"
-"\n"
-" You can found the license on Debian systems in the file\n"
-" /usr/share/common-licenses/GPL\n"
-msgstr ""
-
-#: glade/pytrainer.glade:12020
-msgid "pytrainer.e-oss.net"
-msgstr ""
-
-#: glade/pytrainer.glade:12022
-msgid ""
-"Basque: Jabier Santamaria <men...@gm...>\n"
-"Catalan: Eloi Crespillo Itchart <el...@ik...>\n"
-"Czech: Lobus Pokorny <sp...@se...>\n"
-"French: Dj <dj...@dj...>\n"
-"French: Pierre Gaigé <pg...@fr...>\n"
-"Norwegian: Havard Davidsen <hav...@gm...>\n"
-"Polish: Seweryn Kokot <sk...@po...>\n"
-"german: Aleks <al...@sc...>\n"
-"Spanish: Fiz vazquez <vu...@si...>"
-msgstr ""
-
-#: glade/pytrainer.glade:12115
+#: glade/pytrainer.glade:12071
msgid "Edit Record"
msgstr ""
-#: glade/pytrainer.glade:12136
+#: glade/pytrainer.glade:12092
msgid "Show graph in classic view"
msgstr ""
-#: glade/pytrainer.glade:12172
+#: glade/pytrainer.glade:12128
msgid "warning"
msgstr ""
-#: glade/pytrainer.glade:12374
+#: glade/pytrainer.glade:12330
msgid "<b>Extension Details</b>"
msgstr ""
-#: glade/pytrainer.glade:12402
+#: glade/pytrainer.glade:12358
msgid "name-entry"
msgstr ""
-#: glade/pytrainer.glade:12458 glade/pytrainer.glade:12865
+#: glade/pytrainer.glade:12414 glade/pytrainer.glade:12821
msgid "Status:"
msgstr ""
-#: glade/pytrainer.glade:12514 glade/pytrainer.glade:12837
+#: glade/pytrainer.glade:12470 glade/pytrainer.glade:12793
msgid "status-entry"
msgstr ""
-#: glade/pytrainer.glade:12542
+#: glade/pytrainer.glade:12498
msgid "description-entry"
msgstr ""
-#: glade/pytrainer.glade:12677
+#: glade/pytrainer.glade:12633
msgid "Plugins"
msgstr ""
-#: glade/pytrainer.glade:12752
+#: glade/pytrainer.glade:12708
msgid "<b>Plugin Details</b>"
msgstr ""
-#: glade/pytrainer.glade:12781
+#: glade/pytrainer.glade:12737
msgid "description-entry "
msgstr ""
-#: glade/pytrainer.glade:12893
+#: glade/pytrainer.glade:12849
msgid "nameEntry"
msgstr ""
-#: glade/pytrainer.glade:13064
+#: glade/pytrainer.glade:13020
msgid "Select track record"
msgstr ""
-
-#: pytrainer/main.py:94 pytrainer/main.py:94
-msgid "No Active Plugins"
-msgstr ""
-
-#: pytrainer/main.py:103 pytrainer/main.py:103
-msgid "No Active Extensions"
-msgstr ""
-
-#: pytrainer/main.py:245 pytrainer/main.py:245
-msgid "Delete this database entry?"
-msgstr ""
-
-#: pytrainer/main.py:256 pytrainer/main.py:256
-msgid "Delete this waypoint?"
-msgstr ""
-
-#: pytrainer/lib/heartrate.py:46
-msgid "Moderate activity"
-msgstr ""
-
-#: pytrainer/lib/heartrate.py:47
-msgid "Weight Control"
-msgstr ""
-
-#: pytrainer/lib/heartrate.py:48
-msgid "Aerobic"
-msgstr ""
-
-#: pytrainer/lib/heartrate.py:49
-msgid "Anaerobic"
-msgstr ""
-
-#: pytrainer/lib/heartrate.py:50
-msgid "VO2 MAX"
-msgstr ""
-
-#: pytrainer/lib/gpx.py:75
-msgid "No Name"
-msgstr ""
-
-#: pytrainer/lib/gpx.py:81
-msgid "No Data"
-msgstr ""
-
-#: pytrainer/lib/date.py:73
-msgid "January"
-msgstr ""
-
-#: pytrainer/lib/date.py:74
-msgid "Febrary"
-msgstr ""
-
-#: pytrainer/lib/date.py:75
-msgid "March"
-msgstr ""
-
-#: pytrainer/lib/date.py:76
-msgid "April"
-msgstr ""
-
-#: pytrainer/lib/date.py:77
-msgid "May"
-msgstr ""
-
-#: pytrainer/lib/date.py:78
-msgid "June"
-msgstr ""
-
-#: pytrainer/lib/date.py:79
-msgid "July"
-msgstr ""
-
-#: pytrainer/lib/date.py:80
-msgid "August"
-msgstr ""
-
-#: pytrainer/lib/date.py:81
-msgid "September"
-msgstr ""
-
-#: pytrainer/lib/date.py:82
-msgid "October"
-msgstr ""
-
-#: pytrainer/lib/date.py:83
-msgid "November"
-msgstr ""
-
-#: pytrainer/lib/date.py:84
-msgid "December"
-msgstr ""
-
-#: pytrainer/yeargraph.py:69 pytrainer/yeargraph.py:71
-#: pytrainer/yeargraph.py:73 pytrainer/yeargraph.py:75
-#: pytrainer/yeargraph.py:77
-msgid "month"
-msgstr ""
-
-#: pytrainer/yeargraph.py:69
-msgid "kilometers"
-msgstr ""
-
-#: pytrainer/yeargraph.py:69
-msgid "monthly kilometers"
-msgstr ""
-
-#: pytrainer/yeargraph.py:71
-msgid "time in hours"
-msgstr ""
-
-#: pytrainer/yeargraph.py:71
-msgid "monthly time"
-msgstr ""
-
-#: pytrainer/yeargraph.py:73
-msgid "beats per minute"
-msgstr ""
-
-#: pytrainer/yeargraph.py:73
-msgid "monthly beats"
-msgstr ""
-
-#: pytrainer/yeargraph.py:75
-msgid "average (hm/h)"
-msgstr ""
-
-#: pytrainer/yeargraph.py:75
-msgid "monthly averages"
-msgstr ""
-
-#: pytrainer/yeargraph.py:77
-msgid "calories"
-msgstr ""
-
-#: pytrainer/yeargraph.py:77
-msgid "monthly calories"
-msgstr ""
-
-#: pytrainer/gui/windowmain.py:49 pytrainer/gui/windowmain.py:52
-#: pytrainer/gui/windowmain.py:56
-msgid "id"
-msgstr ""
-
-#: pytrainer/gui/windowmain.py:49
-msgid "Kilometer"
-msgstr ""
-
-#: pytrainer/gui/windowmain.py:52 pytrainer/gui/windowmain.py:468
-msgid "Title"
-msgstr ""
-
-#: pytrainer/gui/windowmain.py:52 pytrainer/gui/windowmain.py:469
-#: pytrainer/gui/dialogselecttrack.py:36
-msgid "Date"
-msgstr ""
-
-#: pytrainer/gui/windowmain.py:52 pytrainer/gui/windowmain.py:470
-msgid "Distance"
-msgstr ""
-
-#: pytrainer/gui/windowmain.py:52 pytrainer/gui/windowmain.py:472
-msgid "Time"
-msgstr ""
-
-#: pytrainer/gui/windowmain.py:52 pytrainer/gui/windowmain.py:473
-msgid "Beats"
-msgstr ""
-
-#: pytrainer/gui/windowmain.py:52 pytrainer/gui/windowmain.py:474
-msgid "Average"
-msgstr ""
-
-#: pytrainer/gui/windowmain.py:56
-msgid "Waypoint"
-msgstr ""
-
-#: pytrainer/gui/windowmain.py:196
-msgid "Percentages method"
-msgstr ""
-
-#: pytrainer/gui/windowplugins.py:70 pytrainer/gui/windowplugins.py:97
-#: pytrainer/gui/windowextensions.py:70
-msgid "Enable"
-msgstr ""
-
-#: pytrainer/gui/windowplugins.py:72 pytrainer/gui/windowplugins.py:96
-#: pytrainer/gui/windowextensions.py:72
-msgid "Disable"
-msgstr ""
-
-#: pytrainer/gui/windowplugins.py:81 pytrainer/gui/windowextensions.py:81
-#, python-format
-msgid "%s settings"
-msgstr ""
-
-#: pytrainer/gui/windowplugins.py:104
-msgid "Ok"
-msgstr ""
-
-#: pytrainer/gui/windowextensions.py:104 pytrainer/gui/windowextensions.py:117
-msgid "OK"
-msgstr ""
-
-#: pytrainer/gui/windowprofile.py:49
-msgid "Male"
-msgstr ""
-
-#: pytrainer/gui/windowprofile.py:50
-msgid "Female"
-msgstr ""
-
-#: pytrainer/gui/windowprofile.py:67
-msgid "MET"
-msgstr ""
-
-#: pytrainer/gui/dialogselecttrack.py:36
-msgid "Track Name"
-msgstr ""
-
-#: pytrainer/daygraph.py:54 pytrainer/daygraph.py:56 pytrainer/daygraph.py:58
-#: pytrainer/heartrategraph.py:33 pytrainer/recordgraph.py:72
-#: pytrainer/recordgraph.py:74 pytrainer/recordgraph.py:76
-#: pytrainer/recordgraph.py:78
-msgid "Distance (km)"
-msgstr ""
-
-#: pytrainer/daygraph.py:54 pytrainer/recordgraph.py:72
-msgid "Height (m)"
-msgstr ""
-
-#: pytrainer/daygraph.py:54 pytrainer/recordgraph.py:72
-msgid "Stage Profile"
-msgstr ""
-
-#: pytrainer/daygraph.py:56
-msgid "Velocity (Km/h)"
-msgstr ""
-
-#: pytrainer/daygraph.py:56
-msgid "Velocity"
-msgstr ""
-
-#: pytrainer/daygraph.py:58 pytrainer/heartrategraph.py:33
-#: pytrainer/recordgraph.py:78
-msgid "Beats (bpm)"
-msgstr ""
-
-#: pytrainer/monthgraph.py:69 pytrainer/monthgraph.py:71
-#: pytrainer/monthgraph.py:73 pytrainer/monthgraph.py:75
-#: pytrainer/monthgraph.py:77
-msgid "day"
-msgstr ""
-
-#: pytrainer/monthgraph.py:69
-msgid "Kilometers"
-msgstr ""
-
-#: pytrainer/monthgraph.py:69
-msgid "Daily kilometers"
-msgstr ""
-
-#: pytrainer/monthgraph.py:71
-msgid "Time in Hours"
-msgstr ""
-
-#: pytrainer/monthgraph.py:71
-msgid "Daily Time"
-msgstr ""
-
-#: pytrainer/monthgraph.py:73
-msgid "Beats per Minute"
-msgstr ""
-
-#: pytrainer/monthgraph.py:73
-msgid "Daily Beats"
-msgstr ""
-
-#: pytrainer/monthgraph.py:75
-msgid "Average (km/h)"
-msgstr ""
-
-#: pytrainer/monthgraph.py:75
-msgid "Daily Averages"
-msgstr ""
-
-#: pytrainer/monthgraph.py:77
-msgid "Daily Calories"
-msgstr ""
-
-#: pytrainer/recordgraph.py:74
-msgid "Speed (Km/h)"
-msgstr ""
-
-#: pytrainer/recordgraph.py:74
-msgid "Speed"
-msgstr ""
-
-#: pytrainer/recordgraph.py:76
-msgid "Pace (min/km)"
-msgstr ""
-
-#: pytrainer/recordgraph.py:76
-msgid "Pace"
-msgstr ""
-
-#: pytrainer/record.py:207
-msgid "pyTrainer cant import data from your gpx file"
-msgstr ""
-
-#: pytrainer/waypoint.py:67
-msgid ""
-"The gpx file seems to be a several days records. Perhaps you will need to "
-"edit your gpx file"
-msgstr ""
Added: pytrainer/trunk/utils/translator.sh
===================================================================
--- pytrainer/trunk/utils/translator.sh (rev 0)
+++ pytrainer/trunk/utils/translator.sh 2009-04-16 20:38:15 UTC (rev 321)
@@ -0,0 +1,24 @@
+#!/bin/sh
+
+
+SOFTWARE=$(zenity --list --text="Select your translation software" --radiolist --column "Pick" --column "Software" TRUE "gtranslator" FALSE "kbabel")
+if [ $? != 0 ]; then exit ; fi
+
+LANGUAGE=$(zenity --list --text="Select your language" --radiolist --column "Pick" --column "Language" TRUE "es" FALSE "eu" FALSE "ca" FALSE "fr" FALSE "da" FALSE "de" FALSE "pl" FALSE "no" FALSE "cs" FALSE "ru" FALSE "pl")
+if [ $? != 0 ]; then exit ; fi
+
+cd ../
+
+xgettext glade/pytrainer.glade -o ./messages.pot
+if [ $? != 0 ]; then echo "WARNNING: xgettext not found. Please, install gettext package"; exit; fi
+find ./ -iname "*.py" -exec xgettext -k_ -j -o ./messages.pot ./pytrainer/main.py {}
+
+msginit -i ./messages.pot -l $LANGUAGE -o ./locale/$LANGUAGE/LC_MESSAGES/pytrainer_$LANGUAGE.pot
+
+cd ./locale/$LANGUAGE/LC_MESSAGES/
+make merge
+$SOFTWARE pytrainer_$LANGUAGE.po
+if [ $? != 0 ]; then echo "WARNNING: $SOFTWARE not found"; exit ; fi
+make
+
+
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <vu...@us...> - 2009-04-16 20:36:25
|
Revision: 320
http://pytrainer.svn.sourceforge.net/pytrainer/?rev=320&view=rev
Author: vud1
Date: 2009-04-16 20:36:20 +0000 (Thu, 16 Apr 2009)
Log Message:
-----------
remove obsolete file
Removed Paths:
-------------
pytrainer/trunk/locale/es/LC_MESSAGES/lalala.po
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <vu...@us...> - 2009-04-16 20:35:31
|
Revision: 319
http://pytrainer.svn.sourceforge.net/pytrainer/?rev=319&view=rev
Author: vud1
Date: 2009-04-16 20:35:24 +0000 (Thu, 16 Apr 2009)
Log Message:
-----------
new spanish translation
Modified Paths:
--------------
pytrainer/trunk/locale/es/LC_MESSAGES/pytrainer.mo
pytrainer/trunk/locale/es/LC_MESSAGES/pytrainer_es.po
pytrainer/trunk/locale/es/LC_MESSAGES/pytrainer_es.pot
Modified: pytrainer/trunk/locale/es/LC_MESSAGES/pytrainer.mo
===================================================================
(Binary files differ)
Modified: pytrainer/trunk/locale/es/LC_MESSAGES/pytrainer_es.po
===================================================================
--- pytrainer/trunk/locale/es/LC_MESSAGES/pytrainer_es.po 2009-04-12 11:08:01 UTC (rev 318)
+++ pytrainer/trunk/locale/es/LC_MESSAGES/pytrainer_es.po 2009-04-16 20:35:24 UTC (rev 319)
@@ -7,8 +7,8 @@
msgstr ""
"Project-Id-Version: vud 1\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-12-09 23:06+0100\n"
-"PO-Revision-Date: 2007-12-09 23:09+0100\n"
+"POT-Creation-Date: 2009-04-16 22:27+0200\n"
+"PO-Revision-Date: 2009-04-16 22:34+0200\n"
"Last-Translator: Fiz Vazquez <vu...@si...>\n"
"Language-Team: Spanish <es...@li...>\n"
"MIME-Version: 1.0\n"
@@ -16,139 +16,347 @@
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n != 1);"
-#: glade/pytrainer.glade:10
+#: glade/pytrainer.glade:8
msgid "window1"
msgstr "Ventana1"
-#: glade/pytrainer.glade:50
+#: glade/pytrainer.glade:48
msgid "_File"
msgstr "Archivo"
-#: glade/pytrainer.glade:74
-msgid "_Export as text separated by commas"
+#: glade/pytrainer.glade:72
+#, fuzzy
+msgid "_Export as Text Separated by Commas"
msgstr "Exportar como texto separado por comas"
-#: glade/pytrainer.glade:114
+#: glade/pytrainer.glade:112
msgid "_Edit"
msgstr "Editar"
-#: glade/pytrainer.glade:136
+#: glade/pytrainer.glade:134
msgid "_View"
msgstr "Ver"
-#: glade/pytrainer.glade:145
+#: glade/pytrainer.glade:143
msgid " _Classic View"
msgstr "Vista Clasica"
-#: glade/pytrainer.glade:156
+#: glade/pytrainer.glade:154
msgid " _List View"
msgstr "Listado de registros"
-#: glade/pytrainer.glade:168
-msgid " _Waypoints Editor View"
+#: glade/pytrainer.glade:166
+#, fuzzy
+msgid " _Waypoints Editor"
msgstr "Editor de waypoints"
-#: glade/pytrainer.glade:184
+#: glade/pytrainer.glade:182
msgid "Tools"
msgstr "Herramientas"
-#: glade/pytrainer.glade:194
+#: glade/pytrainer.glade:192 glade/pytrainer.glade:12254
msgid "Extensions"
msgstr "Extensiones"
-#: glade/pytrainer.glade:204
-msgid "Gps Device Plugins"
+#: glade/pytrainer.glade:202
+#, fuzzy
+msgid "GPS Device Plugins"
msgstr "Plugins de dispositivos GPS"
-#: glade/pytrainer.glade:218
+#: glade/pytrainer.glade:216
msgid "_Help"
msgstr "Ayuda"
-#: glade/pytrainer.glade:338 glade/pytrainer.glade:4810
-#: pytrainer/gui/windowmain.py:49 pytrainer/gui/windowmain.py:52
-#: pytrainer/gui/windowmain.py:378
+#: glade/pytrainer.glade:336
msgid "Sport"
msgstr "Deporte"
-#: glade/pytrainer.glade:364
+#: glade/pytrainer.glade:362
msgid "All Sports"
msgstr "Todos los deportes"
-#: glade/pytrainer.glade:472 glade/pytrainer.glade:1658
-#: glade/pytrainer.glade:2414 glade/pytrainer.glade:3125
-msgid "<b>Beats avg:</b>"
-msgstr "<b>Media pulsaciones:</b>"
+#: glade/pytrainer.glade:471 glade/pytrainer.glade:836
+#: glade/pytrainer.glade:864
+msgid " "
+msgstr ""
-#: glade/pytrainer.glade:522
-msgid " bpm"
-msgstr "ppm"
+#: glade/pytrainer.glade:499 glade/pytrainer.glade:892
+msgid " "
+msgstr ""
-#: glade/pytrainer.glade:550 glade/pytrainer.glade:1630
-#: glade/pytrainer.glade:2386 glade/pytrainer.glade:3097
+#: glade/pytrainer.glade:527
+#, fuzzy
+msgid "<b>Sport:</b>"
+msgstr "<b>Lista de deportes:</b>"
+
+#: glade/pytrainer.glade:555 glade/pytrainer.glade:2994
+#: glade/pytrainer.glade:4122 glade/pytrainer.glade:5417
msgid "<b>Time:</b>"
msgstr "<b>Tiempo:</b>"
-#: glade/pytrainer.glade:578 glade/pytrainer.glade:1602
-#: glade/pytrainer.glade:2358 glade/pytrainer.glade:3069
+#: glade/pytrainer.glade:584 glade/pytrainer.glade:3191
+#: glade/pytrainer.glade:4292 glade/pytrainer.glade:5641
+#, fuzzy
+msgid "<b>Speed:</b>"
+msgstr "<b>Titulo:</b>"
+
+#: glade/pytrainer.glade:612 glade/pytrainer.glade:3500
+#: glade/pytrainer.glade:4656 glade/pytrainer.glade:5811
+#, fuzzy
+msgid "<b>Pace:</b>"
+msgstr "<b>Nombre:</b>"
+
+#: glade/pytrainer.glade:640
+#, fuzzy
+msgid "<b>Ascent:</b>"
+msgstr "<b>Pulsaciones:</b>"
+
+#: glade/pytrainer.glade:668
+msgid "<b>Comments:</b>"
+msgstr "<b>Comentarios:</b>"
+
+#: glade/pytrainer.glade:696 glade/pytrainer.glade:1379
+#: glade/pytrainer.glade:3247 glade/pytrainer.glade:3304
+#: glade/pytrainer.glade:4348 glade/pytrainer.glade:4517
+#: glade/pytrainer.glade:5697 glade/pytrainer.glade:5725
+msgid "km/h"
+msgstr "Km/h"
+
+#: glade/pytrainer.glade:724 glade/pytrainer.glade:1089
+#: glade/pytrainer.glade:3528 glade/pytrainer.glade:3584
+#: glade/pytrainer.glade:4712 glade/pytrainer.glade:4740
+#: glade/pytrainer.glade:5868 glade/pytrainer.glade:5896
+msgid "min/km"
+msgstr "min/km"
+
+#: glade/pytrainer.glade:752 glade/pytrainer.glade:1145
+#, fuzzy
+msgid "m"
+msgstr "km"
+
+#: glade/pytrainer.glade:780
+msgid " "
+msgstr ""
+
+#: glade/pytrainer.glade:808 glade/pytrainer.glade:1117
+#: glade/pytrainer.glade:2040 glade/pytrainer.glade:2068
+#: glade/pytrainer.glade:2096 glade/pytrainer.glade:2264
+#: glade/pytrainer.glade:3696 glade/pytrainer.glade:4852
+msgid " "
+msgstr " "
+
+#: glade/pytrainer.glade:920
+#, fuzzy
+msgid "<b>Date:</b>"
+msgstr "<b>Fecha:</b>"
+
+#: glade/pytrainer.glade:948 glade/pytrainer.glade:2966
+#: glade/pytrainer.glade:4094 glade/pytrainer.glade:5389
msgid "<b>Distance:</b>"
msgstr "<b>Distancia:</b>"
-#: glade/pytrainer.glade:632 glade/pytrainer.glade:677
-#: glade/pytrainer.glade:1903 glade/pytrainer.glade:1948
-#: glade/pytrainer.glade:2659 glade/pytrainer.glade:2704
-#: glade/pytrainer.glade:3370 glade/pytrainer.glade:3415
-#: glade/pytrainer.glade:5178 glade/pytrainer.glade:5223
+#: glade/pytrainer.glade:977
+#, fuzzy
+msgid "<b>Max Speed</b>"
+msgstr "<b>Nombre:</b>"
+
+#: glade/pytrainer.glade:1005 glade/pytrainer.glade:3556
+#: glade/pytrainer.glade:4684 glade/pytrainer.glade:5840
+#, fuzzy
+msgid "<b>Max Pace:</b>"
+msgstr "<b>Nombre:</b>"
+
+#: glade/pytrainer.glade:1033
+#, fuzzy
+msgid "<b>Descent:</b>"
+msgstr "<b>Distancia:</b>"
+
+#: glade/pytrainer.glade:1061
+msgid " "
+msgstr ""
+
+#: glade/pytrainer.glade:1211 glade/pytrainer.glade:2910
+#: glade/pytrainer.glade:4038 glade/pytrainer.glade:5613
+msgid "Km"
+msgstr "km"
+
+#: glade/pytrainer.glade:1244 glade/pytrainer.glade:1294
+#: glade/pytrainer.glade:1344 glade/pytrainer.glade:3028
+#: glade/pytrainer.glade:3078 glade/pytrainer.glade:3128
+#: glade/pytrainer.glade:4206 glade/pytrainer.glade:4256
+#: glade/pytrainer.glade:5501 glade/pytrainer.glade:5551
+msgid "00"
+msgstr "00"
+
+#: glade/pytrainer.glade:1269 glade/pytrainer.glade:1319
+#: glade/pytrainer.glade:3053 glade/pytrainer.glade:3103
+#: glade/pytrainer.glade:4181 glade/pytrainer.glade:4231
+#: glade/pytrainer.glade:5476 glade/pytrainer.glade:5526
+#: glade/pytrainer.glade:7646 glade/pytrainer.glade:7691
msgid ":"
msgstr ":"
-#: glade/pytrainer.glade:782
-msgid " Km"
-msgstr "km"
+#: glade/pytrainer.glade:1413 glade/pytrainer.glade:2375
+#: glade/pytrainer.glade:2937 glade/pytrainer.glade:3219
+#: glade/pytrainer.glade:3360 glade/pytrainer.glade:3444
+#: glade/pytrainer.glade:3724 glade/pytrainer.glade:3752
+#: glade/pytrainer.glade:4065 glade/pytrainer.glade:4320
+#: glade/pytrainer.glade:4404 glade/pytrainer.glade:4600
+#: glade/pytrainer.glade:4880 glade/pytrainer.glade:5220
+#: glade/pytrainer.glade:5304 glade/pytrainer.glade:5360
+#: glade/pytrainer.glade:5669 glade/pytrainer.glade:5952
+#: glade/pytrainer.glade:5980 glade/pytrainer.glade:6008
+#: glade/pytrainer.glade:6036
+msgid " "
+msgstr ""
-#: glade/pytrainer.glade:810 glade/pytrainer.glade:1714
-#: glade/pytrainer.glade:2470 glade/pytrainer.glade:3181
+#: glade/pytrainer.glade:1520
+msgid " <b>Title:</b>"
+msgstr "<b>Titulo:</b>"
+
+#: glade/pytrainer.glade:1634
+msgid ""
+"Profile\n"
+"Speed\n"
+"Pace\n"
+"Heart Rate"
+msgstr ""
+"Perfil\n"
+"Velocidad\n"
+"Ritmo\n"
+"Pulsaciones"
+
+#: glade/pytrainer.glade:1653 glade/pytrainer.glade:5038
+#: glade/pytrainer.glade:6194
+msgid "Versus"
+msgstr "Contra"
+
+#: glade/pytrainer.glade:1678
+msgid ""
+"None\n"
+"Profile\n"
+"Speed\n"
+"Pace\n"
+"Heart Rate\n"
+msgstr ""
+
+#: glade/pytrainer.glade:1843
+msgid "<b>Beats:</b>"
+msgstr "<b>Pulsaciones:</b>"
+
+#: glade/pytrainer.glade:1871 glade/pytrainer.glade:3332
+#: glade/pytrainer.glade:4376 glade/pytrainer.glade:5192
msgid "<b>Calories: </b>"
msgstr "<b>Calorias:</b>"
-#: glade/pytrainer.glade:860
+#: glade/pytrainer.glade:1899 glade/pytrainer.glade:3612
+#: glade/pytrainer.glade:4796 glade/pytrainer.glade:5924
+#, fuzzy
+msgid "<b>Max Beats:</b>"
+msgstr "<b>Pulsaciones:</b>"
+
+#: glade/pytrainer.glade:1927
+#, fuzzy
+msgid "<b>HR Zones Method:</b>"
+msgstr "<b>Mes:</b>"
+
+#: glade/pytrainer.glade:1956
+#, fuzzy
+msgid "<b>HR Zone5:</b>"
+msgstr "<b>Mes:</b>"
+
+#: glade/pytrainer.glade:1984 glade/pytrainer.glade:2348
+msgid " bpm"
+msgstr "ppm"
+
+#: glade/pytrainer.glade:2012
msgid " Cal"
msgstr "Cal"
-#: glade/pytrainer.glade:888 glade/pytrainer.glade:1686
-#: glade/pytrainer.glade:2442 glade/pytrainer.glade:3153
-msgid "<b>Average:</b>"
-msgstr "<b>Media:</b>"
+#: glade/pytrainer.glade:2124
+#, fuzzy
+msgid "<b>HR Zone4:</b>"
+msgstr "<b>Mes:</b>"
-#: glade/pytrainer.glade:938
-msgid " km/h"
-msgstr "Km/h"
+#: glade/pytrainer.glade:2152
+#, fuzzy
+msgid "<b>HR Zone3:</b>"
+msgstr "<b>Mes:</b>"
-#: glade/pytrainer.glade:1005
-msgid "<b>Comments:</b>"
-msgstr "<b>Comentarios:</b>"
+#: glade/pytrainer.glade:2180
+#, fuzzy
+msgid "<b>HR Zone2:</b>"
+msgstr "<b>Mes:</b>"
-#: glade/pytrainer.glade:1059 glade/pytrainer.glade:5484
-msgid "<b>Positive:</b>"
-msgstr "<b>Positivo:</b>"
+#: glade/pytrainer.glade:2208
+#, fuzzy
+msgid "<b>HR Zone1:</b>"
+msgstr "<b>Mes:</b>"
-#: glade/pytrainer.glade:1103 glade/pytrainer.glade:5528
-msgid "<b>Negative:</b>"
-msgstr "<b>Negativo:</b>"
+#: glade/pytrainer.glade:2236 glade/pytrainer.glade:2292
+#: glade/pytrainer.glade:2320 glade/pytrainer.glade:3668
+#: glade/pytrainer.glade:4489 glade/pytrainer.glade:4824
+msgid " "
+msgstr ""
-#: glade/pytrainer.glade:1151 glade/pytrainer.glade:5576
-msgid " <b>Accumulated Unevenness:</b> "
-msgstr "<b>Desnivel Acumulado:</b>"
+#: glade/pytrainer.glade:2403 glade/pytrainer.glade:2430
+#: glade/pytrainer.glade:2458 glade/pytrainer.glade:2486
+#: glade/pytrainer.glade:2514 glade/pytrainer.glade:3472
+#: glade/pytrainer.glade:3640 glade/pytrainer.glade:4628
+#: glade/pytrainer.glade:4768 glade/pytrainer.glade:5332
+#: glade/pytrainer.glade:5753
+msgid "bpm"
+msgstr "ppm"
-#: glade/pytrainer.glade:1297
-msgid " <b>Title:</b>"
-msgstr "<b>Titulo:</b>"
+#: glade/pytrainer.glade:2542
+#, fuzzy
+msgid " "
+msgstr " "
-#: glade/pytrainer.glade:1386 glade/pytrainer.glade:2185
-#: glade/pytrainer.glade:2941 glade/pytrainer.glade:3652
+#: glade/pytrainer.glade:2580
+#, fuzzy
+msgid " <b>Heart Rate:</b>"
+msgstr "<b>Fecha:</b>"
+
+#: glade/pytrainer.glade:2757 glade/pytrainer.glade:7008
+#: glade/pytrainer.glade:10875
+msgid "label-2147483648"
+msgstr " "
+
+#: glade/pytrainer.glade:2795
+#, fuzzy
+msgid "label-2147483647"
+msgstr " "
+
+#: glade/pytrainer.glade:2851
+msgid "Record"
+msgstr "Registro"
+
+#: glade/pytrainer.glade:3276 glade/pytrainer.glade:4461
+#: glade/pytrainer.glade:5782
+#, fuzzy
+msgid "<b>Max Speed:</b>"
+msgstr "<b>Nombre:</b>"
+
+#: glade/pytrainer.glade:3388 glade/pytrainer.glade:4432
+#: glade/pytrainer.glade:5248
+msgid "Cal"
+msgstr "Cal"
+
+#: glade/pytrainer.glade:3416 glade/pytrainer.glade:4572
+#: glade/pytrainer.glade:5276
+msgid "<b>Beats avg:</b>"
+msgstr "<b>Media pulsaciones:</b>"
+
+#: glade/pytrainer.glade:3790
+msgid " <b>Date:</b>"
+msgstr "<b>Fecha:</b>"
+
+#: glade/pytrainer.glade:3865
msgid "Value"
msgstr "Valor"
-#: glade/pytrainer.glade:1411 glade/pytrainer.glade:2210
+#: glade/pytrainer.glade:3890
msgid ""
"Stage Profile\n"
"Stage Velocity\n"
@@ -158,47 +366,23 @@
"Velocidad de Etapa\n"
"Perfil/Velocidad de Etapa"
-#: glade/pytrainer.glade:1543
-msgid "Record"
-msgstr "Registro"
-
-#: glade/pytrainer.glade:1742 glade/pytrainer.glade:2498
-#: glade/pytrainer.glade:3209
-msgid "Km"
-msgstr "km"
-
-#: glade/pytrainer.glade:1770 glade/pytrainer.glade:2526
-#: glade/pytrainer.glade:3237
-msgid "bpm"
-msgstr "ppm"
-
-#: glade/pytrainer.glade:1798 glade/pytrainer.glade:2554
-#: glade/pytrainer.glade:3265
-msgid "km/h"
-msgstr "Km/h"
-
-#: glade/pytrainer.glade:1826 glade/pytrainer.glade:2582
-#: glade/pytrainer.glade:3293
-msgid "Cal"
-msgstr "Cal"
-
-#: glade/pytrainer.glade:2110
-msgid " <b>Date:</b>"
-msgstr "<b>Fecha:</b>"
-
-#: glade/pytrainer.glade:2299
+#: glade/pytrainer.glade:3979
msgid "Day"
msgstr "Dia"
-#: glade/pytrainer.glade:2759 glade/pytrainer.glade:4751
+#: glade/pytrainer.glade:4156 glade/pytrainer.glade:5451
+msgid "000"
+msgstr "000"
+
+#: glade/pytrainer.glade:4545 glade/pytrainer.glade:7844
msgid " "
msgstr " "
-#: glade/pytrainer.glade:2866
+#: glade/pytrainer.glade:4918
msgid " <b>Month:</b>"
msgstr "<b>Mes:</b>"
-#: glade/pytrainer.glade:2966 glade/pytrainer.glade:3677
+#: glade/pytrainer.glade:5018 glade/pytrainer.glade:6174
msgid ""
"Kilometers\n"
"Time\n"
@@ -212,63 +396,59 @@
"Media\n"
"Calorias"
-#: glade/pytrainer.glade:3010
+#: glade/pytrainer.glade:5063 glade/pytrainer.glade:6219
+#, fuzzy
+msgid ""
+"None\n"
+"Kilometers\n"
+"Time\n"
+"Beats\n"
+"Average\n"
+"Calories"
+msgstr ""
+"Kilometros\n"
+"Tiempo\n"
+"Pulsaciones\n"
+"Media\n"
+"Calorias"
+
+#: glade/pytrainer.glade:5133
msgid "Month"
msgstr "Mes"
-#: glade/pytrainer.glade:3354
-msgid "999"
-msgstr ""
-
-#: glade/pytrainer.glade:3577
+#: glade/pytrainer.glade:6074
msgid " <b>Year:</b>"
msgstr "<b>Año:</b>"
-#: glade/pytrainer.glade:3721
+#: glade/pytrainer.glade:6289
msgid "Year"
msgstr "Año"
-#: glade/pytrainer.glade:3764
+#: glade/pytrainer.glade:6332
msgid "label154"
msgstr " "
-#: glade/pytrainer.glade:3801
+#: glade/pytrainer.glade:6369
msgid "<b>Title:</b>"
msgstr "<b>Titulo:</b>"
-#: glade/pytrainer.glade:3846
+#: glade/pytrainer.glade:6414
msgid "Search"
msgstr "Buscar"
-#: glade/pytrainer.glade:3893
+#: glade/pytrainer.glade:6461
msgid "Columns"
msgstr "Columnas"
-#: glade/pytrainer.glade:3968
+#: glade/pytrainer.glade:6536
msgid "label155"
msgstr " "
-#: glade/pytrainer.glade:4145
-msgid " <b>Name:</b>"
-msgstr "<b>Nombre:</b>"
+#: glade/pytrainer.glade:6670
+msgid "Type:"
+msgstr "Tipo:"
-#: glade/pytrainer.glade:4173
-msgid " <b>Description:</b>"
-msgstr "<b>Descripción:</b>"
-
-#: glade/pytrainer.glade:4201
-msgid " <b>Latitude: </b>"
-msgstr "<b>Latitud:</b>"
-
-#: glade/pytrainer.glade:4229
-msgid " <b>Longitude:</b>"
-msgstr "<b>Longitud:</b>"
-
-#: glade/pytrainer.glade:4257
-msgid " <b>Type:</b>"
-msgstr "<b>Titulo:</b>"
-
-#: glade/pytrainer.glade:4329
+#: glade/pytrainer.glade:6698
msgid ""
"Font\n"
"Restaurant\n"
@@ -276,513 +456,695 @@
"Summit"
msgstr ""
-#: glade/pytrainer.glade:4354
+#: glade/pytrainer.glade:6719
+#, fuzzy
+msgid "Latitude: "
+msgstr "<b>Latitud:</b>"
+
+#: glade/pytrainer.glade:6747
+#, fuzzy
+msgid " Name:"
+msgstr "Nombre"
+
+#: glade/pytrainer.glade:6775
+#, fuzzy
+msgid "Longitude:"
+msgstr "<b>Longitud:</b>"
+
+#: glade/pytrainer.glade:6803 glade/pytrainer.glade:12442
+#: glade/pytrainer.glade:12765
+#, fuzzy
+msgid "Description:"
+msgstr "<b>Descripcion:</b>"
+
+#: glade/pytrainer.glade:6923
msgid "<b> Waypoint: </b>"
msgstr "<b>Waypoint:</b>"
-#: glade/pytrainer.glade:4439
-msgid "label-2147483648"
-msgstr " "
-
-#: glade/pytrainer.glade:4487
+#: glade/pytrainer.glade:7056
msgid "label162"
msgstr " "
-#: glade/pytrainer.glade:4627
+#: glade/pytrainer.glade:7196
msgid "label163"
msgstr " "
-#: glade/pytrainer.glade:4652 glade/pytrainer.glade:5684
+#: glade/pytrainer.glade:7221
msgid "New Entry"
msgstr "Nueva Entrada"
-#: glade/pytrainer.glade:4700 pytrainer/gui/windowmain.py:52
-#: pytrainer/gui/windowmain.py:376 pytrainer/gui/dialogselecttrack.py:36
-msgid "Date"
-msgstr "Fecha"
-
-#: glade/pytrainer.glade:4865 pytrainer/gui/windowmain.py:52
-#: pytrainer/gui/windowmain.py:375
-msgid "Title"
+#: glade/pytrainer.glade:7294
+#, fuzzy
+msgid "Title:"
msgstr "Titulo"
-#: glade/pytrainer.glade:4923
-msgid "GPX file"
+#: glade/pytrainer.glade:7343
+#, fuzzy
+msgid "GPX File:"
msgstr "Archivo Gpxl"
-#: glade/pytrainer.glade:4985
+#: glade/pytrainer.glade:7413
msgid "Calculate Values"
msgstr "Calcular Valores"
-#: glade/pytrainer.glade:5018
-msgid "Beats avg (bpm)"
-msgstr "Media pulsaciones (ppm)"
+#: glade/pytrainer.glade:7432
+#, fuzzy
+msgid "Sport:"
+msgstr "Deporte"
-#: glade/pytrainer.glade:5074
-msgid "Distance (Km)"
+#: glade/pytrainer.glade:7483
+#, fuzzy
+msgid "<b>Main</b>"
+msgstr "<b>Mes:</b>"
+
+#: glade/pytrainer.glade:7544
+#, fuzzy
+msgid "Distance (Km):"
msgstr "Distancia (Km)"
-#: glade/pytrainer.glade:5124 pytrainer/gui/windowmain.py:52
-#: pytrainer/gui/windowmain.py:379
-msgid "Time"
+#: glade/pytrainer.glade:7573 glade/pytrainer.glade:7770
+#: glade/pytrainer.glade:8051 glade/pytrainer.glade:8297
+#: glade/pytrainer.glade:8765 glade/pytrainer.glade:11513
+#, fuzzy
+msgid "Calculate"
+msgstr "Calcular Tiempo"
+
+#: glade/pytrainer.glade:7592
+#, fuzzy
+msgid "Time:"
msgstr "Tiempo"
-#: glade/pytrainer.glade:5278
-msgid "Average (km/h)"
+#: glade/pytrainer.glade:7790
+#, fuzzy
+msgid "Date:"
+msgstr "Fecha"
+
+#: glade/pytrainer.glade:7910 glade/pytrainer.glade:11563
+#, fuzzy
+msgid "<b>General</b>"
+msgstr "<b>Media:</b>"
+
+#: glade/pytrainer.glade:7971
+#, fuzzy
+msgid "Max (km/h):"
msgstr "Media (Km/h)"
-#: glade/pytrainer.glade:5328
-msgid "Calculate Distance"
-msgstr "Calcular Distancia"
+#: glade/pytrainer.glade:8022
+#, fuzzy
+msgid "Velocity (km/h)"
+msgstr "Velocidad (km/h)"
-#: glade/pytrainer.glade:5348
-msgid "Calculate Time"
-msgstr "Calcular Tiempo"
+#: glade/pytrainer.glade:8097
+#, fuzzy
+msgid "<b>Velocity</b>"
+msgstr "<b>Borrar deporte</b>"
-#: glade/pytrainer.glade:5368
-msgid "Calculate Average"
-msgstr "Calcular Media"
+#: glade/pytrainer.glade:8133
+#, fuzzy
+msgid "Quick Entry"
+msgstr "Nueva Entrada"
-#: glade/pytrainer.glade:5409 pytrainer/gui/windowmain.py:382
+#: glade/pytrainer.glade:8193
+msgid "Max (min/km):"
+msgstr "Max·(min/km)"
+
+#: glade/pytrainer.glade:8245
+msgid "Pace (min/km):"
+msgstr ""
+
+#: glade/pytrainer.glade:8320
+#, fuzzy
+msgid "<b>Pace</b>"
+msgstr "<b>Nombre:</b>"
+
+#: glade/pytrainer.glade:8381
+msgid "Ascent:"
+msgstr ""
+
+#: glade/pytrainer.glade:8433
+msgid "Descent:"
+msgstr ""
+
+#: glade/pytrainer.glade:8488
+#, fuzzy
+msgid "<b>Accumulated Altitude Change</b>"
+msgstr "<b>Desnivel Acumulado:</b>"
+
+#: glade/pytrainer.glade:8549
+msgid "Max (bpm):"
+msgstr ""
+
+#: glade/pytrainer.glade:8578
+msgid "Heart rate:"
+msgstr ""
+
+#: glade/pytrainer.glade:8652
msgid "Calories"
msgstr "Calorias"
-#: glade/pytrainer.glade:5615
+#: glade/pytrainer.glade:8703
+msgid ""
+"<small><b>Note:</b> In order to calculate the calories you must set the "
+"sport MET (in Preferences->Sport) </small>"
+msgstr ""
+
+#: glade/pytrainer.glade:8820
+#, fuzzy
+msgid "<b>Heart Rate</b>"
+msgstr "<b>Media pulsaciones:</b>"
+
+#: glade/pytrainer.glade:8856
+msgid "Advanced"
+msgstr ""
+
+#: glade/pytrainer.glade:8953
msgid "<b>Comments</b>"
msgstr "<b>Comentarios</b>"
-#: glade/pytrainer.glade:5789 glade/pytrainer.glade:6083
-msgid "Profile"
-msgstr "Perfil"
+#: glade/pytrainer.glade:8982
+#, fuzzy
+msgid "Comments"
+msgstr "<b>Comentarios</b>"
-#: glade/pytrainer.glade:5835
-msgid "Name"
-msgstr "Nombre"
+#: glade/pytrainer.glade:9087
+msgid "Preferences"
+msgstr ""
-#: glade/pytrainer.glade:5863
-msgid "Gender"
-msgstr "Genero"
+#: glade/pytrainer.glade:9161
+msgid "Metric system"
+msgstr ""
-#: glade/pytrainer.glade:5891
-msgid "Weight"
-msgstr "Peso"
+#: glade/pytrainer.glade:9183
+msgid "U.S. customary units"
+msgstr ""
-#: glade/pytrainer.glade:5919
-msgid "Height"
-msgstr "Altura"
+#: glade/pytrainer.glade:9209
+msgid "<b>System of Measurement</b>"
+msgstr ""
-#: glade/pytrainer.glade:6010
-msgid "Age"
-msgstr "Edad"
+#: glade/pytrainer.glade:9269
+#, fuzzy
+msgid "Database type:"
+msgstr "Tipo de base de datos"
-#: glade/pytrainer.glade:6113
+#: glade/pytrainer.glade:9297
+#, fuzzy
+msgid "Database host:"
+msgstr "Servidor base de datos"
+
+#: glade/pytrainer.glade:9346
+#, fuzzy
+msgid "Database name:"
+msgstr "Nombre base de datos"
+
+#: glade/pytrainer.glade:9414
+#, fuzzy
+msgid "Database user:"
+msgstr "Usuarios base de datos"
+
+#: glade/pytrainer.glade:9442
+#, fuzzy
+msgid "Database pass:"
+msgstr "Contraseña base de datos"
+
+#: glade/pytrainer.glade:9516
msgid "<b>Database</b>"
msgstr "<b>Base de datos:</b>"
-#: glade/pytrainer.glade:6147
-msgid "Database Type"
-msgstr "Tipo de base de datos"
+#: glade/pytrainer.glade:9576
+msgid "Use this port for internal connections: "
+msgstr ""
-#: glade/pytrainer.glade:6175
-msgid "Database Host"
-msgstr "Servidor base de datos"
+#: glade/pytrainer.glade:9627
+msgid ""
+"<small><b>Note:</b> Change this only if you know what you are doing</small>"
+msgstr "<small><b>Nota:</b> Cambie ésto sólo si sabe lo que hace.</small>"
-#: glade/pytrainer.glade:6224
-msgid "Database Pass"
-msgstr "Contraseña base de datos"
+#: glade/pytrainer.glade:9659
+#, fuzzy
+msgid "<b>Port Connnection</b>"
+msgstr "<b>Descripcion:</b>"
-#: glade/pytrainer.glade:6273
-msgid "Database User "
-msgstr "Usuarios base de datos"
+#: glade/pytrainer.glade:9695
+#, fuzzy
+msgid "General"
+msgstr "Genero"
-#: glade/pytrainer.glade:6322
-msgid "Database Name"
-msgstr "Nombre base de datos"
+#: glade/pytrainer.glade:9748
+#, fuzzy
+msgid "User name:"
+msgstr "Nuevo nombre"
-#: glade/pytrainer.glade:6403
-msgid "Database"
-msgstr "Base de datos"
+#: glade/pytrainer.glade:9776
+#, fuzzy
+msgid "Gender:"
+msgstr "Genero"
-#: glade/pytrainer.glade:6441
-msgid "<b>Sport list</b>"
+#: glade/pytrainer.glade:9822
+#, fuzzy
+msgid "Height:"
+msgstr "Altura"
+
+#: glade/pytrainer.glade:9893
+msgid "Date of birth:"
+msgstr "Fecha de nacimiento:"
+
+#: glade/pytrainer.glade:10005
+#, fuzzy
+msgid "Weight:"
+msgstr "Peso"
+
+#: glade/pytrainer.glade:10037
+#, fuzzy
+msgid "<b>Athlete Details</b>"
+msgstr "<b>Borrar deporte</b>"
+
+#: glade/pytrainer.glade:10066
+#, fuzzy
+msgid "Athlete"
+msgstr "borrar"
+
+#: glade/pytrainer.glade:10249
+#, fuzzy
+msgid "<b>Sport List</b>"
msgstr "<b>Lista de deportes:</b>"
-#: glade/pytrainer.glade:6592
+#: glade/pytrainer.glade:10278
msgid "llist"
msgstr ""
-#: glade/pytrainer.glade:6621
-msgid "<b>Add new Sport</b>"
+#: glade/pytrainer.glade:10358 glade/pytrainer.glade:12386
+#: glade/pytrainer.glade:12877
+#, fuzzy
+msgid "Name:"
+msgstr "Nombre"
+
+#: glade/pytrainer.glade:10386
+msgid "M.E.T.:"
+msgstr "M.E.T:"
+
+#: glade/pytrainer.glade:10435
+#, fuzzy
+msgid "Extra Weight:"
+msgstr "Peso"
+
+#: glade/pytrainer.glade:10511 glade/pytrainer.glade:11117
+msgid ""
+"<small><b>Note:</b> You can get your M.E.T. sport Coefficient here: http://"
+"pytrainer.e-oss.net/met.pdf</small>"
+msgstr ""
+
+#: glade/pytrainer.glade:10622
+#, fuzzy
+msgid "<b>Add New Sport</b>"
msgstr "<b>Añadir nuevo deporte</b>"
-#: glade/pytrainer.glade:6781
+#: glade/pytrainer.glade:10651
msgid "new"
msgstr "nuevo"
-#: glade/pytrainer.glade:6816
-msgid "<b>Delete sport</b>"
+#: glade/pytrainer.glade:10711
+msgid ""
+"Deleting a sport removes associated records.\n"
+"Continue?"
+msgstr "SI borra un deporte elimina sus registros asociados.\n"
+"Desea continuar?"
+
+#: glade/pytrainer.glade:10851
+#, fuzzy
+msgid "<b>Delete Sport</b>"
msgstr "<b>Borrar deporte</b>"
-#: glade/pytrainer.glade:6879
-msgid ""
-"You are going to remove a sport. When you delete a \n"
-"sport you delete the records asociated. Are you sure \n"
-"that you want do it?"
-msgstr ""
-"Estás a punto de borrar un deporte. Cuando tu borras \n"
-"un deporte borras también la lista de registros asociados\n"
-"en la base de datos. ¿Estás seguro de que es ésto lo que \n"
-"quieres hacer?"
-
-#: glade/pytrainer.glade:7016
+#: glade/pytrainer.glade:10911
msgid "delete"
msgstr "borrar"
-#: glade/pytrainer.glade:7051
-msgid "<b>Edit sport</b>"
+#: glade/pytrainer.glade:10970
+msgid "Name"
+msgstr "Nombre"
+
+#: glade/pytrainer.glade:11019
+msgid "M.E.T."
+msgstr "M.E.T."
+
+#: glade/pytrainer.glade:11068
+#, fuzzy
+msgid "Extra Weight"
+msgstr "Peso"
+
+#: glade/pytrainer.glade:11234
+#, fuzzy
+msgid "<b>Edit Sport</b>"
msgstr "<b>Editar deporte</b>"
-#: glade/pytrainer.glade:7114
-msgid "New name"
-msgstr "Nuevo nombre"
+#: glade/pytrainer.glade:11258
+#, fuzzy
+msgid "<b>lalaal</b>"
+msgstr "<b>Base de datos:</b>"
-#: glade/pytrainer.glade:7243
+#: glade/pytrainer.glade:11294
msgid "edit"
msgstr "editar"
-#: glade/pytrainer.glade:7272
+#: glade/pytrainer.glade:11323
msgid "Sports"
msgstr "Deportes"
-#: glade/pytrainer.glade:7377
-msgid "Calendar"
-msgstr "Calendario"
+#: glade/pytrainer.glade:11382
+msgid "Maximun heart rate:"
+msgstr "Pulsaciones máximas:"
-#: glade/pytrainer.glade:7503
-msgid "pytrainer"
-msgstr "pytrainer"
+#: glade/pytrainer.glade:11410
+msgid "Resting heart rate:"
+msgstr "Pulsaciones en reposo:"
-#: glade/pytrainer.glade:7504
-msgid "(c) Fiz Vazquez <vu...@si...>"
-msgstr " "
+#: glade/pytrainer.glade:11484
+msgid ""
+"<small><b>Note:</b> Maximun heart rate is calculated by subtracting the "
+"number 220 minus your age. </small>"
+msgstr "<small><b>Nota:</b> EL número máximo de pulsaciones se calcula con la "
+"siguiente fórmula: 220 menos su edad. </small>"
-#: glade/pytrainer.glade:7505
-msgid "The free sport trainning center"
-msgstr "El centro de entrenamiento libre"
-
-#: glade/pytrainer.glade:7506
+#: glade/pytrainer.glade:11623
msgid ""
-"(C) Fiz Vazquez\n"
-"\n"
-" This program is free software; you can redistribute \n"
-" it and/or modify it under the terms of the GNU \n"
-" General Public License as published by the Free \n"
-" Software Foundation; either version 2 of the License, \n"
-" or (at your option) any later version.\n"
-"\n"
-" This program is distributed in the hope that it will be \n"
-" useful, but WITHOUT ANY WARRANTY; without even the\n"
-" implied warranty of MERCHANTABILITY or FITNESS FOR \n"
-" A PARTICULAR PURPOSE. See the GNU General Public \n"
-" License <http://www.opensource.org/gpl-license.html>\n"
-" for more details.\n"
-"\n"
-" You can found the license on Debian systems in the file\n"
-" /usr/share/common-licenses/GPL\n"
+"<small><b>NOTE:</b> in order to use the Karvonen method you must cover the "
+"Resting hr field.</small>"
msgstr ""
-#: glade/pytrainer.glade:7526
-msgid "pytrainer.e-oss.net"
-msgstr " "
+#: glade/pytrainer.glade:11652
+msgid "Percentages based method"
+msgstr "Metodo basado en Porcentajes"
-#: glade/pytrainer.glade:7528
-msgid ""
-"Catalan: Eloi Crespillo Itchart <el...@ik...>\n"
-"Czech: Lobus Pokorny <sp...@se...>\n"
-"French: Dj <dj...@dj...>\n"
-"Norwegian: Havard Davidsen <hav...@gm...>\n"
-"Polish: Seweryn Kokot <sk...@po...>\n"
-"german: Aleks <al...@sc...>\n"
-"Spanish: Fiz vazquez <vu...@si...>"
-msgstr " "
+#: glade/pytrainer.glade:11674
+msgid "Karvonen method"
+msgstr ""
-#: glade/pytrainer.glade:7619
+#: glade/pytrainer.glade:11696
+msgid "Select how to calculate your heart rate zones."
+msgstr ""
+
+#: glade/pytrainer.glade:11728
+#, fuzzy
+msgid "<b>Heart Rate Zones</b>"
+msgstr "<b>Pulsaciones:</b>"
+
+#: glade/pytrainer.glade:11764
+msgid "Heart Rate"
+msgstr ""
+
+#: glade/pytrainer.glade:11869
+msgid "Calendar"
+msgstr "Calendario"
+
+#: glade/pytrainer.glade:12071
msgid "Edit Record"
msgstr "Editar Registro"
-#: glade/pytrainer.glade:7640
+#: glade/pytrainer.glade:12092
msgid "Show graph in classic view"
msgstr "Mostrar en la vista clásica"
-#: glade/pytrainer.glade:7676
+#: glade/pytrainer.glade:12128
msgid "warning"
msgstr "advertencia"
-#: glade/pytrainer.glade:7802
-msgid "window2"
-msgstr "window2"
+#: glade/pytrainer.glade:12330
+msgid "<b>Extension Details</b>"
+msgstr "<b>Detalles de la Extensión</b>"
-#: glade/pytrainer.glade:7878 glade/pytrainer.glade:8228
-msgid "<b>Name:</b>"
-msgstr "<b>Nombre:</b>"
+#: glade/pytrainer.glade:12358
+msgid "name-entry"
+msgstr ""
-#: glade/pytrainer.glade:7906 glade/pytrainer.glade:8256
-msgid "<b>Description:</b>"
-msgstr "<b>Descripcion:</b>"
-
-#: glade/pytrainer.glade:7934 glade/pytrainer.glade:8284
-msgid "<b>Status:</b>"
+#: glade/pytrainer.glade:12414 glade/pytrainer.glade:12821
+#, fuzzy
+msgid "Status:"
msgstr "<b>Estado:</b>"
-#: glade/pytrainer.glade:7962
-msgid "name-entry"
+#: glade/pytrainer.glade:12470 glade/pytrainer.glade:12793
+msgid "status-entry"
msgstr ""
-#: glade/pytrainer.glade:7990 glade/pytrainer.glade:8340
+#: glade/pytrainer.glade:12498
msgid "description-entry"
msgstr ""
-#: glade/pytrainer.glade:8018 glade/pytrainer.glade:8368
-msgid "status-entry"
-msgstr ""
-
-#: glade/pytrainer.glade:8153
+#: glade/pytrainer.glade:12633
msgid "Plugins"
msgstr "Plugins"
-#: glade/pytrainer.glade:8312
+#: glade/pytrainer.glade:12708
+#, fuzzy
+msgid "<b>Plugin Details</b>"
+msgstr "<b>Base de datos:</b>"
+
+#: glade/pytrainer.glade:12737
+msgid "description-entry "
+msgstr ""
+
+#: glade/pytrainer.glade:12849
msgid "nameEntry"
msgstr "Nueva Entrada"
-#: glade/pytrainer.glade:8511
+#: glade/pytrainer.glade:13020
msgid "Select track record"
msgstr "Seleccione uno de los tracks"
-#: pytrainer/main.py:90
-msgid "No Active Plugins"
-msgstr "No hay plugins activos"
+#~ msgid " Km"
+#~ msgstr "km"
-#: pytrainer/main.py:99
-msgid "No Active Extensions"
-msgstr "No hay extensiones activas"
+#~ msgid " km/h"
+#~ msgstr "Km/h"
-#: pytrainer/main.py:208
-msgid "You are going to remove one database entry. Are you sure yo want do it?"
-msgstr ""
-"Estás a punto de borrar una entrada en la base de datos. Estás seguro de que "
-"quieres hacer eso?"
+#~ msgid "<b>Positive:</b>"
+#~ msgstr "<b>Positivo:</b>"
-#: pytrainer/main.py:219
-msgid "You are going to remove one waypoint. Are you sure yo want do it?"
-msgstr ""
-"Estás a punto de borrar una entrada en la base de datos. Estás seguro de que "
-"quieres hacer eso?"
+#~ msgid "<b>Negative:</b>"
+#~ msgstr "<b>Negativo:</b>"
-#: pytrainer/lib/date.py:72
-msgid "January"
-msgstr "Enero"
+#~ msgid " <b>Name:</b>"
+#~ msgstr "<b>Nombre:</b>"
-#: pytrainer/lib/date.py:73
-msgid "Febrary"
-msgstr "Febrero"
+#~ msgid " <b>Description:</b>"
+#~ msgstr "<b>Descripción:</b>"
-#: pytrainer/lib/date.py:74
-msgid "March"
-msgstr "Marzo"
+#~ msgid "Beats avg (bpm)"
+#~ msgstr "Media pulsaciones (ppm)"
-#: pytrainer/lib/date.py:75
-msgid "April"
-msgstr "Abril"
+#~ msgid "Calculate Distance"
+#~ msgstr "Calcular Distancia"
-#: pytrainer/lib/date.py:76
-msgid "May"
-msgstr "Mayo"
+#~ msgid "Calculate Average"
+#~ msgstr "Calcular Media"
-#: pytrainer/lib/date.py:77
-msgid "June"
-msgstr "Junio"
+#~ msgid "Profile"
+#~ msgstr "Perfil"
-#: pytrainer/lib/date.py:78
-msgid "July"
-msgstr "Julio"
+#~ msgid "Age"
+#~ msgstr "Edad"
-#: pytrainer/lib/date.py:79
-msgid "August"
-msgstr "Agosto"
+#~ msgid "Database"
+#~ msgstr "Base de datos"
-#: pytrainer/lib/date.py:80
-msgid "September"
-msgstr "Septiembre"
+#~ msgid ""
+#~ "You are going to remove a sport. When you delete a \n"
+#~ "sport you delete the records asociated. Are you sure \n"
+#~ "that you want do it?"
+#~ msgstr ""
+#~ "Estás a punto de borrar un deporte. Cuando tu borras \n"
+#~ "un deporte borras también la lista de registros asociados\n"
+#~ "en la base de datos. ¿Estás seguro de que es ésto lo que \n"
+#~ "quieres hacer?"
-#: pytrainer/lib/date.py:81
-msgid "October"
-msgstr "Octubre"
+#~ msgid "pytrainer"
+#~ msgstr "pytrainer"
-#: pytrainer/lib/date.py:82
-msgid "November"
-msgstr "Noviembre"
+#~ msgid "(c) Fiz Vazquez <vu...@si...>"
+#~ msgstr " "
-#: pytrainer/lib/date.py:83
-msgid "December"
-msgstr "Diciembre"
+#~ msgid "The free sport trainning center"
+#~ msgstr "El centro de entrenamiento libre"
-#: pytrainer/yeargraph.py:37 pytrainer/yeargraph.py:39
-#: pytrainer/yeargraph.py:41 pytrainer/yeargraph.py:43
-#: pytrainer/yeargraph.py:45
-msgid "month"
-msgstr "mes"
+#~ msgid "pytrainer.e-oss.net"
+#~ msgstr " "
-#: pytrainer/yeargraph.py:37 pytrainer/monthgraph.py:37
-msgid "kilometers"
-msgstr "Kilometros"
+#~ msgid ""
+#~ "Catalan: Eloi Crespillo Itchart <el...@ik...>\n"
+#~ "Czech: Lobus Pokorny <sp...@se...>\n"
+#~ "French: Dj <dj...@dj...>\n"
+#~ "Norwegian: Havard Davidsen <hav...@gm...>\n"
+#~ "Polish: Seweryn Kokot <sk...@po...>\n"
+#~ "german: Aleks <al...@sc...>\n"
+#~ "Spanish: Fiz vazquez <vu...@si...>"
+#~ msgstr " "
-#: pytrainer/yeargraph.py:37
-msgid "monthly kilometers"
-msgstr "Kilometros mensuales"
+#~ msgid "window2"
+#~ msgstr "window2"
-#: pytrainer/yeargraph.py:39 pytrainer/monthgraph.py:39
-msgid "time in hours"
-msgstr "Tiempo en horas"
+#~ msgid "No Active Plugins"
+#~ msgstr "No hay plugins activos"
-#: pytrainer/yeargraph.py:39
-msgid "monthly time"
-msgstr "tiempo mensual"
+#~ msgid "No Active Extensions"
+#~ msgstr "No hay extensiones activas"
-#: pytrainer/yeargraph.py:41 pytrainer/monthgraph.py:41
-msgid "beats per minute"
-msgstr "pulsaciones por minuto"
+#~ msgid ""
+#~ "You are going to remove one database entry. Are you sure yo want do it?"
+#~ msgstr ""
+#~ "Estás a punto de borrar una entrada en la base de datos. Estás seguro de "
+#~ "que quieres hacer eso?"
-#: pytrainer/yeargraph.py:41
-msgid "monthly beats"
-msgstr "pulsaciones mensuales"
+#~ msgid "You are going to remove one waypoint. Are you sure yo want do it?"
+#~ msgstr ""
+#~ "Estás a punto de borrar una entrada en la base de datos. Estás seguro de "
+#~ "que quieres hacer eso?"
-#: pytrainer/yeargraph.py:43 pytrainer/monthgraph.py:43
-msgid "average (hm/h)"
-msgstr "media (km/h)"
+#~ msgid "January"
+#~ msgstr "Enero"
-#: pytrainer/yeargraph.py:43
-msgid "monthly averages"
-msgstr "medias mensuales"
+#~ msgid "Febrary"
+#~ msgstr "Febrero"
-#: pytrainer/yeargraph.py:45 pytrainer/monthgraph.py:45
-msgid "calories"
-msgstr "calorias"
+#~ msgid "March"
+#~ msgstr "Marzo"
-#: pytrainer/yeargraph.py:45
-msgid "monthly calories"
-msgstr "calorias mensuales"
+#~ msgid "April"
+#~ msgstr "Abril"
-#: pytrainer/gui/windowmain.py:49 pytrainer/gui/windowmain.py:52
-#: pytrainer/gui/windowmain.py:56
-msgid "id"
-msgstr "id"
+#~ msgid "May"
+#~ msgstr "Mayo"
-#: pytrainer/gui/windowmain.py:49
-msgid "Kilometer"
-msgstr "Kilometros"
+#~ msgid "June"
+#~ msgstr "Junio"
-#: pytrainer/gui/windowmain.py:52 pytrainer/gui/windowmain.py:377
-msgid "Distance"
-msgstr "Distancia"
+#~ msgid "July"
+#~ msgstr "Julio"
-#: pytrainer/gui/windowmain.py:52 pytrainer/gui/windowmain.py:380
-msgid "Beats"
-msgstr "Pulsaciones"
+#~ msgid "August"
+#~ msgstr "Agosto"
-#: pytrainer/gui/windowmain.py:52 pytrainer/gui/windowmain.py:381
-msgid "Average"
-msgstr "Media"
+#~ msgid "September"
+#~ msgstr "Septiembre"
-#: pytrainer/gui/windowmain.py:56
-msgid "Waypoint"
-msgstr "Waypoint"
+#~ msgid "October"
+#~ msgstr "Octubre"
-#: pytrainer/gui/windowplugins.py:72 pytrainer/gui/windowextensions.py:70
-msgid "Active"
-msgstr "Activo"
+#~ msgid "November"
+#~ msgstr "Noviembre"
-#: pytrainer/gui/windowplugins.py:74 pytrainer/gui/windowextensions.py:72
-msgid "unActive"
-msgstr "inActivo"
+#~ msgid "December"
+#~ msgstr "Diciembre"
-#: pytrainer/gui/windowplugins.py:83 pytrainer/gui/windowextensions.py:81
-#, python-format
-msgid "%s settings"
-msgstr "%s opciones"
+#~ msgid "month"
+#~ msgstr "mes"
-#: pytrainer/gui/windowplugins.py:106 pytrainer/gui/windowextensions.py:104
-#: pytrainer/gui/windowextensions.py:117
-msgid "Ok"
-msgstr "Ok"
+#~ msgid "kilometers"
+#~ msgstr "Kilometros"
-#: pytrainer/gui/dialogselecttrack.py:36
-msgid "Track Name"
-msgstr "Nombre de la ruta."
+#~ msgid "monthly kilometers"
+#~ msgstr "Kilometros mensuales"
-#: pytrainer/daygraph.py:48 pytrainer/daygraph.py:50
-#: pytrainer/recordgraph.py:48 pytrainer/recordgraph.py:50
-msgid "Distance (km)"
-msgstr "Distancia (Km)"
+#~ msgid "time in hours"
+#~ msgstr "Tiempo en horas"
-#: pytrainer/daygraph.py:48 pytrainer/recordgraph.py:48
-msgid "Height (m)"
-msgstr "Altura (m)"
+#~ msgid "monthly time"
+#~ msgstr "tiempo mensual"
-#: pytrainer/daygraph.py:48 pytrainer/recordgraph.py:48
-msgid "Stage Profile"
-msgstr "Perfil de Etapa"
+#~ msgid "beats per minute"
+#~ msgstr "pulsaciones por minuto"
-#: pytrainer/daygraph.py:50 pytrainer/recordgraph.py:50
-msgid "Velocity (Km/h)"
-msgstr "Velocidad (km/h)"
+#~ msgid "monthly beats"
+#~ msgstr "pulsaciones mensuales"
-#: pytrainer/daygraph.py:50 pytrainer/recordgraph.py:50
-msgid "velocity"
-msgstr "velocidad"
+#~ msgid "average (hm/h)"
+#~ msgstr "media (km/h)"
-#: pytrainer/monthgraph.py:37 pytrainer/monthgraph.py:39
-#: pytrainer/monthgraph.py:41 pytrainer/monthgraph.py:43
-#: pytrainer/monthgraph.py:45
-msgid "day"
-msgstr "dia"
+#~ msgid "monthly averages"
+#~ msgstr "medias mensuales"
-#: pytrainer/monthgraph.py:37
-msgid "daily kilometers"
-msgstr "Kilometros diarios"
+#~ msgid "calories"
+#~ msgstr "calorias"
-#: pytrainer/monthgraph.py:39
-msgid "daily time"
-msgstr "tiempo diario"
+#~ msgid "monthly calories"
+#~ msgstr "calorias mensuales"
-#: pytrainer/monthgraph.py:41
-msgid "daily beats"
-msgstr "pulsaciones diarias"
+#~ msgid "id"
+#~ msgstr "id"
-#: pytrainer/monthgraph.py:43
-msgid "daily averages"
-msgstr "medias diarias"
+#~ msgid "Kilometer"
+#~ msgstr "Kilometros"
-#: pytrainer/monthgraph.py:45
-msgid "daily calories"
-msgstr "calorias diarias"
+#~ msgid "Distance"
+#~ msgstr "Distancia"
-#: pytrainer/record.py:190
-msgid ""
-"The gpx file seems to have several track records. Press cancel to select a "
-"track record. Press Ok to load all of them as a single track record."
-msgstr "Parece que el archivo gpx contiene varios registros de rutas. Presione Cancelar para seleccionar una ruta. Selecciona aceptar para seleccionarlos todos como una unica ruta."
+#~ msgid "Beats"
+#~ msgstr "Pulsaciones"
-#: pytrainer/waypoint.py:67
-msgid ""
-"The gpx file seems to be a several days records. Perhaps you will need to "
-"edit your gpx file"
-msgstr ""
-"Parece que el archivo gpx contiene salidas de varios dias. "
-"Probablementenecesitarás editar tu archivo gpx"
+#~ msgid "Average"
+#~ msgstr "Media"
-#~ msgid "<b>Beats:</b>"
-#~ msgstr "<b>Pulsaciones:</b>"
+#~ msgid "Waypoint"
+#~ msgstr "Waypoint"
+#~ msgid "Active"
+#~ msgstr "Activo"
+
+#~ msgid "unActive"
+#~ msgstr "inActivo"
+
+#~ msgid "%s settings"
+#~ msgstr "%s opciones"
+
+#~ msgid "Ok"
+#~ msgstr "Ok"
+
+#~ msgid "Track Name"
+#~ msgstr "Nombre de la ruta."
+
+#~ msgid "Distance (km)"
+#~ msgstr "Distancia (Km)"
+
+#~ msgid "Height (m)"
+#~ msgstr "Altura (m)"
+
+#~ msgid "Stage Profile"
+#~ msgstr "Perfil de Etapa"
+
+#~ msgid "velocity"
+#~ msgstr "velocidad"
+
+#~ msgid "day"
+#~ msgstr "dia"
+
+#~ msgid "daily kilometers"
+#~ msgstr "Kilometros diarios"
+
+#~ msgid "daily time"
+#~ msgstr "tiempo diario"
+
+#~ msgid "daily beats"
+#~ msgstr "pulsaciones diarias"
+
+#~ msgid "daily averages"
+#~ msgstr "medias diarias"
+
+#~ msgid "daily calories"
+#~ msgstr "calorias diarias"
+
+#~ msgid ""
+#~ "The gpx file seems to have several track records. Press cancel to select "
+#~ "a track record. Press Ok to load all of them as a single track record."
+#~ msgstr ""
+#~ "Parece que el archivo gpx contiene varios registros de rutas. Presione "
+#~ "Cancelar para seleccionar una ruta. Selecciona aceptar para "
+#~ "seleccionarlos todos como una unica ruta."
+
+#~ msgid ""
+#~ "The gpx file seems to be a several days records. Perhaps you will need to "
+#~ "edit your gpx file"
+#~ msgstr ""
+#~ "Parece que el archivo gpx contiene salidas de varios dias. "
+#~ "Probablementenecesitarás editar tu archivo gpx"
+
#~ msgid "Km/day"
#~ msgstr "Km/dia"
Modified: pytrainer/trunk/locale/es/LC_MESSAGES/pytrainer_es.pot
===================================================================
--- pytrainer/trunk/locale/es/LC_MESSAGES/pytrainer_es.pot 2009-04-12 11:08:01 UTC (rev 318)
+++ pytrainer/trunk/locale/es/LC_MESSAGES/pytrainer_es.pot 2009-04-16 20:35:24 UTC (rev 319)
@@ -1,210 +1,208 @@
# Spanish translations for vud package.
-# Copyright (C) 2008 THE vud'S COPYRIGHT HOLDER
+# Copyright (C) 2009 THE vud'S COPYRIGHT HOLDER
# This file is distributed under the same license as the vud package.
-# Fiz Vazquez <vu...@si...>, 2008.
+# Fiz Vazquez <vu...@si...>, 2009.
#
msgid ""
msgstr ""
"Project-Id-Version: vud 1\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-03-03 19:57+0100\n"
-"PO-Revision-Date: 2008-03-03 19:57+0100\n"
+"POT-Creation-Date: 2009-04-16 22:27+0200\n"
+"PO-Revision-Date: 2009-04-16 22:27+0200\n"
"Last-Translator: Fiz Vazquez <vu...@si...>\n"
"Language-Team: Spanish\n"
"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Type: text/plain; charset=ASCII\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: glade/pytrainer.glade:10
+#: glade/pytrainer.glade:8
msgid "window1"
msgstr ""
-#: glade/pytrainer.glade:50
+#: glade/pytrainer.glade:48
msgid "_File"
msgstr ""
-#: glade/pytrainer.glade:74
+#: glade/pytrainer.glade:72
msgid "_Export as Text Separated by Commas"
msgstr ""
-#: glade/pytrainer.glade:114
+#: glade/pytrainer.glade:112
msgid "_Edit"
msgstr ""
-#: glade/pytrainer.glade:136
+#: glade/pytrainer.glade:134
msgid "_View"
msgstr ""
-#: glade/pytrainer.glade:145
+#: glade/pytrainer.glade:143
msgid " _Classic View"
msgstr ""
-#: glade/pytrainer.glade:156
+#: glade/pytrainer.glade:154
msgid " _List View"
msgstr ""
-#: glade/pytrainer.glade:168
+#: glade/pytrainer.glade:166
msgid " _Waypoints Editor"
msgstr ""
-#: glade/pytrainer.glade:184
+#: glade/pytrainer.glade:182
msgid "Tools"
msgstr ""
-#: glade/pytrainer.glade:194 glade/pytrainer.glade:12298
+#: glade/pytrainer.glade:192 glade/pytrainer.glade:12254
msgid "Extensions"
msgstr ""
-#: glade/pytrainer.glade:204
+#: glade/pytrainer.glade:202
msgid "GPS Device Plugins"
msgstr ""
-#: glade/pytrainer.glade:218
+#: glade/pytrainer.glade:216
msgid "_Help"
msgstr ""
-#: glade/pytrainer.glade:338 pytrainer/gui/windowmain.py:49
-#: pytrainer/gui/windowmain.py:52 pytrainer/gui/windowmain.py:471
-#: pytrainer/gui/windowprofile.py:67
+#: glade/pytrainer.glade:336
msgid "Sport"
msgstr ""
-#: glade/pytrainer.glade:364
+#: glade/pytrainer.glade:362
msgid "All Sports"
msgstr ""
-#: glade/pytrainer.glade:473 glade/pytrainer.glade:838
-#: glade/pytrainer.glade:866
+#: glade/pytrainer.glade:471 glade/pytrainer.glade:836
+#: glade/pytrainer.glade:864
msgid " "
msgstr ""
-#: glade/pytrainer.glade:501 glade/pytrainer.glade:894
+#: glade/pytrainer.glade:499 glade/pytrainer.glade:892
msgid " "
msgstr ""
-#: glade/pytrainer.glade:529
+#: glade/pytrainer.glade:527
msgid "<b>Sport:</b>"
msgstr ""
-#: glade/pytrainer.glade:557 glade/pytrainer.glade:2996
-#: glade/pytrainer.glade:4124 glade/pytrainer.glade:5419
+#: glade/pytrainer.glade:555 glade/pytrainer.glade:2994
+#: glade/pytrainer.glade:4122 glade/pytrainer.glade:5417
msgid "<b>Time:</b>"
msgstr ""
-#: glade/pytrainer.glade:586 glade/pytrainer.glade:3193
-#: glade/pytrainer.glade:4294 glade/pytrainer.glade:5643
+#: glade/pytrainer.glade:584 glade/pytrainer.glade:3191
+#: glade/pytrainer.glade:4292 glade/pytrainer.glade:5641
msgid "<b>Speed:</b>"
msgstr ""
-#: glade/pytrainer.glade:614 glade/pytrainer.glade:3502
-#: glade/pytrainer.glade:4658 glade/pytrainer.glade:5813
+#: glade/pytrainer.glade:612 glade/pytrainer.glade:3500
+#: glade/pytrainer.glade:4656 glade/pytrainer.glade:5811
msgid "<b>Pace:</b>"
msgstr ""
-#: glade/pytrainer.glade:642
+#: glade/pytrainer.glade:640
msgid "<b>Ascent:</b>"
msgstr ""
-#: glade/pytrainer.glade:670
+#: glade/pytrainer.glade:668
msgid "<b>Comments:</b>"
msgstr ""
-#: glade/pytrainer.glade:698 glade/pytrainer.glade:1381
-#: glade/pytrainer.glade:3249 glade/pytrainer.glade:3306
-#: glade/pytrainer.glade:4350 glade/pytrainer.glade:4519
-#: glade/pytrainer.glade:5699 glade/pytrainer.glade:5727
+#: glade/pytrainer.glade:696 glade/pytrainer.glade:1379
+#: glade/pytrainer.glade:3247 glade/pytrainer.glade:3304
+#: glade/pytrainer.glade:4348 glade/pytrainer.glade:4517
+#: glade/pytrainer.glade:5697 glade/pytrainer.glade:5725
msgid "km/h"
msgstr ""
-#: glade/pytrainer.glade:726 glade/pytrainer.glade:1091
-#: glade/pytrainer.glade:3530 glade/pytrainer.glade:3586
-#: glade/pytrainer.glade:4714 glade/pytrainer.glade:4742
-#: glade/pytrainer.glade:5870 glade/pytrainer.glade:5898
+#: glade/pytrainer.glade:724 glade/pytrainer.glade:1089
+#: glade/pytrainer.glade:3528 glade/pytrainer.glade:3584
+#: glade/pytrainer.glade:4712 glade/pytrainer.glade:4740
+#: glade/pytrainer.glade:5868 glade/pytrainer.glade:5896
msgid "min/km"
msgstr ""
-#: glade/pytrainer.glade:754 glade/pytrainer.glade:1147
+#: glade/pytrainer.glade:752 glade/pytrainer.glade:1145
msgid "m"
msgstr ""
-#: glade/pytrainer.glade:782
+#: glade/pytrainer.glade:780
msgid " "
msgstr ""
-#: glade/pytrainer.glade:810 glade/pytrainer.glade:1119
-#: glade/pytrainer.glade:2042 glade/pytrainer.glade:2070
-#: glade/pytrainer.glade:2098 glade/pytrainer.glade:2266
-#: glade/pytrainer.glade:3698 glade/pytrainer.glade:4854
+#: glade/pytrainer.glade:808 glade/pytrainer.glade:1117
+#: glade/pytrainer.glade:2040 glade/pytrainer.glade:2068
+#: glade/pytrainer.glade:2096 glade/pytrainer.glade:2264
+#: glade/pytrainer.glade:3696 glade/pytrainer.glade:4852
msgid " "
msgstr ""
-#: glade/pytrainer.glade:922
+#: glade/pytrainer.glade:920
msgid "<b>Date:</b>"
msgstr ""
-#: glade/pytrainer.glade:950 glade/pytrainer.glade:2968
-#: glade/pytrainer.glade:4096 glade/pytrainer.glade:5391
+#: glade/pytrainer.glade:948 glade/pytrainer.glade:2966
+#: glade/pytrainer.glade:4094 glade/pytrainer.glade:5389
msgid "<b>Distance:</b>"
msgstr ""
-#: glade/pytrainer.glade:979
+#: glade/pytrainer.glade:977
msgid "<b>Max Speed</b>"
msgstr ""
-#: glade/pytrainer.glade:1007 glade/pytrainer.glade:3558
-#: glade/pytrainer.glade:4686 glade/pytrainer.glade:5842
+#: glade/pytrainer.glade:1005 glade/pytrainer.glade:3556
+#: glade/pytrainer.glade:4684 glade/pytrainer.glade:5840
msgid "<b>Max Pace:</b>"
msgstr ""
-#: glade/pytrainer.glade:1035
+#: glade/pytrainer.glade:1033
msgid "<b>Descent:</b>"
msgstr ""
-#: glade/pytrainer.glade:1063
+#: glade/pytrainer.glade:1061
msgid " "
msgstr ""
-#: glade/pytrainer.glade:1213 glade/pytrainer.glade:2912
-#: glade/pytrainer.glade:4040 glade/pytrainer.glade:5615
+#: glade/pytrainer.glade:1211 glade/pytrainer.glade:2910
+#: glade/pytrainer.glade:4038 glade/pytrainer.glade:5613
msgid "Km"
msgstr ""
-#: glade/pytrainer.glade:1246 glade/pytrainer.glade:1296
-#: glade/pytrainer.glade:1346 glade/pytrainer.glade:3030
-#: glade/pytrainer.glade:3080 glade/pytrainer.glade:3130
-#: glade/pytrainer.glade:4208 glade/pytrainer.glade:4258
-#: glade/pytrainer.glade:5503 glade/pytrainer.glade:5553
+#: glade/pytrainer.glade:1244 glade/pytrainer.glade:1294
+#: glade/pytrainer.glade:1344 glade/pytrainer.glade:3028
+#: glade/pytrainer.glade:3078 glade/pytrainer.glade:3128
+#: glade/pytrainer.glade:4206 glade/pytrainer.glade:4256
+#: glade/pytrainer.glade:5501 glade/pytrainer.glade:5551
msgid "00"
msgstr ""
-#: glade/pytrainer.glade:1271 glade/pytrainer.glade:1321
-#: glade/pytrainer.glade:3055 glade/pytrainer.glade:3105
-#: glade/pytrainer.glade:4183 glade/pytrainer.glade:4233
-#: glade/pytrainer.glade:5478 glade/pytrainer.glade:5528
-#: glade/pytrainer.glade:7648 glade/pytrainer.glade:7693
+#: glade/pytrainer.glade:1269 glade/pytrainer.glade:1319
+#: glade/pytrainer.glade:3053 glade/pytrainer.glade:3103
+#: glade/pytrainer.glade:4181 glade/pytrainer.glade:4231
+#: glade/pytrainer.glade:5476 glade/pytrainer.glade:5526
+#: glade/pytrainer.glade:7646 glade/pytrainer.glade:7691
msgid ":"
msgstr ""
-#: glade/pytrainer.glade:1415 glade/pytrainer.glade:2377
-#: glade/pytrainer.glade:2939 glade/pytrainer.glade:3221
-#: glade/pytrainer.glade:3362 glade/pytrainer.glade:3446
-#: glade/pytrainer.glade:3726 glade/pytrainer.glade:3754
-#: glade/pytrainer.glade:4067 glade/pytrainer.glade:4322
-#: glade/pytrainer.glade:4406 glade/pytrainer.glade:4602
-#: glade/pytrainer.glade:4882 glade/pytrainer.glade:5222
-#: glade/pytrainer.glade:5306 glade/pytrainer.glade:5362
-#: glade/pytrainer.glade:5671 glade/pytrainer.glade:5954
-#: glade/pytrainer.glade:5982 glade/pytrainer.glade:6010
-#: glade/pytrainer.glade:6038
+#: glade/pytrainer.glade:1413 glade/pytrainer.glade:2375
+#: glade/pytrainer.glade:2937 glade/pytrainer.glade:3219
+#: glade/pytrainer.glade:3360 glade/pytrainer.glade:3444
+#: glade/pytrainer.glade:3724 glade/pytrainer.glade:3752
+#: glade/pytrainer.glade:4065 glade/pytrainer.glade:4320
+#: glade/pytrainer.glade:4404 glade/pytrainer.glade:4600
+#: glade/pytrainer.glade:4880 glade/pytrainer.glade:5220
+#: glade/pytrainer.glade:5304 glade/pytrainer.glade:5360
+#: glade/pytrainer.glade:5669 glade/pytrainer.glade:5952
+#: glade/pytrainer.glade:5980 glade/pytrainer.glade:6008
+#: glade/pytrainer.glade:6036
msgid " "
msgstr ""
-#: glade/pytrainer.glade:1522
+#: glade/pytrainer.glade:1520
msgid " <b>Title:</b>"
msgstr ""
-#: glade/pytrainer.glade:1636
+#: glade/pytrainer.glade:1634
msgid ""
"Profile\n"
"Speed\n"
@@ -212,12 +210,12 @@
"Heart Rate"
msgstr ""
-#: glade/pytrainer.glade:1655 glade/pytrainer.glade:5040
-#: glade/pytrainer.glade:6196
+#: glade/pytrainer.glade:1653 glade/pytrainer.glade:5038
+#: glade/pytrainer.glade:6194
msgid "Versus"
msgstr ""
-#: glade/pytrainer.glade:1680
+#: glade/pytrainer.glade:1678
msgid ""
"None\n"
"Profile\n"
@@ -226,135 +224,135 @@
"Heart Rate\n"
msgstr ""
-#: glade/pytrainer.glade:1845
+#: glade/pytrainer.glade:1843
msgid "<b>Beats:</b>"
msgstr ""
-#: glade/pytrainer.glade:1873 glade/pytrainer.glade:3334
-#: glade/pytrainer.glade:4378 glade/pytrainer.glade:5194
+#: glade/pytrainer.glade:1871 glade/pytrainer.glade:3332
+#: glade/pytrainer.glade:4376 glade/pytrainer.glade:5192
msgid "<b>Calories: </b>"
msgstr ""
-#: glade/pytrainer.glade:1901 glade/pytrainer.glade:3614
-#: glade/pytrainer.glade:4798 glade/pytrainer.glade:5926
+#: glade/pytrainer.glade:1899 glade/pytrainer.glade:3612
+#: glade/pytrainer.glade:4796 glade/pytrainer.glade:5924
msgid "<b>Max Beats:</b>"
msgstr ""
-#: glade/pytrainer.glade:1929
+#: glade/pytrainer.glade:1927
msgid "<b>HR Zones Method:</b>"
msgstr ""
-#: glade/pytrainer.glade:1958
+#: glade/pytrainer.glade:1956
msgid "<b>HR Zone5:</b>"
msgstr ""
-#: glade/pytrainer.glade:1986 glade/pytrainer.glade:2350
+#: glade/pytrainer.glade:1984 glade/pytrainer.glade:2348
msgid " bpm"
msgstr ""
-#: glade/pytrainer.glade:2014
+#: glade/pytrainer.glade:2012
msgid " Cal"
msgstr ""
-#: glade/pytrainer.glade:2126
+#: glade/pytrainer.glade:2124
msgid "<b>HR Zone4:</b>"
msgstr ""
-#: glade/pytrainer.glade:2154
+#: glade/pytrainer.glade:2152
msgid "<b>HR Zone3:</b>"
msgstr ""
-#: glade/pytrainer.glade:2182
+#: glade/pytrainer.glade:2180
msgid "<b>HR Zone2:</b>"
msgstr ""
-#: glade/pytrainer.glade:2210
+#: glade/pytrainer.glade:2208
msgid "<b>HR Zone1:</b>"
msgstr ""
-#: glade/pytrainer.glade:2238 glade/pytrainer.glade:2294
-#: glade/pytrainer.glade:2322 glade/pytrainer.glade:3670
-#: glade/pytrainer.glade:4491 glade/pytrainer.glade:4826
+#: glade/pytrainer.glade:2236 glade/pytrainer.glade:2292
+#: glade/pytrainer.glade:2320 glade/pytrainer.glade:3668
+#: glade/pytrainer.glade:4489 glade/pytrainer.glade:4824
msgid " "
msgstr ""
-#: glade/pytrainer.glade:2405 glade/pytrainer.glade:2432
-#: glade/pytrainer.glade:2460 glade/pytrainer.glade:2488
-#: glade/pytrainer.glade:2516 glade/pytrainer.glade:3474
-#: glade/pytrainer.glade:3642 glade/pytrainer.glade:4630
-#: glade/pytrainer.glade:4770 glade/pytrainer.glade:5334
-#: glade/pytrainer.glade:5755
+#: glade/pytrainer.glade:2403 glade/pytrainer.glade:2430
+#: glade/pytrainer.glade:2458 glade/pytrainer.glade:2486
+#: glade/pytrainer.glade:2514 glade/pytrainer.glade:3472
+#: glade/pytrainer.glade:3640 glade/pytrainer.glade:4628
+#: glade/pytrainer.glade:4768 glade/pytrainer.glade:5332
+#: glade/pytrainer.glade:5753
msgid "bpm"
msgstr ""
-#: glade/pytrainer.glade:2544
+#: glade/pytrainer.glade:2542
msgid " "
msgstr ""
-#: glade/pytrainer.glade:2582
+#: glade/pytrainer.glade:2580
msgid " <b>Heart Rate:</b>"
msgstr ""
-#: glade/pytrainer.glade:2759 glade/pytrainer.glade:7010
-#: glade/pytrainer.glade:10877
+#: glade/pytrainer.glade:2757 glade/pytrainer.glade:7008
+#: glade/pytrainer.glade:10875
msgid "label-2147483648"
msgstr ""
-#: glade/pytrainer.glade:2797
+#: glade/pytrainer.glade:2795
msgid "label-2147483647"
msgstr ""
-#: glade/pytrainer.glade:2853
+#: glade/pytrainer.glade:2851
msgid "Record"
msgstr ""
-#: glade/pytrainer.glade:3278 glade/pytrainer.glade:4463
-#: glade/pytrainer.glade:5784
+#: glade/pytrainer.glade:3276 glade/pytrainer.glade:4461
+#: glade/pytrainer.glade:5782
msgid "<b>Max Speed:</b>"
msgstr ""
-#: glade/pytrainer.glade:3390 glade/pytrainer.glade:4434
-#: glade/pytrainer.glade:5250
+#: glade/pytrainer.glade:3388 glade/pytrainer.glade:4432
+#: glade/pytrainer.glade:5248
msgid "Cal"
msgstr ""
-#: glade/pytrainer.glade:3418 glade/pytrainer.glade:4574
-#: glade/pytrainer.glade:5278
+#: glade/pytrainer.glade:3416 glade/pytrainer.glade:4572
+#: glade/pytrainer.glade:5276
msgid "<b>Beats avg:</b>"
msgstr ""
-#: glade/pytrainer.glade:3792
+#: glade/pytrainer.glade:3790
msgid " <b>Date:</b>"
msgstr ""
-#: glade/pytrainer.glade:3867
+#: glade/pytrainer.glade:3865
msgid "Value"
msgstr ""
-#: glade/pytrainer.glade:3892
+#: glade/pytrainer.glade:3890
msgid ""
"Stage Profile\n"
"Stage Velocity\n"
"Stage Profile/velocity"
msgstr ""
-#: glade/pytrainer.glade:3981
+#: glade/pytrainer.glade:3979
msgid "Day"
msgstr ""
-#: glade/pytrainer.glade:4158 glade/pytrainer.glade:5453
+#: glade/pytrainer.glade:4156 glade/pytrainer.glade:5451
msgid "000"
msgstr ""
-#: glade/pytrainer.glade:4547 glade/pytrainer.glade:7846
+#: glade/pytrainer.glade:4545 glade/pytrainer.glade:7844
msgid " "
msgstr ""
-#: glade/pytrainer.glade:4920
+#: glade/pytrainer.glade:4918
msgid " <b>Month:</b>"
msgstr ""
-#: glade/pytrainer.glade:5020 glade/pytrainer.glade:6176
+#: glade/pytrainer.glade:5018 glade/pytrainer.glade:6174
msgid ""
"Kilometers\n"
"Time\n"
@@ -363,7 +361,7 @@
"Calories"
msgstr ""
-#: glade/pytrainer.glade:5065 glade/pytrainer.glade:6221
+#: glade/pytrainer.glade:5063 glade/pytrainer.glade:6219
msgid ""
"None\n"
"Kilometers\n"
@@ -373,43 +371,43 @@
"Calories"
msgstr ""
-#: glade/pytrainer.glade:5135
+#: glade/pytrainer.glade:5133
msgid "Month"
msgstr ""
-#: glade/pytrainer.glade:6076
+#: glade/pytrainer.glade:6074
msgid " <b>Year:</b>"
msgstr ""
-#: glade/pytrainer.glade:6291
+#: glade/pytrainer.glade:6289
msgid "Year"
msgstr ""
-#: glade/pytrainer.glade:6334
+#: glade/pytrainer.glade:6332
msgid "label154"
msgstr ""
-#: glade/pytrainer.glade:6371
+#: glade/pytrainer.glade:6369
msgid "<b>Title:</b>"
msgstr ""
-#: glade/pytrainer.glade:6416
+#: glade/pytrainer.glade:6414
msgid "Search"
msgstr ""
-#: glade/pytrainer.glade:6463
+#: glade/pytrainer.glade:6461
msgid "Columns"
msgstr ""
-#: glade/pytrainer.glade:6538
+#: glade/pytrainer.glade:6536
msgid "label155"
msgstr ""
-#: glade/pytrainer.glade:6672
+#: glade/pytrainer.glade:6670
msgid "Type:"
msgstr ""
-#: glade/pytrainer.glade:6700
+#: glade/pytrainer.glade:6698
msgid ""
"Font\n"
"Restaurant\n"
@@ -417,776 +415,409 @@
"Summit"
msgstr ""
-#: glade/pytrainer.glade:6721
+#: glade/pytrainer.glade:6719
msgid "Latitude: "
msgstr ""
-#: glade/pytrainer.glade:6749
+#: glade/pytrainer.glade:6747
msgid " Name:"
msgstr ""
-#: glade/pytrainer.glade:6777
+#: glade/pytrainer.glade:6775
msgid "Longitude:"
msgstr ""
-#: glade/pytrainer.glade:6805 glade/pytrainer.glade:12486
-#: glade/pytrainer.glade:12809
+#: glade/pytrainer.glade:6803 glade/pytrainer.glade:12442
+#: glade/pytrainer.glade:12765
msgid "Description:"
msgstr ""
-#: glade/pytrainer.glade:6925
+#: glade/pytrainer.glade:6923
msgid "<b> Waypoint: </b>"
msgstr ""
-#: glade/pytrainer.glade:7058
+#: glade/pytrainer.glade:7056
msgid "label162"
msgstr ""
-#: glade/pytrainer.glade:7198
+#: glade/pytrainer.glade:7196
msgid "label163"
msgstr ""
-#: glade/pytrainer.glade:7223
+#: glade/pytrainer.glade:7221
msgid "New Entry"
msgstr ""
-#: glade/pytrainer.glade:7296
+#: glade/pytrainer.glade:7294
msgid "Title:"
msgstr ""
-#: glade/pytrainer.glade:7345
+#: glade/pytrainer.glade:7343
msgid "GPX File:"
msgstr ""
-#: glade/pytrainer.glade:7415
+#: glade/pytrainer.glade:7413
msgid "Calculate Values"
msgstr ""
-#: glade/pytrainer.glade:7434
+#: glade/pytrainer.glade:7432
msgid "Sport:"
msgstr ""
-#: glade/pytrainer.glade:7485
+#: glade/pytrainer.glade:7483
msgid "<b>Main</b>"
msgstr ""
-#: glade/pytrainer.glade:7546
+#: glade/pytrainer.glade:7544
msgid "Distance (Km):"
msgstr ""
-#: glade/pytrainer.glade:7575 glade/pytrainer.glade:7772
-#: glade/pytrainer.glade:8053 glade/pytrainer.glade:8299
-#: glade/pytrainer.glade:8767 glade/pytrainer.glade:11515
+#: glade/pytrainer.glade:7573 glade/pytrainer.glade:7770
+#: glade/pytrainer.glade:8051 glade/pytrainer.glade:8297
+#: glade/pytrainer.glade:8765 glade/pytrainer.glade:11513
msgid "Calculate"
msgstr ""
-#: glade/pytrainer.glade:7594
+#: glade/pytrainer.glade:7592
msgid "Time:"
msgstr ""
-#: glade/pytrainer.glade:7792
+#: glade/pytrainer.glade:7790
msgid "Date:"
msgstr ""
-#: glade/pytrainer.glade:7912 glade/pytrainer.glade:11565
+#: glade/pytrainer.glade:7910 glade/pytrainer.glade:11563
msgid "<b>General</b>"
msgstr ""
-#: glade/pytrainer.glade:7973
+#: glade/pytrainer.glade:7971
msgid "Max (km/h):"
msgstr ""
-#: glade/pytrainer.glade:8024
+#: glade/pytrainer.glade:8022
msgid "Velocity (km/h)"
msgstr ""
-#: glade/pytrainer.glade:8099
+#: glade/pytrainer.glade:8097
msgid "<b>Velocity</b>"
msgstr ""
-#: glade/pytrainer.glade:8135
+#: glade/pytrainer.glade:8133
msgid "Quick Entry"
msgstr ""
-#: glade/pytrainer.glade:8195
+#: glade/pytrainer.glade:8193
msgid "Max (min/km):"
msgstr ""
-#: glade/pytrainer.glade:8247
+#: glade/pytrainer.glade:8245
msgid "Pace (min/km):"
msgstr ""
-#: glade/pytrainer.glade:8322
+#: glade/pytrainer.glade:8320
msgid "<b>Pace</b>"
msgstr ""
-#: glade/pytrainer.glade:8383
+#: glade/pytrainer.glade:8381
msgid "Ascent:"
msgstr ""
-#: glade/pytrainer.glade:8435
+#: glade/pytrainer.glade:8433
msgid "Descent:"
msgstr ""
-#: glade/pytrainer.glade:8490
+#: glade/pytrainer.glade:8488
msgid "<b>Accumulated Altitude Change</b>"
msgstr ""
-#: glade/pytrainer.glade:8551
+#: glade/pytrainer.glade:8549
msgid "Max (bpm):"
msgstr ""
-#: glade/pytrainer.glade:8580
+#: glade/pytrainer.glade:8578
msgid "Heart rate:"
msgstr ""
-#: glade/pytrainer.glade:8654 pytrainer/gui/windowmain.py:475
-#: pytrainer/monthgraph.py:77
+#: glade/pytrainer.glade:8652
msgid "Calories"
msgstr ""
-#: glade/pytrainer.glade:8705
+#: glade/pytrainer.glade:8703
msgid ""
"<small><b>Note:</b> In order to calculate the calories you must set the "
"sport MET (in Preferences->Sport) </small>"
msgstr ""
-#: glade/pytrainer.glade:8822
+#: glade/pytrainer.glade:8820
msgid "<b>Heart Rate</b>"
msgstr ""
-#: glade/pytrainer.glade:8858
+#: glade/pytrainer.glade:8856
msgid "Advanced"
msgstr ""
-#: glade/pytrainer.glade:8955
+#: glade/pytrainer.glade:8953
msgid "<b>Comments</b>"
msgstr ""
-#: glade/pytrainer.glade:8984
+#: glade/pytrainer.glade:8982
msgid ...
[truncated message content] |
