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

Conflicts:
	pyfpdb/XTables.py

pyfpdb/Filters.py

@@ -77,7 +77,7 @@ class Filters(threading.Thread):
         self.mainVBox = gtk.VBox(False, 0)
         self.sw.add_with_viewport(self.mainVBox)
         self.sw.show()
-        print "DEBUG: New packing box created!"
+        print _("DEBUG: New packing box created!")
 
         self.found = {'nl':False, 'fl':False, 'pl':False, 'ring':False, 'tour':False}
         self.label = {}

pyfpdb/RushNotesAux.py

@@ -241,8 +241,8 @@ class RushNotes(Aux_Window):
 
             c = db_connection.get_cursor()
             c.execute(("SELECT handId, position, startCards, street0Aggr, tableName " +
-                        "FROM hands, handsPlayers " +
+                        "FROM Hands, HandsPlayers " +
-                        "WHERE handsplayers.handId = hands.id " +
+                        "WHERE HandsPlayers.handId = Hands.id " +
                         "AND street0VPI = 1 " +
                         "AND startCards > 0 " +
                         "AND playerId = %d " +

pyfpdb/XTables.py

@@ -67,11 +67,11 @@ class Table(Table_Window):
                 self.number = int( mo.groupdict()["XID"], 0 )
                 self.title = title
                 if self.number is None:
-                    log.warning("Could not retrieve XID from table xwininfo. xwininfo is %s" % listing)
+                    log.warning(_("Could not retrieve XID from table xwininfo. xwininfo is %s") % listing)
                 break
 
         if self.number is None:
-            log.warning("No match in XTables for table '%s'." % self.search_string)
+            log.warning(_("No match in XTables for table '%s'.") % self.search_string)
             return None
         (self.window, self.parent) = self.get_window_from_xid(self.number)
 
@@ -165,4 +165,3 @@ def treewalk(parent):
         for ww in treewalk(w):
             yield ww
         yield w
-

pyfpdb/locale/fpdb-es_ES.po

@@ -1,14 +1,14 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: fpdb\n"
-"POT-Creation-Date: 2011-02-18 01:11+CET\n"
+"POT-Creation-Date: 2011-02-23 16:58+CET\n"
 "PO-Revision-Date: \n"
 "Last-Translator: Javier Sánchez <donoban@gmail.com>\n"
 "Language-Team: \n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: \n"
 "X-Poedit-Language: Spanish\n"
 "X-Poedit-Country: SPAIN\n"
 
@@ -624,7 +624,11 @@ msgstr "Anillo"
 msgid "Tourney"
 msgstr "Torneo"
 
-#: Filters.py:106 TourneyFilters.py:107
+#: Filters.py:80
+msgid "DEBUG: New packing box created!"
+msgstr ""
+
+#: Filters.py:106 TourneyFilters.py:114
 msgid "Either 0 or more than one site matched (%s) - EEK"
 msgstr ""
 
@@ -680,6 +684,23 @@ msgstr ""
 msgid "No games returned from database"
 msgstr ""
 
+#: Filters.py:827
+msgid "Graphing Options:"
+msgstr ""
+
+#: Filters.py:839
+msgid "Show Graph In:"
+msgstr ""
+
+#: Filters.py:859
+msgid "Showdown Winnings"
+msgstr ""
+
+#: Filters.py:867
+#, fuzzy
+msgid "Non-Showdown Winnings"
+msgstr "Non-showdown: $%.2f"
+
 #: Filters.py:984
 msgid "From:"
 msgstr ""
@@ -2771,7 +2792,7 @@ msgstr ""
 msgid "Tourney Type"
 msgstr ""
 
-#: TourneyFilters.py:79
+#: TourneyFilters.py:86
 msgid "setting numTourneys:"
 msgstr ""
 
@@ -2961,6 +2982,14 @@ msgstr ""
 msgid "Failed to add streets. handtext=%s"
 msgstr ""
 
+#: XTables.py:70
+msgid "Could not retrieve XID from table xwininfo. xwininfo is %s"
+msgstr ""
+
+#: XTables.py:74
+msgid "No match in XTables for table '%s'."
+msgstr ""
+
 #: fpdb.pyw:38
 msgid " - press return to continue\n"
 msgstr ""