[hamster-applet] fixes to translations and english. Patches by Philip Withnall

[Toms Baugis <tbaugis src gnome org>]

commit 6a3b49d017a754786f235cb384373267a0df5af3
Author: Philip Withnall <bugzilla tecnocode co uk>
Date:   Wed Aug 12 16:44:46 2009 +0300

    fixes to translations and english. Patches by Philip Withnall

 data/Hamster_Applet.server.in.in |    4 ++--
 data/hamster-applet.schemas.in   |    6 +++---
 data/preferences.ui              |    2 +-
 data/stats.ui                    |    2 +-
 hamster/about.py                 |    4 ++--
 hamster/applet.py                |   14 ++++++++------
 hamster/db.py                    |    8 +++++---
 hamster/stats.py                 |    6 +++---
 8 files changed, 25 insertions(+), 21 deletions(-)
---
diff --git a/data/Hamster_Applet.server.in.in b/data/Hamster_Applet.server.in.in
index ec33b53..a29c65e 100644
--- a/data/Hamster_Applet.server.in.in
+++ b/data/Hamster_Applet.server.in.in
@@ -5,7 +5,7 @@
             <item value="IDL:Bonobo/Unknown:1.0"/>
         </oaf_attribute>
         <oaf_attribute name="name" type="string" _value="Time Tracker"/>
-        <oaf_attribute name="description" type="string" _value="Project Hamster - track your time"/>
+        <oaf_attribute name="description" type="string" _value="Project Hamster â?? track your time"/>
     </oaf_server>
 
     <oaf_server iid="OAFIID:Hamster_Applet" type="factory" location="OAFIID:Hamster_Applet_Factory">
@@ -15,7 +15,7 @@
             <item value="IDL:Bonobo/Unknown:1.0"/>
         </oaf_attribute>
         <oaf_attribute name="name" type="string" _value="Time Tracker"/>
-        <oaf_attribute name="description" type="string" _value="Project Hamster - track your time"/>
+        <oaf_attribute name="description" type="string" _value="Project Hamster â?? track your time"/>
         <oaf_attribute name="panel:category" type="string" value="Accessories"/>
         <oaf_attribute name="panel:icon" type="string" value="hamster-applet"/>
     </oaf_server>
diff --git a/data/hamster-applet.schemas.in b/data/hamster-applet.schemas.in
index edf5d93..6398e60 100644
--- a/data/hamster-applet.schemas.in
+++ b/data/hamster-applet.schemas.in
@@ -20,7 +20,7 @@
             <locale name="C">
                 <short>Stop tracking on idle</short>
                 <long>
-                    Stop tracking current activity, when computer becomes idle
+                    Stop tracking current activity when computer becomes idle
                 </long>
             </locale>
         </schema>
@@ -58,9 +58,9 @@
             <type>bool</type>
             <default>false</default>
             <locale name="C">
-                <short>Remind also when no activity is set</short>
+                <short>Also remind when no activity is set</short>
                 <long>
-                    Remind every notify_interval minutes also if no activity
+                    Also remind every notify_interval minutes if no activity
                     has been started.
                 </long>
             </locale>
diff --git a/data/preferences.ui b/data/preferences.ui
index 459f3db..a05a115 100644
--- a/data/preferences.ui
+++ b/data/preferences.ui
@@ -467,7 +467,7 @@
                                     <property name="left_padding">4</property>
                                     <child>
                                       <object class="GtkCheckButton" id="notify_on_idle">
-                                        <property name="label" translatable="yes">remind also when no activity is set</property>
+                                        <property name="label" translatable="yes">Also remind when no activity is set</property>
                                         <property name="visible">True</property>
                                         <property name="can_focus">True</property>
                                         <property name="receives_default">False</property>
diff --git a/data/stats.ui b/data/stats.ui
index 0412ebe..935c1fc 100644
--- a/data/stats.ui
+++ b/data/stats.ui
@@ -673,7 +673,7 @@
   </object>
   <object class="GtkFileChooserDialog" id="save_report_dialog">
     <property name="border_width">5</property>
-    <property name="title" translatable="yes">Save report - Time Tracker</property>
+    <property name="title" translatable="yes">Save report â?? Time Tracker</property>
     <property name="modal">True</property>
     <property name="window_position">center</property>
     <property name="type_hint">normal</property>
diff --git a/hamster/about.py b/hamster/about.py
index 2be2d2c..76861b4 100644
--- a/hamster/about.py
+++ b/hamster/about.py
@@ -37,8 +37,8 @@ def show_about(parent):
         "program-name" : _("Time Tracker"),
         "name" : _("Time Tracker"), #this should be deprecated in gtk 2.10
         "version" : VERSION,
