evilny0/fpdb
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
4,342 Commits 1 Branch 0 Tags 14 MiB
147cc6c950
Commit Graph

3875 Commits

Author SHA1 Message Date
Chaz
388bec04dd Removed Partouche from <hhcs> in the config files 2010-10-11 22:37:59 -04:00
Eric Blade
25e03489fe fix error in logging mechanism, remove a debug print 2010-10-11 22:23:06 -04:00
Eric Blade
fed287334a further fixing in WinTables for dealing with a window that has disappeared 2010-10-11 18:40:58 -04:00
Eric Blade
bad3fac16e Merge branch 'master' of git://git.assembla.com/fpdb.git 2010-10-11 18:25:20 -04:00
Eric Blade
867a1526c5 Merge branch 'master' of git://git.assembla.com/fpdboz.git 2010-10-11 18:24:32 -04:00
Eric Blade
fb206dfde6 actually import _mysql_exceptions before trying to test against it 2010-10-11 18:23:22 -04:00
Eric Blade
dc215a5d01 reflow get_geometry some, pep8 2010-10-11 18:22:55 -04:00
steffen123
2e39cb5546 try to fix eric's FT Tourney prob 2010-10-12 00:20:37 +02:00
Worros
746e4b4871 Stars: Make play money hands parse again 2010-10-11 16:40:15 +08:00
Worros
295cc25259 Merge branch 'master' of git://git.assembla.com/fpdb 2010-10-11 15:07:40 +08:00
lastpoet
487330fc57 remove tooltips on headers 2010-10-11 15:06:05 +08:00
steffen123
43a5fb0f74 Merge branch 'carl' 2010-10-10 17:48:54 +02:00
steffen123
6b0b9cbf51 gettextify treeviewtooltips and add fpdb notice 2010-10-10 17:48:23 +02:00
steffen123
f642a1cf03 gettextify new tooltips 2010-10-10 17:42:06 +02:00
steffen123
b0dd8cb36f l10n: some missing gettexts in winamax 2010-10-10 17:29:52 +02:00
steffen123
dfd47cfbfb unify some strings and remove misleading comment 2010-10-09 14:02:39 +02:00
Worros
19a32943d8 Hand: Move assemble() function up into select() 2010-10-09 15:27:58 +08:00
Worros
284021f207 Regressio: Stars PL 5 Card Draw Sample 2010-10-09 13:07:11 +08:00
Worros
e80045d4d2 Regression: Add Stars NL 5 Card Draw 2010-10-09 12:59:26 +08:00
Worros
98153e1dc0 Merge branch 'master' of git://github.com/lastpoet/fpdb-lastpoet 2010-10-08 21:42:04 +08:00
lastpoet
ced499afd0 Treeviwe Tooltips class 2010-10-08 14:16:11 +01:00
lastpoet
9d827ee3fd Add tooltips explaining stats 2010-10-08 14:15:29 +01:00
Worros
c5f7034bf3 HUD_config.test: saveActions to True 2010-10-08 18:18:25 +08:00
Worros
9821899add THP: Remove PKR from the list. 
PKR converter is currently very broken, so switching it off in regression tester.

Current output from THP:

---------------------
Total Errors: 30
---------------------
PokerStars:
(  1) : regression-test-files/cash/Stars/Flop/LO8-6max-USD-0.05-0.10-20090315.Hand-cancelled.txt
(  8) : regression-test-files/cash/Stars/Flop/NLHE-6max-USD-0.05-0.10-200912.Allin-pre.txt
Full Tilt Poker:
(  1) : regression-test-files/cash/FTP/Flop/NLHE-USD-0.05-0.10-201006.Player.sitting.out.but.acting.txt
( 13) : regression-test-files/cash/FTP/Stud/7-Stud-USD-3-6-20106.Steal.from.Button.Failure.txt
Party Poker:
(  1) : regression-test-files/cash/PartyPoker/Flop/NLHE-USD-0.01-0.02-20100712.emailedHistory.txt
(  1) : regression-test-files/tour/PartyPoker/Flop/NLHE-USD-STT-unknownBuyIn-20100713.emailedHistory.txt
(  1) : regression-test-files/cash/PartyPoker/Stud/7-StudHL-USD-0.50-1.00-201008.txt
Betfair:
OnGame:
Absolute Poker:
(  1) : regression-test-files/cash/Absolute/Stud/7-StudHL-USD-0.02-0.04-200903.River.with.mucked.txt
Everleaf Poker:
Carbon:
(  1) : regression-test-files/cash/Carbon/Flop/NLHE-9max-USD-0.25-0.50.200810.All.Streets.txt
PKR:
iPoker:
Winamax:
(  2) : regression-test-files/cash/Winamax/Flop/PLO-FR-EUR-0.02-0.05-201009.Real.side.pot.with.bad.collected.txt

