Merge branch 'master' of git://git.assembla.com/fpdb.git

pyfpdb/GuiStove.py

@@ -55,9 +55,9 @@ class GuiStove():
 
         if DEBUG == False:
             warning_string = _("Stove is a GUI mockup of a EV calculation page, and completely non functional.\n")
-            warning_string = _("Unless you are interested in developing this feature, please ignore this page.\n")
-            warning_string = _("If you are interested in developing the code further see GuiStove.py and Stove.py\n")
-            warning_string = _("Thank you\n")
+            warning_string += _("Unless you are interested in developing this feature, please ignore this page.\n")
+            warning_string += _("If you are interested in developing the code further see GuiStove.py and Stove.py\n")
+            warning_string += _("Thank you")
             self.warning_box(warning_string)
 
 

pyfpdb/fpdb.pyw

@@ -123,7 +123,7 @@ import Configuration
 import Exceptions
 import Stats
 
-VERSION = "0.21-rc1 plus git"
+VERSION = "0.21_rc2 plus git"
 
 
 class fpdb:
@@ -817,13 +817,13 @@ class fpdb:
                                  ('hudConfigurator', None, _('_HUD Configurator'), _('<control>H'), 'HUD Configurator', self.diaHudConfigurator),
                                  ('graphs', None, _('_Graphs'), _('<control>G'), 'Graphs', self.tabGraphViewer),
                                  ('tourneygraphs', None, _('Tourney Graphs'), None, 'TourneyGraphs', self.tabTourneyGraphViewer),
-                                 ('stove', None, _('Stove'), None, 'Stove', self.tabStove),
+                                 ('stove', None, _('Stove (preview)'), None, 'Stove', self.tabStove),
                                  ('ringplayerstats', None, _('Ring _Player Stats (tabulated view, not on pgsql)'), _('<control>P'), 'Ring Player Stats (tabulated view, not on pgsql)', self.tab_ring_player_stats),
                                  ('tourneyplayerstats', None, _('_Tourney Stats (tabulated view, not on pgsql)'), _('<control>T'), 'Tourney Stats (tabulated view, not on pgsql)', self.tab_tourney_player_stats),
                                  ('tourneyviewer', None, _('Tourney _Viewer'), None, 'Tourney Viewer)', self.tab_tourney_viewer_stats),
                                  ('posnstats', None, _('P_ositional Stats (tabulated view, not on sqlite)'), _('<control>O'), 'Positional Stats (tabulated view, not on sqlite)', self.tab_positional_stats),
                                  ('sessionstats', None, _('Session Stats'), None, 'Session Stats', self.tab_session_stats),
-                                 ('replayer', None, _('Hand _Replayer'), None, 'Hand Replayer', self.tab_replayer),
+                                 ('replayer', None, _('Hand _Replayer (not working yet)'), None, 'Hand Replayer', self.tab_replayer),
                                  ('database', None, _('_Database')),
                                  ('maintaindbs', None, _('_Maintain Databases'), None, 'Maintain Databases', self.dia_maintain_dbs),
                                  ('createtabs', None, _('Create or Recreate _Tables'), None, 'Create or Recreate Tables ', self.dia_recreate_tables),

pyfpdb/locale/localise.sh

@@ -2,7 +2,7 @@ cd ..
 rm *.pyc
 
 echo "creating template po file"
-python /usr/share/doc/python-2.6*/examples/Tools/i18n/pygettext.py --output-dir=locale --default-domain=fpdb --output=fpdb-en_GB.pot *.py*
+python /usr/share/doc/python-2.*/examples/Tools/i18n/pygettext.py --output-dir=locale --default-domain=fpdb --output=fpdb-en_GB.pot *.py *.pyw
 
 echo "merging template with existing translations"
 msgmerge --update locale/fpdb-de_DE.po locale/fpdb-en_GB.pot
@@ -10,8 +10,8 @@ msgmerge --update locale/fpdb-fr_FR.po locale/fpdb-en_GB.pot
 msgmerge --update locale/fpdb-hu_HU.po locale/fpdb-en_GB.pot
 
 echo "compiling mo files"
-python /usr/share/doc/python-2.6*/examples/Tools/i18n/msgfmt.py --output-file=locale/de/LC_MESSAGES/fpdb.mo locale/fpdb-de_DE.po
-python /usr/share/doc/python-2.6*/examples/Tools/i18n/msgfmt.py --output-file=locale/fr/LC_MESSAGES/fpdb.mo locale/fpdb-fr_FR.po
-python /usr/share/doc/python-2.6*/examples/Tools/i18n/msgfmt.py --output-file=locale/hu/LC_MESSAGES/fpdb.mo locale/fpdb-hu_HU.po
+python /usr/share/doc/python-2.*/examples/Tools/i18n/msgfmt.py --output-file=locale/de/LC_MESSAGES/fpdb.mo locale/fpdb-de_DE.po
+python /usr/share/doc/python-2.*/examples/Tools/i18n/msgfmt.py --output-file=locale/fr/LC_MESSAGES/fpdb.mo locale/fpdb-fr_FR.po
+python /usr/share/doc/python-2.*/examples/Tools/i18n/msgfmt.py --output-file=locale/hu/LC_MESSAGES/fpdb.mo locale/fpdb-hu_HU.po
 
 pocount locale/*.po