-        "comments" : _("Project Hamster - track your time"),
-        "copyright" : _(u"Copyright © 2007-2009 Toms Bauģis and others"),
+        "comments" : _("Project Hamster â?? track your time"),
+        "copyright" : _(u"Copyright © 2007â??2009 Toms BauÄ£is and others"),
         "website" : "http://live.gnome.org/ProjectHamster";,
         "website-label" : _("Project Hamster Website"),
         "title": _("About Time Tracker"),
diff --git a/hamster/applet.py b/hamster/applet.py
index 9938ea4..5c4d195 100755
--- a/hamster/applet.py
+++ b/hamster/applet.py
@@ -558,10 +558,12 @@ class HamsterApplet(object):
             total_strings = []
             for category in by_category:
                 # listing of today's categories and time spent in them
+                duration = "%.1f" % (by_category[category] / 60.0)
                 total_strings.append(_("%(category)s: %(duration)s") % \
                         ({'category': category,
-                          'duration': _("%.1fh") %
-                                               (by_category[category] / 60.0)}))
+                          #duration in main drop-down per category in hours
+                          'duration': _("%sh") % duration 
+                          }))
 
             total_string = ", ".join(total_strings)
             self._gui.get_object("fact_totals").set_text(total_string)
@@ -828,14 +830,14 @@ class HamsterApplet(object):
             self.destroy()
 
         message_dialog = gtk.MessageDialog(buttons = gtk.BUTTONS_OK)
-        message_dialog.set_property("title", _("What to type in the activity box?"))
+        message_dialog.set_property("title", _("What should be typed in the activity box?"))
         message_dialog.connect("response", on_response)
         
-        more_info = _("""There is simple syntax that enables you to add details to your activities:
+        more_info = _("""There is a simple syntax that enables you to add details to your activities:
         
-"@" symbol marks category. Example: "watering flowers home" will start tracking activity "watering flowers" in category "home".
+"@" symbol marks a category. Example: "watering flowers home" will start tracking the activity "watering flowers" in the category "home".
 
-Comma (",") marks beginning of description. Example: "watering flowers, begonias and forgetmenots" will start tracking activity "watering flowers" and add description "begonias and forgetmenots" to it.
+Commas (",") mark beginning of a description. Example: "watering flowers, begonias and forgetmenots" will start tracking the activity "watering flowers" and add the description "begonias and forgetmenots" to it.
 
 Both can be combined: "watering flowers home, begonias and forgetmenots" will work just fine!
 
diff --git a/hamster/db.py b/hamster/db.py
index 2e355c4..1ca4715 100644
--- a/hamster/db.py
+++ b/hamster/db.py
@@ -243,8 +243,10 @@ class Storage(storage.Storage):
         last = self.fetchone(query, (_("Unsorted"), dt.date.today()))
         if not last:
             #try yesterday if there is nothing today
-            last = self.fetchone(query, (_("Unsorted"),
-                                         dt.date.today() - dt.timedelta(days=1)))
+            last = self.fetchone(query,
+                                 (# unsorted category
+                                  _("Unsorted"),
+                                  dt.date.today() - dt.timedelta(days=1)))
 
         if last and last["end_time"]: #will consider as last only if it is going on
            last = None
@@ -729,7 +731,7 @@ class Storage(storage.Storage):
                                      _("Super secret project X"),
                                      _("World domination")]}
         
-        nonwork_category = {"name": _("Day to day"),
+        nonwork_category = {"name": _("Day-to-day"),
                             "entries": [_("Lunch"),
                                         _("Watering flowers"),
                                         _("Doing handstands")]}
diff --git a/hamster/stats.py b/hamster/stats.py
index e6edb28..12522ca 100644
--- a/hamster/stats.py
+++ b/hamster/stats.py
@@ -69,7 +69,7 @@ class ReportChooserDialog(gtk.Dialog):
         self.dialog.add_filter(filter)
 
         filter = gtk.FileFilter()
-        filter.set_name(_("Tab Separated Values (TSV)"))
+        filter.set_name(_("Tab-Separated Values (TSV)"))
         filter.add_mime_type("text/plain")
         filter.add_pattern("*.tsv")
         filter.add_pattern("*.txt")
@@ -524,7 +524,7 @@ class StatsViewer(object):
                 label.set_text(_("""There is no data to generate statistics yet.
 A week of usage would be nice!"""))
             else:
-                label.set_text(_("Still collecting data - check back after a week has passed!"))
+                label.set_text(_("Still collecting data â?? check back after a week has passed!"))
 
             label.show()
             return
@@ -702,7 +702,7 @@ A week of usage would be nice!"""))
                                   int(num_hours)) % datedict
 
         # total records (in selected scope)
-        summary += " " + ngettext("There are %s record.",
+        summary += " " + ngettext("There is %s record.",
                                   "There are %s records.",
                                   len(facts)) % ("<b>%d</b>" % len(facts))