Correcciones en Traducción

2 files changed, 24 insertions, 17 deletions

diff --git a/GnomeMoonActivity.py b/GnomeMoonActivity.py
index d55bb75..5103ce6 100644
--- a/GnomeMoonActivity.py
+++ b/GnomeMoonActivity.py
@@ -186,18 +186,26 @@ class MoonActivity(gtk.Window):
 		self.luna_hoy.data_model.update_moon_calculations(ahora)
 
 		information = ""
-		information += _("Today's Moon Information\n\n")
+		information += "%s:\n\n" % (_("Today's Moon Information"))
 		information += "%s\n\n" % (MG.get_date_time())
-		information += _("Phase:\n%s\n\n") % (self.luna_hoy.data_model.moon_phase_name(self.luna_hoy.data_model.phase_of_moon))
-		information += _("Julian Date:\n%.2f (astronomical)\n\n") % (self.luna_hoy.data_model.julian_date)
+		information += "%s:\n%s\n\n" % (_("Phase"), self.luna_hoy.data_model.moon_phase_name(self.luna_hoy.data_model.phase_of_moon))
+		information += "%s:\n%.2f (%s)\n\n" % (_("Julian Date"), self.luna_hoy.data_model.julian_date, _("astronomical"))
 
-		tiempo = {'days':self.luna_hoy.data_model.days_old,
-		'hours':self.luna_hoy.data_model.hours_old, 'minutes':self.luna_hoy.data_model.minutes_old}
-		information += _("Age:\n%(days).0f days, %(hours).0f hours, %(minutes).0f minutes\n\n") % tiempo
+		information += "%s:\n" % (_("Age"))
+		dias = self.luna_hoy.data_model.days_old
+		horas = self.luna_hoy.data_model.hours_old
+		minutos = self.luna_hoy.data_model.minutes_old
+		information += "%i %s, %i %s, %i %s.\n\n" % (dias, _("days"), horas, _("hours"), minutos, _("minutes"))
 
-		lunacion = {'phase':self.luna_hoy.data_model.phase_of_moon * 100, 'lunation':self.luna_hoy.data_model.lunation}
-		information += _("Lunation:\n%(phase).2f%% through lunation %(lunation)d\n\n") % lunacion
-		information += _("Surface Visibility:\n%.0f%% (estimated)\n\n") % (self.luna_hoy.data_model.percent_of_full_moon * 100)
+		phase = self.luna_hoy.data_model.phase_of_moon * 100
+		lunation = self.luna_hoy.data_model.lunation
+		information += "%s:\n" % (_("Lunation"))
+		information += "%.2f%s %s %d.\n\n" % (phase, "%", _("through lunation"), lunation)
+
+		information += "%s:\n" % (_("Surface Visibility"))
+		information += "%.0f%s (%s)\n\n" % (self.luna_hoy.data_model.percent_of_full_moon * 100, "%", _("estimated"))
+
+		#information += _("Surface Visibility:\n%.0f%% (estimated)\n\n") % (self.luna_hoy.data_model.percent_of_full_moon * 100)
 
 		selen = {'deg':self.luna_hoy.data_model.selenographic_deg, 'westOrEast':self.luna_hoy.data_model.west_or_east,
 		'riseOrSet':self.luna_hoy.data_model.rise_or_set}
diff --git a/Moonwidgets.py b/Moonwidgets.py
index 181c405..e421bde 100644
--- a/Moonwidgets.py
+++ b/Moonwidgets.py
@@ -51,7 +51,7 @@ class CalendarButton(gtk.EventBox):
 	        self.image = gtk.Image()
 		self.fixed = gtk.Fixed()
 
-		self.hemisphere_view = 'Sur'
+		self.hemisphere_view = _('Sur')
 		self.show_grid = False
 
 		self.fixed.put(self.image, 0, 0)
@@ -112,10 +112,10 @@ class CalendarButton(gtk.EventBox):
 		    self.show_grid = True
 
 	def toggle_hemisphere_clicked(self, widget= None):
-		if self.hemisphere_view == 'Norte':
-		    self.hemisphere_view = 'Sur'
+		if self.hemisphere_view == _('Norte'):
+		    self.hemisphere_view = _('Sur')
 		else:
-		    self.hemisphere_view = 'Norte'
+		    self.hemisphere_view = _('Norte')
 
 	def repaint(self, tamanioboton):
 		if tamanioboton != self.imagen_size:
@@ -200,7 +200,7 @@ class CalendarButton(gtk.EventBox):
 		    self.image_pixmap.draw_rectangle(rgc, True, 0, 0, self.imagen_size, self.imagen_size)
 		    self.image_pixmap.draw_pixbuf(gc, dark_pixbuf, 0, 0, 0, 0)
 
-		if self.hemisphere_view == 'Sur':
+		if self.hemisphere_view == _('Sur'):
 		    #print "Rotate final image for a view from Norte or Sur hemisphere"
 		    rot_pixbuf = gtk.gdk.Pixbuf(gtk.gdk.COLORSPACE_RGB, False, 8, self.imagen_size, self.imagen_size)
 		    rot_pixbuf.get_from_drawable(self.image_pixmap, self.image_pixmap.get_colormap(), 0, 0, 0, 0, -1, -1)
@@ -388,7 +388,6 @@ class DataModel():
             return _("New Moon")
 
 class MoonCalendar(gtk.AspectFrame):
-	__gsignals__ = {"recalculando":(gobject.SIGNAL_RUN_FIRST, gobject.TYPE_NONE, (gobject.TYPE_BOOLEAN, ))}
 	def __init__(self):
 		gtk.AspectFrame.__init__(self)
 		self.modify_bg(gtk.STATE_NORMAL, MG.BACKGROUND)
@@ -446,7 +445,7 @@ class MoonCalendar(gtk.AspectFrame):
 		caja_control.pack_end(view_tool_bar, False, False, 0)
 
 		caja_dias = gtk.HBox()
-		for dia in ["Lun", "Mar", "Mie", "Jue", "Vie", "Sáb", "Dom"]:
+		for dia in [_("Lun"), _("Mar"), _("Mie"), _("Jue"), _("Vie"), _("Sáb"), _("Dom")]:
 			label = gtk.Label(dia)
 			label.modify_fg(gtk.STATE_NORMAL, MG.FOREGROUND)
 			caja_dias.pack_start(label, True, True, 0)
@@ -491,7 +490,7 @@ class MoonCalendar(gtk.AspectFrame):
 		t = time.strptime(self.hoy, MG.format)
 		mes= meses[t.tm_mon -1]
 		dia= dias[t.tm_wday]
-		self.label_mes.set_text("%s %s" % (mes, self.matriz.anio))
+		self.label_mes.set_text("%s %s" % (_(mes), self.matriz.anio))
 
 	def toggle_grid_clicked(self, widget= None, actualizar= False):
 		for linea in self.matriz.calendarbuttons: