From a1c12d0bcc924c9a222b63f865725a59a4f3ffb7 Mon Sep 17 00:00:00 2001
From: Gary Martin <gary@garycmartin.com>
Date: Fri, 26 Sep 2008 17:37:26 +0000
Subject: Added French locale by Bastien Guerry (thanks!)

Reduced frame padding to allow more space for longer French strings.
Fixed encoding issue affecting one string in the po file for both FR and ES.
---
diff --git a/activity/activity.info b/activity/activity.info
index f3c5c05..1b1669b 100644
--- a/activity/activity.info
+++ b/activity/activity.info
@@ -1,6 +1,6 @@
 [Activity]
 name = Moon
-activity_version = 6
+activity_version = 7
 host_version = 1
 bundle_id = com.garycmartin.Moon
 icon = moon-icon
diff --git a/locale/es/LC_MESSAGES/com.garycmartin.Moon.mo b/locale/es/LC_MESSAGES/com.garycmartin.Moon.mo
index 6048725..cb626e8 100644
--- a/locale/es/LC_MESSAGES/com.garycmartin.Moon.mo
+++ b/locale/es/LC_MESSAGES/com.garycmartin.Moon.mo
Binary files differ
diff --git a/locale/fr/LC_MESSAGES/com.garycmartin.Moon.mo b/locale/fr/LC_MESSAGES/com.garycmartin.Moon.mo
index cb65b32..bb33728 100644
--- a/locale/fr/LC_MESSAGES/com.garycmartin.Moon.mo
+++ b/locale/fr/LC_MESSAGES/com.garycmartin.Moon.mo
Binary files differ
diff --git a/moon.py b/moon.py
index a23479c..ee58344 100755
--- a/moon.py
+++ b/moon.py
@@ -120,7 +120,7 @@ class MoonActivity(activity.Activity):
         
         # Create Moon information panel
         self.infoPanel = gtk.VBox()
-        self.infoPanel.set_border_width(17)
+        self.infoPanel.set_border_width(10)
         self.info = gtk.Label()
         self.info.set_justify(gtk.JUSTIFY_LEFT)
         self.infoPanel.pack_start(self.info, False, False, 0)
@@ -221,7 +221,7 @@ class MoonActivity(activity.Activity):
         informationString += _("Age:\n%(days).0f days, %(hours).0f hours, %(minutes).0f minutes\n\n") % {'days':self.dataModel.daysOld, 'hours':self.dataModel.hoursOld, 'minutes':self.dataModel.minutesOld}
         informationString += _("Lunation:\n%(phase).2f%% through lunation %(lunation)d\n\n") % {'phase':self.dataModel.phaseOfMoon * 100, 'lunation':self.dataModel.lunation}
         informationString += _("Surface Visibility:\n%.0f%% (estimated)\n\n") % (self.dataModel.percentOfFullMoon * 100)
-        informationString += _("Selenographic Terminator Longitude:\n%(deg).1f˚%(westOrEast)s (%(riseOrSet)s)\n\n") % {'deg':self.dataModel.selenographicDeg, 'westOrEast':self.dataModel.westOrEast, 'riseOrSet':self.dataModel.riseOrSet}
+        informationString += _(u"Selenographic Terminator Longitude:\n%(deg).1f\u00b0%(westOrEast)s (%(riseOrSet)s)\n\n") % {'deg':self.dataModel.selenographicDeg, 'westOrEast':self.dataModel.westOrEast, 'riseOrSet':self.dataModel.riseOrSet}
         informationString += _("Next Full Moon:\n%(date)s in %(days).0f days\n\n") % {'date':time.ctime(self.dataModel.nextFullMoonDate), 'days':self.dataModel.daysUntilFullMoon}
         informationString += _("Next New Moon:\n%(date)s in %(days).0f days\n\n") % {'date':time.ctime(self.dataModel.nextNewMoonDate), 'days':self.dataModel.daysUntilNewMoon}
         informationString += _("Next Lunar eclipse:\n%(date)s in %(days).0f days\n\n") % {'date':time.ctime(self.dataModel.nextLunarEclipseDate), 'days':self.dataModel.daysUntilLunarEclipse}
diff --git a/po/es.po b/po/es.po
index 935bba1..88c9109 100644
--- a/po/es.po
+++ b/po/es.po
@@ -99,11 +99,11 @@ msgstr ""
 #, python-format
 msgid ""
 "Selenographic Terminator Longitude:\n"
-"%(deg).1f˚%(westOrEast)s (%(riseOrSet)s)\n"
+"%(deg).1f°%(westOrEast)s (%(riseOrSet)s)\n"
 "\n"
 msgstr ""
 "Longitud del Terminador Selenográfico:\n"
-"%(deg).1f˚%(westOrEast)s (%(riseOrSet)s)\n"
+"%(deg).1f°%(westOrEast)s (%(riseOrSet)s)\n"
 "\n"
 
 #: ../moon.py:197
diff --git a/po/fr.po b/po/fr.po
index 5594797..a1295df 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -47,7 +47,7 @@ msgid ""
 "%s\n"
 "\n"
 msgstr ""
-"Phase :\n"
+"Phase:\n"
 "%s\n"
 "\n"
 
@@ -99,11 +99,11 @@ msgstr ""
 #, python-format
 msgid ""
 "Selenographic Terminator Longitude:\n"
-"%(deg).1f˚%(westOrEast)s (%(riseOrSet)s)\n"
+"%(deg).1f°%(westOrEast)s (%(riseOrSet)s)\n"
 "\n"
 msgstr ""
 "Longitude du terminateur sélénographique:\n"
-"%(deg).1f˚%(westOrEast)s (%(riseOrSet)s)\n"
+"%(deg).1f°%(westOrEast)s (%(riseOrSet)s)\n"
 "\n"
 
 #: ../moon.py:197
diff --git a/po/moon.pot b/po/moon.pot
index 9c8da66..8d4fc99 100644
--- a/po/moon.pot
+++ b/po/moon.pot
@@ -86,7 +86,7 @@ msgstr ""
 #, python-format
 msgid ""
 "Selenographic Terminator Longitude:\n"
-"%(deg).1f˚%(westOrEast)s (%(riseOrSet)s)\n"
+"%(deg).1f°%(westOrEast)s (%(riseOrSet)s)\n"
 "\n"
 msgstr ""
 
--
cgit v0.9.1