---------------------
Errors by stat:
---------------------
(  1) : foldSbToStealChance
(  1) : raisedFirstIn
(  1) : street0VPI
(  1) : street0_3BChance
(  1) : street0_4BChance
(  1) : street0_4BDone
(  1) : street1CBChance
(  1) : street1CBDone
(  1) : wonWhenSeenStreet3
(  2) : rake
(  2) : street1Seen
(  2) : street2Seen
(  2) : street3Seen
(  6) : Parse
(  7) : raiseFirstInChance
 2010-10-08 16:18:23 +08:00
Worros
6b56ab056c Regression: wonWhenSeenStreet2/3 fix 
cash/Carbon/Flop/NLHE-9max-USD-0.25-0.50.200810.All.Streets.txt

Hand is actually all-in on the Turn.

1 fix for wonWhenSeenStreet2
1 error for wonWhenSeenStreet3 (known issue with all-in hands)
 2010-10-08 16:12:13 +08:00
Worros
372cebf84a Regressioa: wonWhenStreet2/3 fix 
FTP/Flop/PLO-6max-USD-0.01-0.02.201003.River.Showdown.txt

Timoha777 won on the river. Verified.
 2010-10-08 15:49:42 +08:00
Worros
0d88d0bd37 Regression: wonWhenSeenStreet2 fix 
Stars/Flop/PLO8-9max-USD-0.01-0.02-20100829.No.VPIP.from.posted.bb.txt

verified toxic7 won the hand on the Turn
 2010-10-08 15:43:32 +08:00
Worros
5e4e5a5342 Regression: wonWhenSeenStreet2/3/4 fix 
Stars/Stud/7-StudHL-USD-0.04-0.08-200911.Cardtest.txt

    s0rrow verifed.
    Wins hand and sees all 4 stud streets (won the low)
 2010-10-08 15:29:14 +08:00
Worros
943009c9f6 Regression: wonWhenSeenStreet2/3/4 fix 
Stars/Stud/7-StudHL-USD-0.04-0.08-200911.Cardtest.txt

gashpor verifed.
Wins hand and sees all 4 stud streets
 2010-10-08 15:24:43 +08:00
Worros
b49bf69823 Regression: wonWhenSeenStreet2/3 fix. 
Winamax/Flop/PLO-FR-EUR-0.02-0.05-201009.Real.side.pot.with.bad.collected.txt
Player3 verified - wins hand and sees all streets
 2010-10-08 15:16:47 +08:00
Worros
17e23c99d0 DerivedStats: Adjust wonWhenSeenStretX 
Code looks trivial and correct.

Causes 13 regressions that need to be reviewed.

Total Errors: 48
(  7) : wonWhenSeenStreet2
(  4) : wonWhenSeenStreet3
(  2) : wonWhenSeenStreet4
 2010-10-08 15:12:22 +08:00
Worros
018b806cf3 Winamax: Bring 90% in line with Forrest. 
Still fails 2 regression tests for rake, but that is the fault of DerivedStats - not Winamax
 2010-10-08 14:56:32 +08:00
Worros
717c1e61bc Winamax: Make my version much closer to Forrests 2010-10-08 12:26:24 +08:00
Worros
d8e3c1418e Merge branch 'master' of git://git.assembla.com/fpdb-eric 2010-10-07 22:12:08 +08:00
Eric Blade
120ebf4b40 readSupportedGames should return [ring/tour, base-type, limit-structure], not [ring/tour, category, limit-structure] 
add PL holdem/omaha tourney support for everleaf
 2010-10-07 08:34:36 -04:00
Eric Blade
7615f2429b Add Everleaf FLHE Tournament support 2010-10-07 08:13:21 -04:00
Eric Blade
4613f64f8b Merge branch 'master' of git://git.assembla.com/fpdboz.git 2010-10-07 07:41:19 -04:00
Worros
b9420f7066 THP: Add Winamax 2010-10-07 15:12:06 +08:00
Worros
b924c81ea0 Regression: Test data for Winamax PLO file. 
Manually edited the file to correct rake and winnings
 2010-10-07 14:34:53 +08:00
