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

pyfpdb/EverestToFpdb.py

@@ -230,7 +230,7 @@ class Everest(HandHistoryConverter):
             elif action.group('ATYPE') in ('FOLD', 'SIT_OUT'):
                 hand.addFold(street, player)
             else:
-                print "Unimplemented readAction: %s %s" % (action.group('PSEAT'),action.group('ATYPE'),)
+                print (_("Unimplemented readAction: %s %s" % (action.group('PSEAT'),action.group('ATYPE'),)))
                 logging.debug(_("Unimplemented readAction: %s %s"
                               % (action.group('PSEAT'),action.group('ATYPE'),)))
 

pyfpdb/Hand.py

@@ -1140,7 +1140,7 @@ class DrawHand(Hand):
             hhc.markStreets(self)
             # markStreets in Draw may match without dealing cards
             if self.streets['DEAL'] == None:
-                raise FpdbParseError(_("DrawHand.__init__: street 'DEAL' is empty. Hand cancelled? '%s'" % self.handid))
+                raise FpdbParseError(_("DrawHand.__init__: street 'DEAL' is empty. Hand cancelled? HandID: '%s'" % self.handid))
             hhc.readBlinds(self)
             hhc.readAntes(self)
             hhc.readButton(self)

pyfpdb/SQL.py

@@ -3550,6 +3550,7 @@ class Sql:
                       ,sum(street0_3BChance)
                       ,sum(street0_3BDone)
                       ,sum(street0_4BChance)
+                      ,sum(street0_4BDone)
                       ,sum(street0_C4BChance)
                       ,sum(street0_C4BDone)
                       ,sum(street0_FoldTo3BChance)

pyfpdb/ScriptAddStatToRegression.py

@@ -75,7 +75,7 @@ def main(argv=None):
 
     print "WARNING:"
     print "This script will modify many files in the regression test suite"
-    print "As is safety precaution, you need to edit the file manually to run it"
+    print "As a safety precaution, you need to edit the file manually to run it"
     #walk_testfiles('regression-test-files/', 'zzzzzzz', False)
 
 if __name__ == '__main__':

pyfpdb/fpdb.pyw

@@ -119,7 +119,7 @@ import GuiReplayer
 try:
     import GuiStove
 except:
-    print "GuiStove disabled"
+    print _("GuiStove not found. If you want to use it please install pypoker-eval.")
 import SQL
 import Database
 import Configuration
@@ -259,8 +259,7 @@ class fpdb:
                , ('PyGTK',            '.'.join([str(x) for x in gtk.pygtk_version]))
                , ('matplotlib',       matplotlib_version)
                , ('numpy',            numpy_version)
-               , ('sqlite3',          sqlite3_version)
-               , ('sqlite',           sqlite_version)
+               , ('sqlite',          sqlite_version)
                , ('fpdb version',     VERSION)
                , ('database used',    self.settings['db-server'])
                ]

pyfpdb/locale/localise.sh

@@ -6,11 +6,13 @@ python /usr/share/doc/python-2.*/examples/Tools/i18n/pygettext.py --output-dir=l
 
 echo "merging template with existing translations"
 msgmerge --update locale/fpdb-de_DE.po locale/fpdb-en_GB.pot
+msgmerge --update locale/fpdb-es_ES.po locale/fpdb-en_GB.pot
 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.*/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/es/LC_MESSAGES/fpdb.mo locale/fpdb-es_ES.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