Worros
1e3e7e4bb4 Regression: Winamax with a real and problematic side pot 
*** FLOP *** [Kc Jd 7h]
Player7 checks
Player10 bets 1.40€
Player22 folds
Player25 calls 1.18€ and is all-in
Player5 folds
Player7 calls 0.72€ and is all-in
*** TURN *** [Kc Jd 7h][9c]
*** RIVER *** [Kc Jd 7h 9c][Js]
*** SHOW DOWN ***
Player7 shows [Ad Jc Jh 6c] (Quads of Jack)
Player25 shows [9s Kh 3d Ks] (Full of King and Jack)
Player10 shows [7c 7d 6h 8s] (Full of 7 and Jack)
Player10 collected 0.22€ from side pot 2
Player25 collected 0.88€ from side pot 1
Player7 collected 3.38€ from main pot

Player10 actually lost the hand, but is marked as winning 0.22

Player25 and Player7 both won money
 2010-10-07 14:21:37 +08:00
Worros
53afa4f98e Regression: .hp file for Winamax NLHE 
Manually edited so that the rake for Player3 is correct, and Player8 doesn't actually 'win'
 2010-10-07 13:43:00 +08:00
Worros
2a68fbf46e Winamax: NLHE regression test file 2010-10-07 13:37:06 +08:00
Worros
733b4f5594 AutoImport: Start refactor so it can run from the comand line 2010-10-07 13:02:36 +08:00
Worros
791ebba895 Database: Remove trainiling whitespace 
Non functional patch. Brining the tree closer to Forrests
 2010-10-07 11:45:31 +08:00
lastpoet
8b25c67ba9 basic optimisation in stats 2010-10-06 15:57:33 +01:00
lastpoet
a57483cfec remove stud from games list 2010-10-06 09:22:51 +01:00
Worros
1a80509bdf Config: Fix breakage from previous patch 
PF3 was accidentally changed to PF9
 2010-10-06 10:59:06 +08:00
Worros
3ecd014e0d Grapher, Configuration: Fix whitespace breakage. 2010-10-06 10:53:07 +08:00
Worros
2e2317d73f Merge branch 'master' of git://github.com/lastpoet/fpdb-lastpoet 2010-10-06 10:47:23 +08:00
Forrest
9645189ca8 add a longer regression file 2010-10-06 09:46:54 +08:00
Eric Blade
8f62b53891 Merge branch 'master' of git://repo.or.cz/fpbd-bostik.git 2010-10-05 20:24:05 -04:00
Eric Blade
c894e5e478 Merge branch 'master' of git://git.assembla.com/fpdboz.git 2010-10-05 20:23:12 -04:00
lastpoet
f25bd33dcd merging refs/remotes/carl/master into HEAD 2010-10-05 18:38:58 +01:00
lastpoet
0469b80e44 Add name(s) and site(s) to the graph 2010-10-05 18:04:06 +01:00
lastpoet
e303123dfe explain defaults 2010-10-05 15:42:05 +01:00
Worros
a34b0fab18 Winamax: Fix markStreets regex 2010-10-05 17:17:39 +08:00
Worros
65d986d570 Winamax: Remove stud from supported list, remove debug 2010-10-05 16:44:34 +08:00
Worros
a4fedd22d8 Test config: add Winamax 2010-10-05 11:33:16 +08:00
lastpoet
88756b517b Add nice icon 2010-10-04 21:35:34 +01:00
lastpoet
21b6108345 Fix matplotlib warning 
Harmonise matplotlib backend
 2010-10-04 20:39:34 +01:00
steffen123
9ce2e8939b another change to guiautoimport 2010-10-04 16:23:21 +02:00
steffen123
e5a22b5188 remove parameter passed to a method that doesnt expect or need it (fix autoimport) 2010-10-04 16:11:17 +02:00
lastpoet
d69a2c4df4 fix main window and taskbar icon 2010-10-04 12:04:52 +01:00
lastpoet
0ef58bf367 Merge branch 'master' of git://git.assembla.com/fpdboz 2010-10-04 11:12:11 +01:00
Eric Blade
e9de1a53cd Merge branch 'master' of git://git.assembla.com/fpdb.git 2010-10-04 02:47:24 -04:00
Eric Blade
fa529e6e9e Merge branch 'master' of git://git.assembla.com/fpdboz.git 2010-10-04 02:46:48 -04:00
Worros
a125e77135 Grapher/Filters: Fix graph labels and whitespace 
Remove some trailing whitespace from Antistffs patch.

Change format of Graph labels from:

Blah: $0.00 or Blah 0.00BB to
Blah($|BB): 0.00
 2010-10-04 11:56:52 +08:00
danny
126eb0c0bc Added graphing improvements. 2010-10-04 08:54:20 +08:00
steffen123
c803619baa update l10n files 2010-10-03 10:00:16 +02:00
Erki Ferenc
03fcbce243 l10n: updated Hungarian translation 2010-10-03 01:26:52 +02:00
steffen123
aa2c8d3151 change default for saveActions to True as i consider the performance hit acceptable 2010-10-02 14:22:28 +02:00
steffen123
111a99f06b add french .mo file 2010-10-02 13:56:09 +02:00
steffen123
c961b49acb raise DB version for HA changes 2010-10-02 13:55:18 +02:00
steffen123
c818ee1479 update l10n files 2010-10-02 13:55:08 +02:00
steffen123
4bd5f3c23e Merge branch 'carl' 2010-10-02 13:40:13 +02:00
steffen123
9208f8ec28 activate french translation, update all l10n files 2010-10-02 13:33:25 +02:00
steffen123
1b272af2f7 add french translation from frederic prost 2010-10-02 13:13:20 +02:00
Eric Blade
fa3a9c54b8 Merge branch 'master' of git://git.assembla.com/fpdboz.git 2010-10-01 22:20:32 -04:00
Worros
f4baaa42a7 HHC: Modify allHandsAsList() to remove trailing entry 
Some HH formats leave dangling text after the split
ie. </game> (split) </session>EOL

Remove this dangler if less than 50 characters and warn in the log
 2010-10-01 11:31:52 +08:00
Worros
56b268920d Betfair: Fix parse error from THP 2010-10-01 10:51:38 +08:00
Worros
9f64602338 Database, Importer: Convert print to log.info 2010-10-01 10:44:27 +08:00
Worros
1e0a1a6ad8 OnGame: Initial Draw support 
No longer crashes on a Five Card draw hand
 2010-09-30 18:01:47 +08:00
Worros
bbbf1ec4e6 OnGame: Initial stud support. 
Added anough that it recognises the header and splits the streets correctly.
 2010-09-30 17:53:52 +08:00
Worros
43edb615b0 SQL: Fix MySQL/Postgres Actions and HandsActions 2010-09-30 17:19:35 +08:00
Eric Blade
4de792a1eb Merge branch 'master' of git://git.assembla.com/fpdboz.git 
Conflicts:
	pyfpdb/HUD_main.pyw
 2010-09-30 01:46:48 -04:00
Worros
30e7c53f5c Winamax siteId change 2010-09-30 00:40:02 +08:00
Worros
9d712ba812 DerivedStats: Fix position calculation for holdem. 
THP: Noted 65 additional issues with the position stat

Really need to merge the position calculation
 2010-09-29 15:55:25 +08:00
Worros
dbbccc4ac6 Merge branch 'chaz' of git://github.com/ChazDazzle/fpdb-chaz 2010-09-29 13:02:30 +08:00
Chaz
9c225a5b72 * Updated storeHandsPlayers() to insert via executemany() if 'saveActions' is False and via looped execute() to call get_last_insert_id() if 'saveActions' is True 2010-09-28 23:34:20 -04:00
Worros
a964b17de6 Merge branch 'chaz' of git://github.com/ChazDazzle/fpdb-chaz 2010-09-29 10:11:16 +08:00
Chaz
76b2dec2b6 * updated _addRaise() so that it does in fact accept the action variable 2010-09-28 17:33:15 -04:00
Chaz
ae6a035834 * fixed a small issue in assembleHandsActions() 2010-09-28 17:23:44 -04:00
Chaz
0e9fb62b0d * added a call to the import_parameter 'saveActions' in Hand.py, saving it's value in the variable Hand.saveActions 
* added logic to Hand.import() so that it only calls db.storeHandsActions if saveActions is true
* added logic to DetailedStats.getstats() so that it only calls assembleHandsActions() if saveActions is true
 2010-09-28 17:17:15 -04:00
Chaz
030a15f041 * Filled assembleHandsActions() 2010-09-28 17:11:09 -04:00
Chaz
a76e34598d * Modified storeHandsPlayers() so it returns a dictionary of handId & playerId to handPlayerIds 
* Filled storeHandsActions() with the required information
* Updated Hand.insert so that it calls storeHandsActions() and added the variable dbid_hpid to receive the new dictionary
 2010-09-28 17:09:24 -04:00
Chaz
1b0db117ce * updated 'createHandsActionsTable' and 'store_hands_actions' in the SQL dictionary 2010-09-28 17:01:31 -04:00
Chaz
c1b2a0040c * Added HandsActions & Actions indexes & foreign keys to Database.py 
* Added 'createActionsTable' to the SQL dictionary
* Updated create_tables so 'createActionsTable' would be called
* Updated dumpdatabase(), adding in u'Actions'
* Added action name & code info for filling the Actions table in FillDefaultData()
 2010-09-28 16:59:37 -04:00
Chaz
94d4bf6ed5 * added ACTION dictionary for looking up actionId 
* edited addAnte(), addBlind(), addCall(), addBet(), addBlind() (Draw), addDiscard() (Draw), 
addComplete() (Stud), and addBringIn() (Stud) to standardize element order and datatype
*  added a field to  _addRaise() which allows  addComplete() (Stud) to pass the 'compleates' action type
 2010-09-28 16:50:33 -04:00
Worros
b14344aea6 Merge branch 'master' of git://ferki.hopto.org/fpdb 2010-09-28 22:47:34 +08:00
Worros
4f3f7570ab Party: Couple of mods to start support for Stud H/L 2010-09-28 22:47:04 +08:00
Erki Ferenc
bb0bb3c2dd l10n: fixed a typo 2010-09-28 15:56:02 +02:00
Erki Ferenc
d2f5633384 PartyPoker: improved handling of players with zero or unknown stacks 2010-09-28 15:46:51 +02:00
Worros
9e13930742 Hand: Whitespace changes from Forrest 2010-09-28 12:04:40 +08:00
Worros
f62201c8e9 HUD_main: L10n update 2010-09-28 11:59:10 +08:00
Worros
d299a19abc Merge branch 'master' of git://git.assembla.com/fpdb 
Conflicts:
	pyfpdb/Hud.py
 2010-09-28 11:43:42 +08:00
Worros
2d90fbf3b6 Winamax: L10n change 2010-09-28 11:41:27 +08:00
Worros
42067c0873 TableWindow: Remove whitespace breakage 2010-09-28 11:41:03 +08:00
Eric Blade
61d2c48da2 Merge branch 'master' of git://git.assembla.com/fpdb.git 
Conflicts:
	pyfpdb/HUD_main.pyw
 2010-09-27 16:15:54 -04:00
steffen123
2ecee26d99 Merge branch 'eric' 
trivial conflict
 2010-09-27 22:14:37 +02:00
Eric Blade
c325daf7f6 check_table_no deals with "None" passed to it 2010-09-27 07:34:25 -04:00
Eric Blade
df1cd4a15d fix syntactical issue in get_table_no 2010-09-27 07:29:34 -04:00
Eric Blade
ca967992b5 fix a comment 2010-09-27 07:11:16 -04:00
Eric Blade
b0056be03c further fixes to get stdout working in windows again 2010-09-27 07:10:13 -04:00
Eric Blade
baf47d476e fix for call to check_table_no now needing an argument 2010-09-27 05:56:52 -04:00
Eric Blade
bfec231b5d slight formatting changes to agree with PEP8 moar closely 2010-09-27 05:08:34 -04:00
Eric Blade
4b3fe3dfa2 fix conflicts between ray's new window move code and my old window move code 
Ray: when you finish implementing yours, please adapt and/or disable Hud::update_table_position
 2010-09-27 04:04:56 -04:00
steffen123
a29de2b533 Merge branch 'eric' 
trivial conflict
 2010-09-27 09:23:53 +02:00
steffen123
3509beb828 some missing _() 2010-09-27 09:22:07 +02:00
Eric Blade
a98e71ad24 semi-fix stdout for hud_main in windows when running from source 2010-09-27 03:14:10 -04:00
Gerko de Roo
ad2983a968 Detection system for table change during tourney's 
The routine stores the actual seat.
When being reseated during tourney's the seat change is detected.
The HUD window adjust is recalculated.
 2010-09-26 17:31:05 +02:00
Gerko de Roo
b9c63bd718 Merge branch 'master' of git://git.assembla.com/fpdb.git 2010-09-26 17:19:17 +02:00
Gerko de Roo
ec8f8aff76 Merge 2010-09-26 17:19:05 +02:00
Eric Blade
e3113ae3a0 Merge branch 'master' of git://git.assembla.com/fpdb.git 2010-09-26 02:21:04 -04:00
Worros
1ae01f1502 Database: Mark 27 Single draw as a lowball game 2010-09-24 13:47:24 +08:00
Worros
121e12023f Ring Player Stats: Support Razz start card list 2010-09-24 13:46:21 +08:00
Worros
6cfd884413 RSHG: Fix a coupl eof bugs 2010-09-24 13:30:16 +08:00
Worros
f470ae863d New: RazzStartHandGenerator 2010-09-24 13:11:44 +08:00
steffen123
1adf15e8af l10n: update pot/mo file 2010-09-23 21:59:11 +02:00
Worros
ca4da923d4 Regression: Winamax PLO file 2010-09-24 00:56:25 +08:00
Worros
b6182b419c Winamax plugin: Contributed by Forrest 2010-09-24 00:31:17 +08:00
Worros
b8e66ee954 Winamax setup 2010-09-23 23:02:00 +08:00
Erki Ferenc
89e402f3b0 l10n: updated Hungarian translation 2010-09-23 11:38:01 +02:00
Worros
8a2b051916 Card: make decodeRazzStartCard return a string 2010-09-23 17:30:59 +08:00
Worros
47ca83db84 Card: Lookup table for Razz start hand combos 
Take Razz hand list table provided by gammoner of 2+2 and start the lookup table.

'(32)A':1 ... (KK)K:1193

'(00)A':-13 ... '(00)K':-1  Where 0 is unknown.
 2010-09-23 16:42:54 +08:00
Worros
235a8baa5f L10n: Remaining files 2010-09-23 14:31:16 +08:00
Worros
dee17e8001 L10n: H->M updated 2010-09-23 14:10:30 +08:00
Worros
016172f78d L10n update: Gui* 2010-09-23 13:11:06 +08:00
Worros
eefad4a486 Card: Add complete Razz start card list. 
Figure out how to use it later.

Maybe use tuple as a key to a dict?

card = { ('A', '2', '3') : 1 } ? - Might work
 2010-09-23 11:36:13 +08:00
Worros
353a7d96eb Config: Fix import ordering 
L10n change caused:
  File "/home/carlos/Projects/fpdb/fpdboz/pyfpdb/Charset.py", line 25, in <module>
    import Configuration
  File "/home/carlos/Projects/fpdb/fpdboz/pyfpdb/Configuration.py", line 30
    from __future__ import with_statement
SyntaxError: from __future__ imports must occur at the beginning of the file

Who knew?
 2010-09-23 11:27:06 +08:00
Eratosthenes
8b68bb2137 Merge branch 'master' of git://git.assembla.com/fpdb 2010-09-22 21:57:47 -04:00
Eratosthenes
1dedbe2a45 Merge branch 'master' of git://git.assembla.com/fpdboz 2010-09-22 21:57:22 -04:00
steffen123
1e4c835d96 l10n: update pot/po/mo 2010-09-22 20:12:26 +02:00
Worros
591543d468 L10n updates: C->F 2010-09-23 00:10:32 +08:00
Worros
1b15e665e0 L10n update - Absolute->Config 2010-09-22 23:51:56 +08:00
Worros
83900736f0 fpdb.py: Use L10n 2010-09-22 23:46:03 +08:00
Worros
692cd4e6e4 L10n.py: Make safer 2010-09-22 23:41:09 +08:00
Worros
02aa42a987 Merge branch 'master' of git://git.assembla.com/fpdb 
Conflicts:
	pyfpdb/GuiBulkImport.py
 2010-09-22 23:41:05 +08:00
steffen123
be39031f4f l10n: rename some things 2010-09-22 17:32:27 +02:00
steffen123
51f54f5444 refactor translation method into new file 2010-09-22 17:26:25 +02:00
Worros
0ce0c13dd0 Bug fixes: Make fpdb run after my previous patches damage 2010-09-22 23:18:36 +08:00