anthonycicc/PySolFC
1
0
Fork 0
mirror of https://github.com/shlomif/PySolFC.git synced 2025-04-05 00:02:29 -04:00
Code Releases Activity

* added button 'play this game' to Tile/AllStatsDialog

Browse source 
* updated translation


git-svn-id: https://pysolfc.svn.sourceforge.net/svnroot/pysolfc/PySolFC/trunk@101 39dd0a4e-7c14-0410-91b3-c4f2d318f732
This commit is contained in:
skomoroh 2006-11-30 22:18:35 +00:00
parent a185020088
commit de45eee3d1
12 changed files with 408 additions and 405 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
po/games.pot
View file

@ -5,7 +5,7 @@
msgid "" msgid ""
msgstr "" msgstr ""
"Project-Id-Version: PySol 0.0.1\n" "Project-Id-Version: PySol 0.0.1\n"
"POT-Creation-Date: Wed Nov 15 13:22:51 2006\n" "POT-Creation-Date: Thu Nov 30 16:31:56 2006\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n" "Language-Team: LANGUAGE <LL@li.org>\n"

326
po/pysol.pot
View file

@ -14,7 +14,7 @@ msgid ""
msgstr "" msgstr ""
"#-#-#-#-# pysol-1.pot (PACKAGE VERSION) #-#-#-#-#\n" "#-#-#-#-# pysol-1.pot (PACKAGE VERSION) #-#-#-#-#\n"
"Project-Id-Version: PACKAGE VERSION\n" "Project-Id-Version: PACKAGE VERSION\n"
"POT-Creation-Date: Wed Nov 15 13:23:52 2006\n" "POT-Creation-Date: Thu Nov 30 16:32:59 2006\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n" "Language-Team: LANGUAGE <LL@li.org>\n"
@ -24,7 +24,7 @@ msgstr ""
"Generated-By: pygettext.py 1.5\n" "Generated-By: pygettext.py 1.5\n"
"#-#-#-#-# pysol-2.pot (PACKAGE VERSION) #-#-#-#-#\n" "#-#-#-#-# pysol-2.pot (PACKAGE VERSION) #-#-#-#-#\n"
"Project-Id-Version: PACKAGE VERSION\n" "Project-Id-Version: PACKAGE VERSION\n"
"POT-Creation-Date: 2006-11-15 13:23+0300\n" "POT-Creation-Date: 2006-11-30 16:33+0300\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n" "Language-Team: LANGUAGE <LL@li.org>\n"
@ -71,19 +71,18 @@ msgid "&Next number"
msgstr "" msgstr ""
#: pysollib/actions.py:315 pysollib/app.py:881 pysollib/app.py:1164 #: pysollib/actions.py:315 pysollib/app.py:881 pysollib/app.py:1164
#: pysollib/app.py:1176 pysollib/game.py:930 pysollib/game.py:1861 #: pysollib/app.py:1176 pysollib/game.py:933 pysollib/game.py:1865
#: pysollib/main.py:363 pysollib/main.py:371 pysollib/tile/colorsdialog.py:123 #: pysollib/tile/colorsdialog.py:123 pysollib/tile/edittextdialog.py:83
#: pysollib/tile/edittextdialog.py:83 pysollib/tile/fontsdialog.py:145 #: pysollib/tile/fontsdialog.py:145 pysollib/tile/fontsdialog.py:205
#: pysollib/tile/fontsdialog.py:205 pysollib/tile/gameinfodialog.py:155 #: pysollib/tile/gameinfodialog.py:155 pysollib/tile/menubar.py:1336
#: pysollib/tile/menubar.py:1337 pysollib/tile/playeroptionsdialog.py:113 #: pysollib/tile/playeroptionsdialog.py:111 pysollib/tile/selectcardset.py:397
#: pysollib/tile/selectcardset.py:396 pysollib/tile/selecttile.py:160 #: pysollib/tile/selecttile.py:161 pysollib/tile/soundoptionsdialog.py:171
#: pysollib/tile/soundoptionsdialog.py:171
#: pysollib/tile/soundoptionsdialog.py:209 pysollib/tile/timeoutsdialog.py:94 #: pysollib/tile/soundoptionsdialog.py:209 pysollib/tile/timeoutsdialog.py:94
#: pysollib/tile/tkhtml.py:501 pysollib/tile/tkstats.py:211 #: pysollib/tile/tkhtml.py:501 pysollib/tile/tkstats.py:211
#: pysollib/tile/tkstats.py:373 pysollib/tile/tkstats.py:426 #: pysollib/tile/tkstats.py:381 pysollib/tile/tkstats.py:450
#: pysollib/tile/tkstats.py:444 pysollib/tile/tkstats.py:487 #: pysollib/tile/tkstats.py:473 pysollib/tile/tkstats.py:516
#: pysollib/tile/tkstats.py:558 pysollib/tile/tkstats.py:642 #: pysollib/tile/tkstats.py:587 pysollib/tile/tkstats.py:671
#: pysollib/tile/tkwidget.py:146 pysollib/tile/tkwidget.py:305 #: pysollib/tile/tkwidget.py:146 pysollib/tile/tkwidget.py:319
#: pysollib/tk/colorsdialog.py:122 pysollib/tk/edittextdialog.py:82 #: pysollib/tk/colorsdialog.py:122 pysollib/tk/edittextdialog.py:82
#: pysollib/tk/fontsdialog.py:143 pysollib/tk/fontsdialog.py:205 #: pysollib/tk/fontsdialog.py:143 pysollib/tk/fontsdialog.py:205
#: pysollib/tk/gameinfodialog.py:155 pysollib/tk/playeroptionsdialog.py:85 #: pysollib/tk/gameinfodialog.py:155 pysollib/tk/playeroptionsdialog.py:85
@ -100,14 +99,14 @@ msgid "&OK"
msgstr "" msgstr ""
#: pysollib/actions.py:315 pysollib/app.py:882 pysollib/app.py:1176 #: pysollib/actions.py:315 pysollib/app.py:882 pysollib/app.py:1176
#: pysollib/game.py:930 pysollib/game.py:1311 pysollib/game.py:1326 #: pysollib/game.py:933 pysollib/game.py:1316 pysollib/game.py:1331
#: pysollib/game.py:1333 pysollib/game.py:1339 #: pysollib/game.py:1338 pysollib/game.py:1344
#: pysollib/tile/colorsdialog.py:123 pysollib/tile/edittextdialog.py:83 #: pysollib/tile/colorsdialog.py:123 pysollib/tile/edittextdialog.py:83
#: pysollib/tile/fontsdialog.py:145 pysollib/tile/fontsdialog.py:205 #: pysollib/tile/fontsdialog.py:145 pysollib/tile/fontsdialog.py:205
#: pysollib/tile/playeroptionsdialog.py:113 pysollib/tile/selectcardset.py:242 #: pysollib/tile/playeroptionsdialog.py:111 pysollib/tile/selectcardset.py:243
#: pysollib/tile/selectgame.py:267 pysollib/tile/selectgame.py:406 #: pysollib/tile/selectgame.py:267 pysollib/tile/selectgame.py:407
#: pysollib/tile/selecttile.py:160 pysollib/tile/soundoptionsdialog.py:171 #: pysollib/tile/selecttile.py:161 pysollib/tile/soundoptionsdialog.py:171
#: pysollib/tile/timeoutsdialog.py:94 pysollib/tile/tkwidget.py:305 #: pysollib/tile/timeoutsdialog.py:94 pysollib/tile/tkwidget.py:319
#: pysollib/tk/colorsdialog.py:122 pysollib/tk/edittextdialog.py:82 #: pysollib/tk/colorsdialog.py:122 pysollib/tk/edittextdialog.py:82
#: pysollib/tk/fontsdialog.py:143 pysollib/tk/fontsdialog.py:205 #: pysollib/tk/fontsdialog.py:143 pysollib/tk/fontsdialog.py:205
#: pysollib/tk/menubar.py:1122 pysollib/tk/menubar.py:1124 #: pysollib/tk/menubar.py:1122 pysollib/tk/menubar.py:1124
@ -186,55 +185,55 @@ msgid ""
"\n" "\n"
msgstr "" msgstr ""
#: pysollib/actions.py:570 #: pysollib/actions.py:571
msgid " Demo" msgid " Demo"
msgstr "" msgstr ""
#: pysollib/actions.py:570 #: pysollib/actions.py:571
msgid " Demo " msgid " Demo "
msgstr "" msgstr ""
#: pysollib/actions.py:573 pysollib/actions.py:591 #: pysollib/actions.py:574 pysollib/actions.py:593
msgid " for " msgid " for "
msgstr "" msgstr ""
#: pysollib/actions.py:579 pysollib/stats.py:206 #: pysollib/actions.py:580 pysollib/stats.py:206
msgid "Statistics for " msgid "Statistics for "
msgstr "" msgstr ""
#: pysollib/actions.py:582 pysollib/tile/selectgame.py:349 #: pysollib/actions.py:583 pysollib/tile/selectgame.py:349
#: pysollib/tile/toolbar.py:247 pysollib/tk/selectgame.py:350 #: pysollib/tile/toolbar.py:247 pysollib/tk/selectgame.py:350
#: pysollib/tk/toolbar.py:208 #: pysollib/tk/toolbar.py:208
msgid "Statistics" msgid "Statistics"
msgstr "" msgstr ""
#: pysollib/actions.py:585 data/glade-translations:31 #: pysollib/actions.py:587 data/glade-translations:31
msgid "Full log" msgid "Full log"
msgstr "" msgstr ""
#: pysollib/actions.py:588 data/glade-translations:32 #: pysollib/actions.py:590 data/glade-translations:32
msgid "Session log" msgid "Session log"
msgstr "" msgstr ""
#: pysollib/actions.py:594 #: pysollib/actions.py:596
msgid "Game Info" msgid "Game Info"
msgstr "" msgstr ""
#: pysollib/actions.py:610 #: pysollib/actions.py:612
msgid "Reset all statistics" msgid "Reset all statistics"
msgstr "" msgstr ""
#: pysollib/actions.py:611 #: pysollib/actions.py:613
msgid "" msgid ""
"Reset ALL statistics and logs for player\n" "Reset ALL statistics and logs for player\n"
"%s ?" "%s ?"
msgstr "" msgstr ""
#: pysollib/actions.py:617 #: pysollib/actions.py:619
msgid "Reset game statistics" msgid "Reset game statistics"
msgstr "" msgstr ""
#: pysollib/actions.py:618 #: pysollib/actions.py:620
msgid "" msgid ""
"Reset statistics and logs for player\n" "Reset statistics and logs for player\n"
"%s\n" "%s\n"
@ -242,23 +241,23 @@ msgid ""
"%s ?" "%s ?"
msgstr "" msgstr ""
#: pysollib/actions.py:673 #: pysollib/actions.py:676
msgid "Play demo" msgid "Play demo"
msgstr "" msgstr ""
#: pysollib/actions.py:684 #: pysollib/actions.py:687
msgid "Set player options" msgid "Set player options"
msgstr "" msgstr ""
#: pysollib/actions.py:698 data/glade-translations:40 #: pysollib/actions.py:701 data/glade-translations:40
msgid "Set colors" msgid "Set colors"
msgstr "" msgstr ""
#: pysollib/actions.py:718 #: pysollib/actions.py:721
msgid "Set fonts" msgid "Set fonts"
msgstr "" msgstr ""
#: pysollib/actions.py:727 data/glade-translations:33 #: pysollib/actions.py:730 data/glade-translations:33
msgid "Set timeouts" msgid "Set timeouts"
msgstr "" msgstr ""
@ -266,8 +265,8 @@ msgstr ""
msgid "Unknown" msgid "Unknown"
msgstr "" msgstr ""
#: pysollib/app.py:883 pysollib/game.py:1311 pysollib/game.py:1326 #: pysollib/app.py:883 pysollib/game.py:1316 pysollib/game.py:1331
#: pysollib/game.py:1333 pysollib/game.py:1339 pysollib/tile/menubar.py:367 #: pysollib/game.py:1338 pysollib/game.py:1344 pysollib/tile/menubar.py:367
#: pysollib/tk/menubar.py:363 #: pysollib/tk/menubar.py:363
msgid "&New game" msgid "&New game"
msgstr "" msgstr ""
@ -301,54 +300,41 @@ msgstr ""
msgid "Please select a %s type %s" msgid "Please select a %s type %s"
msgstr "" msgstr ""
#: pysollib/game.py:849 pysollib/game.py:855 #: pysollib/game.py:852 pysollib/game.py:858
msgid "Player\n" msgid "Player\n"
msgstr "" msgstr ""
#: pysollib/game.py:926 #: pysollib/game.py:929
msgid "Discard current game ?" msgid "Discard current game ?"
msgstr "" msgstr ""
#: pysollib/game.py:1265
msgid ""
"\n"
"You have reached\n"
"#%d in the %s of playing time"
msgstr ""
#: pysollib/game.py:1268
msgid ""
"\n"
"and #%d in the %s of moves"
msgstr ""
#: pysollib/game.py:1270 #: pysollib/game.py:1270
msgid "" msgid ""
"\n" "\n"
"You have reached\n" "You have reached\n"
"#%d in the %s of moves" "#%d in the %s of playing time"
msgstr ""
#: pysollib/game.py:1273
msgid ""
"\n"
"and #%d in the %s of total moves"
msgstr "" msgstr ""
#: pysollib/game.py:1275 #: pysollib/game.py:1275
msgid "" msgid ""
"\n" "\n"
"You have reached\n" "and #%d in the %s of moves"
"#%d in the %s of total moves"
msgstr "" msgstr ""
#: pysollib/game.py:1302 pysollib/game.py:1318 #: pysollib/game.py:1278
msgid ""
"\n"
"You have reached\n"
"#%d in the %s of moves"
msgstr ""
#: pysollib/game.py:1307 pysollib/game.py:1323
#: pysollib/tile/soundoptionsdialog.py:102 #: pysollib/tile/soundoptionsdialog.py:102
#: pysollib/tk/soundoptionsdialog.py:100 #: pysollib/tk/soundoptionsdialog.py:100
msgid "Game won" msgid "Game won"
msgstr "" msgstr ""
#: pysollib/game.py:1303 #: pysollib/game.py:1308
msgid "" msgid ""
"\n" "\n"
"Congratulations, this\n" "Congratulations, this\n"
@ -359,7 +345,7 @@ msgid ""
"%s\n" "%s\n"
msgstr "" msgstr ""
#: pysollib/game.py:1319 #: pysollib/game.py:1324
msgid "" msgid ""
"\n" "\n"
"Congratulations, you did it !\n" "Congratulations, you did it !\n"
@ -369,101 +355,101 @@ msgid ""
"%s\n" "%s\n"
msgstr "" msgstr ""
#: pysollib/game.py:1331 pysollib/game.py:1337 #: pysollib/game.py:1336 pysollib/game.py:1342
#: pysollib/tile/soundoptionsdialog.py:100 #: pysollib/tile/soundoptionsdialog.py:100
#: pysollib/tk/soundoptionsdialog.py:98 #: pysollib/tk/soundoptionsdialog.py:98
msgid "Game finished" msgid "Game finished"
msgstr "" msgstr ""
#: pysollib/game.py:1332 pysollib/game.py:1862 #: pysollib/game.py:1337 pysollib/game.py:1866
msgid "" msgid ""
"\n" "\n"
"Game finished\n" "Game finished\n"
msgstr "" msgstr ""
#: pysollib/game.py:1338 #: pysollib/game.py:1343
msgid "" msgid ""
"\n" "\n"
"Game finished, but not without my help...\n" "Game finished, but not without my help...\n"
msgstr "" msgstr ""
#: pysollib/game.py:1339 #: pysollib/game.py:1344
msgid "&Restart" msgid "&Restart"
msgstr "" msgstr ""
#: pysollib/game.py:1753 #: pysollib/game.py:1758
msgid "Score %6d" msgid "Score %6d"
msgstr "" msgstr ""
#: pysollib/game.py:1852 #: pysollib/game.py:1857
msgid "&Cool" msgid "&Cool"
msgstr "" msgstr ""
#: pysollib/game.py:1852 #: pysollib/game.py:1857
msgid "&Great" msgid "&Great"
msgstr "" msgstr ""
#: pysollib/game.py:1852 #: pysollib/game.py:1857
msgid "&Wow" msgid "&Wow"
msgstr "" msgstr ""
#: pysollib/game.py:1852 #: pysollib/game.py:1857
msgid "&Yeah" msgid "&Yeah"
msgstr "" msgstr ""
#: pysollib/game.py:1853 pysollib/game.py:1865 pysollib/game.py:1878 #: pysollib/game.py:1858 pysollib/game.py:1869 pysollib/game.py:1881
msgid " Autopilot" msgid " Autopilot"
msgstr "" msgstr ""
#: pysollib/game.py:1854 #: pysollib/game.py:1859
msgid "" msgid ""
"\n" "\n"
"Game solved in %d moves.\n" "Game solved in %d moves.\n"
msgstr "" msgstr ""
#: pysollib/game.py:1877 #: pysollib/game.py:1880
msgid "&Hmm" msgid "&Hmm"
msgstr "" msgstr ""
#: pysollib/game.py:1877 #: pysollib/game.py:1880
msgid "&Oh well" msgid "&Oh well"
msgstr "" msgstr ""
#: pysollib/game.py:1877 #: pysollib/game.py:1880
msgid "&That's life" msgid "&That's life"
msgstr "" msgstr ""
#: pysollib/game.py:1879 #: pysollib/game.py:1882
msgid "" msgid ""
"\n" "\n"
"This won't come out...\n" "This won't come out...\n"
msgstr "" msgstr ""
#: pysollib/game.py:2288 #: pysollib/game.py:2291
msgid "Set bookmark" msgid "Set bookmark"
msgstr "" msgstr ""
#: pysollib/game.py:2289 #: pysollib/game.py:2292
msgid "Replace existing bookmark %d ?" msgid "Replace existing bookmark %d ?"
msgstr "" msgstr ""
#: pysollib/game.py:2311 #: pysollib/game.py:2314
msgid "Goto bookmark" msgid "Goto bookmark"
msgstr "" msgstr ""
#: pysollib/game.py:2312 #: pysollib/game.py:2315
msgid "Goto bookmark %d ?" msgid "Goto bookmark %d ?"
msgstr "" msgstr ""
#: pysollib/game.py:2343 #: pysollib/game.py:2346
msgid "Open game" msgid "Open game"
msgstr "" msgstr ""
#: pysollib/game.py:2354 pysollib/game.py:2363 pysollib/game.py:2368 #: pysollib/game.py:2357 pysollib/game.py:2366 pysollib/game.py:2371
msgid "Load game error" msgid "Load game error"
msgstr "" msgstr ""
#: pysollib/game.py:2355 #: pysollib/game.py:2358
msgid "" msgid ""
"Error while loading game.\n" "Error while loading game.\n"
"\n" "\n"
@ -471,22 +457,22 @@ msgid ""
"but this could also be a bug you might want to report." "but this could also be a bug you might want to report."
msgstr "" msgstr ""
#: pysollib/game.py:2364 #: pysollib/game.py:2367
msgid "Error while loading game" msgid "Error while loading game"
msgstr "" msgstr ""
#: pysollib/game.py:2369 #: pysollib/game.py:2372
msgid "" msgid ""
"Internal error while loading game.\n" "Internal error while loading game.\n"
"\n" "\n"
"Please report this bug." "Please report this bug."
msgstr "" msgstr ""
#: pysollib/game.py:2394 #: pysollib/game.py:2397
msgid "Save game error" msgid "Save game error"
msgstr "" msgstr ""
#: pysollib/game.py:2395 #: pysollib/game.py:2398
msgid "Error while saving game" msgid "Error while saving game"
msgstr "" msgstr ""
@ -1259,7 +1245,7 @@ msgstr ""
msgid " Help" msgid " Help"
msgstr "" msgstr ""
#: pysollib/main.py:66 pysollib/main.py:271 #: pysollib/main.py:66 pysollib/main.py:269
msgid "%s installation error" msgid "%s installation error"
msgstr "" msgstr ""
@ -1273,7 +1259,7 @@ msgid ""
"Please check your %s installation.\n" "Please check your %s installation.\n"
msgstr "" msgstr ""
#: pysollib/main.py:74 pysollib/main.py:279 pysollib/tile/menubar.py:386 #: pysollib/main.py:74 pysollib/main.py:277 pysollib/tile/menubar.py:386
#: pysollib/tk/menubar.py:382 #: pysollib/tk/menubar.py:382
msgid "&Quit" msgid "&Quit"
msgstr "" msgstr ""
@ -1314,7 +1300,7 @@ msgid ""
"try %s --help for more information" "try %s --help for more information"
msgstr "" msgstr ""
#: pysollib/main.py:272 #: pysollib/main.py:270
msgid "" msgid ""
"\n" "\n"
"No games were found !!!\n" "No games were found !!!\n"
@ -1325,25 +1311,7 @@ msgid ""
"Please check your %s installation.\n" "Please check your %s installation.\n"
msgstr "" msgstr ""
#: pysollib/main.py:358 pysollib/main.py:366 #: pysollib/main.py:339
msgid "%s installation problem"
msgstr ""
#: pysollib/main.py:359
msgid ""
"Your Python installation is compiled without thread support.\n"
"\n"
"Sounds and background music will be disabled."
msgstr ""
#: pysollib/main.py:367
msgid ""
"The pysolsoundserver module was not found.\n"
"\n"
"Sounds and background music will be disabled."
msgstr ""
#: pysollib/main.py:374
msgid "Welcome to %s" msgid "Welcome to %s"
msgstr "" msgstr ""
@ -1860,12 +1828,12 @@ msgid "Status"
msgstr "" msgstr ""
#: pysollib/stats.py:119 pysollib/tile/statusbar.py:159 #: pysollib/stats.py:119 pysollib/tile/statusbar.py:159
#: pysollib/tile/tkstats.py:516 pysollib/tk/statusbar.py:158 #: pysollib/tile/tkstats.py:545 pysollib/tk/statusbar.py:158
#: pysollib/tk/tkstats.py:666 #: pysollib/tk/tkstats.py:666
msgid "Game number" msgid "Game number"
msgstr "" msgstr ""
#: pysollib/stats.py:119 pysollib/tile/tkstats.py:519 #: pysollib/stats.py:119 pysollib/tile/tkstats.py:548
#: pysollib/tk/tkstats.py:669 #: pysollib/tk/tkstats.py:669
msgid "Started at" msgid "Started at"
msgstr "" msgstr ""
@ -1894,7 +1862,7 @@ msgstr ""
msgid "Demo" msgid "Demo"
msgstr "" msgstr ""
#: pysollib/stats.py:216 pysollib/tile/tkstats.py:278 #: pysollib/stats.py:216 pysollib/tile/tkstats.py:280
#: pysollib/tk/tkstats.py:418 #: pysollib/tk/tkstats.py:418
msgid "Total (%d out of %d games)" msgid "Total (%d out of %d games)"
msgstr "" msgstr ""
@ -1966,8 +1934,8 @@ msgstr ""
msgid "Select color" msgid "Select color"
msgstr "" msgstr ""
#: pysollib/tile/findcarddialog.py:52 pysollib/tile/menubar.py:439 #: pysollib/tile/findcarddialog.py:54 pysollib/tile/menubar.py:439
#: pysollib/tk/findcarddialog.py:52 pysollib/tk/menubar.py:435 #: pysollib/tk/findcarddialog.py:54 pysollib/tk/menubar.py:435
msgid "Find card" msgid "Find card"
msgstr "" msgstr ""
@ -2122,7 +2090,7 @@ msgstr ""
msgid "&Hold and quit" msgid "&Hold and quit"
msgstr "" msgstr ""
#: pysollib/tile/menubar.py:390 pysollib/tile/selectgame.py:406 #: pysollib/tile/menubar.py:390 pysollib/tile/selectgame.py:407
#: pysollib/tk/menubar.py:386 pysollib/tk/selectgame.py:407 #: pysollib/tk/menubar.py:386 pysollib/tk/selectgame.py:407
msgid "&Select" msgid "&Select"
msgstr "" msgstr ""
@ -2404,7 +2372,7 @@ msgid "Time&outs..."
msgstr "" msgstr ""
#: pysollib/tile/menubar.py:503 #: pysollib/tile/menubar.py:503
msgid "T&heme" msgid "Set t&heme"
msgstr "" msgstr ""
#: pysollib/tile/menubar.py:505 pysollib/tk/menubar.py:499 #: pysollib/tile/menubar.py:505 pysollib/tk/menubar.py:499
@ -2508,11 +2476,11 @@ msgstr ""
msgid "Select table background" msgid "Select table background"
msgstr "" msgstr ""
#: pysollib/tile/menubar.py:1332 #: pysollib/tile/menubar.py:1331
msgid "Change theme" msgid "Change theme"
msgstr "" msgstr ""
#: pysollib/tile/menubar.py:1333 #: pysollib/tile/menubar.py:1332
msgid "" msgid ""
"This settings will take effect\n" "This settings will take effect\n"
"the next time you restart " "the next time you restart "
@ -2525,12 +2493,12 @@ msgid ""
"Please enter your name" "Please enter your name"
msgstr "" msgstr ""
#: pysollib/tile/playeroptionsdialog.py:84 #: pysollib/tile/playeroptionsdialog.py:83
#: pysollib/tk/playeroptionsdialog.py:124 #: pysollib/tk/playeroptionsdialog.py:124
msgid "Confirm quit" msgid "Confirm quit"
msgstr "" msgstr ""
#: pysollib/tile/playeroptionsdialog.py:88 #: pysollib/tile/playeroptionsdialog.py:86
#: pysollib/tk/playeroptionsdialog.py:128 #: pysollib/tk/playeroptionsdialog.py:128
msgid "Update statistics and logs" msgid "Update statistics and logs"
msgstr "" msgstr ""
@ -2591,37 +2559,37 @@ msgstr ""
msgid "XLarge cardsets" msgid "XLarge cardsets"
msgstr "" msgstr ""
#: pysollib/tile/selectcardset.py:242 pysollib/tk/menubar.py:1122
#: pysollib/tk/menubar.py:1124 pysollib/tk/selectcardset.py:241
msgid "&Load"
msgstr ""
#: pysollib/tile/selectcardset.py:242 pysollib/tk/menubar.py:1124 #: pysollib/tile/selectcardset.py:242 pysollib/tk/menubar.py:1124
msgid "&Info..." msgid "&Info..."
msgstr "" msgstr ""
#: pysollib/tile/selectcardset.py:319 pysollib/tk/selectcardset.py:320 #: pysollib/tile/selectcardset.py:243 pysollib/tk/menubar.py:1122
#: pysollib/tk/menubar.py:1124 pysollib/tk/selectcardset.py:241
msgid "&Load"
msgstr ""
#: pysollib/tile/selectcardset.py:320 pysollib/tk/selectcardset.py:320
msgid "About cardset" msgid "About cardset"
msgstr "" msgstr ""
#: pysollib/tile/selectcardset.py:335 pysollib/tile/selectgame.py:364 #: pysollib/tile/selectcardset.py:336 pysollib/tile/selectgame.py:364
#: pysollib/tk/selectcardset.py:336 pysollib/tk/selectgame.py:365 #: pysollib/tk/selectcardset.py:336 pysollib/tk/selectgame.py:365
msgid "Type:" msgid "Type:"
msgstr "" msgstr ""
#: pysollib/tile/selectcardset.py:336 pysollib/tk/selectcardset.py:337 #: pysollib/tile/selectcardset.py:337 pysollib/tk/selectcardset.py:337
msgid "Styles:" msgid "Styles:"
msgstr "" msgstr ""
#: pysollib/tile/selectcardset.py:337 pysollib/tk/selectcardset.py:338 #: pysollib/tile/selectcardset.py:338 pysollib/tk/selectcardset.py:338
msgid "Nationality:" msgid "Nationality:"
msgstr "" msgstr ""
#: pysollib/tile/selectcardset.py:338 pysollib/tk/selectcardset.py:339 #: pysollib/tile/selectcardset.py:339 pysollib/tk/selectcardset.py:339
msgid "Year:" msgid "Year:"
msgstr "" msgstr ""
#: pysollib/tile/selectcardset.py:340 pysollib/tk/selectcardset.py:341 #: pysollib/tile/selectcardset.py:341 pysollib/tk/selectcardset.py:341
msgid "Size:" msgid "Size:"
msgstr "" msgstr ""
@ -2677,27 +2645,27 @@ msgstr ""
msgid "by Skill Level" msgid "by Skill Level"
msgstr "" msgstr ""
#: pysollib/tile/selectgame.py:171 pysollib/tile/selectgame.py:532 #: pysollib/tile/selectgame.py:171 pysollib/tile/selectgame.py:533
#: pysollib/tk/selectgame.py:170 pysollib/tk/selectgame.py:533 #: pysollib/tk/selectgame.py:170 pysollib/tk/selectgame.py:533
msgid "Luck only" msgid "Luck only"
msgstr "" msgstr ""
#: pysollib/tile/selectgame.py:172 pysollib/tile/selectgame.py:533 #: pysollib/tile/selectgame.py:172 pysollib/tile/selectgame.py:534
#: pysollib/tk/selectgame.py:171 pysollib/tk/selectgame.py:534 #: pysollib/tk/selectgame.py:171 pysollib/tk/selectgame.py:534
msgid "Mostly luck" msgid "Mostly luck"
msgstr "" msgstr ""
#: pysollib/tile/selectgame.py:173 pysollib/tile/selectgame.py:534 #: pysollib/tile/selectgame.py:173 pysollib/tile/selectgame.py:535
#: pysollib/tk/selectgame.py:172 pysollib/tk/selectgame.py:535 #: pysollib/tk/selectgame.py:172 pysollib/tk/selectgame.py:535
msgid "Balanced" msgid "Balanced"
msgstr "" msgstr ""
#: pysollib/tile/selectgame.py:174 pysollib/tile/selectgame.py:535 #: pysollib/tile/selectgame.py:174 pysollib/tile/selectgame.py:536
#: pysollib/tk/selectgame.py:173 pysollib/tk/selectgame.py:536 #: pysollib/tk/selectgame.py:173 pysollib/tk/selectgame.py:536
msgid "Mostly skill" msgid "Mostly skill"
msgstr "" msgstr ""
#: pysollib/tile/selectgame.py:175 pysollib/tile/selectgame.py:536 #: pysollib/tile/selectgame.py:175 pysollib/tile/selectgame.py:537
#: pysollib/tk/selectgame.py:174 pysollib/tk/selectgame.py:537 #: pysollib/tk/selectgame.py:174 pysollib/tk/selectgame.py:537
msgid "Skill only" msgid "Skill only"
msgstr "" msgstr ""
@ -2860,13 +2828,13 @@ msgstr ""
msgid "Lost:" msgid "Lost:"
msgstr "" msgstr ""
#: pysollib/tile/selectgame.py:372 pysollib/tile/tkstats.py:586 #: pysollib/tile/selectgame.py:372 pysollib/tile/tkstats.py:615
#: pysollib/tk/selectgame.py:373 pysollib/tk/tkstats.py:736 #: pysollib/tk/selectgame.py:373 pysollib/tk/tkstats.py:736
#: data/glade-translations:18 #: data/glade-translations:18
msgid "Playing time:" msgid "Playing time:"
msgstr "" msgstr ""
#: pysollib/tile/selectgame.py:373 pysollib/tile/tkstats.py:593 #: pysollib/tile/selectgame.py:373 pysollib/tile/tkstats.py:622
#: pysollib/tk/selectgame.py:374 pysollib/tk/tkstats.py:743 #: pysollib/tk/selectgame.py:374 pysollib/tk/tkstats.py:743
#: data/glade-translations:19 #: data/glade-translations:19
msgid "Moves:" msgid "Moves:"
@ -2880,15 +2848,15 @@ msgstr ""
msgid "&Rules" msgid "&Rules"
msgstr "" msgstr ""
#: pysollib/tile/selectgame.py:485 pysollib/tk/selectgame.py:486 #: pysollib/tile/selectgame.py:486 pysollib/tk/selectgame.py:486
msgid "Playable Preview - " msgid "Playable Preview - "
msgstr "" msgstr ""
#: pysollib/tile/selectgame.py:539 pysollib/tk/selectgame.py:540 #: pysollib/tile/selectgame.py:540 pysollib/tk/selectgame.py:540
msgid "variable" msgid "variable"
msgstr "" msgstr ""
#: pysollib/tile/selectgame.py:540 pysollib/tk/selectgame.py:541 #: pysollib/tile/selectgame.py:541 pysollib/tk/selectgame.py:541
msgid "unlimited" msgid "unlimited"
msgstr "" msgstr ""
@ -2920,7 +2888,7 @@ msgstr ""
msgid "&Solid color..." msgid "&Solid color..."
msgstr "" msgstr ""
#: pysollib/tile/selecttile.py:177 pysollib/tk/selecttile.py:178 #: pysollib/tile/selecttile.py:178 pysollib/tk/selecttile.py:178
msgid "Select table color" msgid "Select table color"
msgstr "" msgstr ""
@ -3154,133 +3122,137 @@ msgstr ""
msgid "&Reset..." msgid "&Reset..."
msgstr "" msgstr ""
#: pysollib/tile/tkstats.py:374 pysollib/tile/tkstats.py:427 #: pysollib/tile/tkstats.py:380
#: pysollib/tile/tkstats.py:445 pysollib/tk/tkstats.py:513 msgid "&Play this game"
msgstr ""
#: pysollib/tile/tkstats.py:382 pysollib/tile/tkstats.py:451
#: pysollib/tile/tkstats.py:474 pysollib/tk/tkstats.py:513
#: pysollib/tk/tkstats.py:579 pysollib/tk/tkstats.py:594 #: pysollib/tk/tkstats.py:579 pysollib/tk/tkstats.py:594
msgid "&Save to file" msgid "&Save to file"
msgstr "" msgstr ""
#: pysollib/tile/tkstats.py:375 pysollib/tk/tkstats.py:514 #: pysollib/tile/tkstats.py:383 pysollib/tk/tkstats.py:514
msgid "&Reset all..." msgid "&Reset all..."
msgstr "" msgstr ""
#: pysollib/tile/tkstats.py:426 pysollib/tk/tkstats.py:579 #: pysollib/tile/tkstats.py:450 pysollib/tk/tkstats.py:579
msgid "Session &log..." msgid "Session &log..."
msgstr "" msgstr ""
#: pysollib/tile/tkstats.py:444 pysollib/tk/tkstats.py:594 #: pysollib/tile/tkstats.py:473 pysollib/tk/tkstats.py:594
msgid "&Full log..." msgid "&Full log..."
msgstr "" msgstr ""
#: pysollib/tile/tkstats.py:460 pysollib/tk/tkstats.py:609 #: pysollib/tile/tkstats.py:489 pysollib/tk/tkstats.py:609
msgid "Highlight piles: " msgid "Highlight piles: "
msgstr "" msgstr ""
#: pysollib/tile/tkstats.py:461 pysollib/tk/tkstats.py:610 #: pysollib/tile/tkstats.py:490 pysollib/tk/tkstats.py:610
msgid "Highlight cards: " msgid "Highlight cards: "
msgstr "" msgstr ""
#: pysollib/tile/tkstats.py:462 pysollib/tk/tkstats.py:611 #: pysollib/tile/tkstats.py:491 pysollib/tk/tkstats.py:611
msgid "Highlight same rank: " msgid "Highlight same rank: "
msgstr "" msgstr ""
#: pysollib/tile/tkstats.py:465 pysollib/tk/tkstats.py:614 #: pysollib/tile/tkstats.py:494 pysollib/tk/tkstats.py:614
msgid "" msgid ""
"\n" "\n"
"Redeals: " "Redeals: "
msgstr "" msgstr ""
#: pysollib/tile/tkstats.py:466 pysollib/tk/tkstats.py:615 #: pysollib/tile/tkstats.py:495 pysollib/tk/tkstats.py:615
msgid "" msgid ""
"\n" "\n"
"Cards in Talon: " "Cards in Talon: "
msgstr "" msgstr ""
#: pysollib/tile/tkstats.py:468 pysollib/tk/tkstats.py:617 #: pysollib/tile/tkstats.py:497 pysollib/tk/tkstats.py:617
msgid "" msgid ""
"\n" "\n"
"Cards in Waste: " "Cards in Waste: "
msgstr "" msgstr ""
#: pysollib/tile/tkstats.py:470 pysollib/tk/tkstats.py:619 #: pysollib/tile/tkstats.py:499 pysollib/tk/tkstats.py:619
msgid "" msgid ""
"\n" "\n"
"Cards in Foundations: " "Cards in Foundations: "
msgstr "" msgstr ""
#: pysollib/tile/tkstats.py:473 pysollib/tk/tkstats.py:622 #: pysollib/tile/tkstats.py:502 pysollib/tk/tkstats.py:622
msgid "Game status" msgid "Game status"
msgstr "" msgstr ""
#: pysollib/tile/tkstats.py:476 pysollib/tk/tkstats.py:625 #: pysollib/tile/tkstats.py:505 pysollib/tk/tkstats.py:625
msgid "Playing time: " msgid "Playing time: "
msgstr "" msgstr ""
#: pysollib/tile/tkstats.py:477 pysollib/tk/tkstats.py:626 #: pysollib/tile/tkstats.py:506 pysollib/tk/tkstats.py:626
msgid "Started at: " msgid "Started at: "
msgstr "" msgstr ""
#: pysollib/tile/tkstats.py:478 pysollib/tk/tkstats.py:627 #: pysollib/tile/tkstats.py:507 pysollib/tk/tkstats.py:627
msgid "Moves: " msgid "Moves: "
msgstr "" msgstr ""
#: pysollib/tile/tkstats.py:479 pysollib/tk/tkstats.py:628 #: pysollib/tile/tkstats.py:508 pysollib/tk/tkstats.py:628
msgid "Undo moves: " msgid "Undo moves: "
msgstr "" msgstr ""
#: pysollib/tile/tkstats.py:480 pysollib/tk/tkstats.py:629 #: pysollib/tile/tkstats.py:509 pysollib/tk/tkstats.py:629
msgid "Bookmark moves: " msgid "Bookmark moves: "
msgstr "" msgstr ""
#: pysollib/tile/tkstats.py:481 pysollib/tk/tkstats.py:630 #: pysollib/tile/tkstats.py:510 pysollib/tk/tkstats.py:630
msgid "Demo moves: " msgid "Demo moves: "
msgstr "" msgstr ""
#: pysollib/tile/tkstats.py:482 pysollib/tk/tkstats.py:631 #: pysollib/tile/tkstats.py:511 pysollib/tk/tkstats.py:631
msgid "Total player moves: " msgid "Total player moves: "
msgstr "" msgstr ""
#: pysollib/tile/tkstats.py:483 pysollib/tk/tkstats.py:632 #: pysollib/tile/tkstats.py:512 pysollib/tk/tkstats.py:632
msgid "Total moves in this game: " msgid "Total moves in this game: "
msgstr "" msgstr ""
#: pysollib/tile/tkstats.py:484 pysollib/tk/tkstats.py:633 #: pysollib/tile/tkstats.py:513 pysollib/tk/tkstats.py:633
msgid "Hints: " msgid "Hints: "
msgstr "" msgstr ""
#: pysollib/tile/tkstats.py:488 pysollib/tk/tkstats.py:637 #: pysollib/tile/tkstats.py:517 pysollib/tk/tkstats.py:637
msgid "&Statistics..." msgid "&Statistics..."
msgstr "" msgstr ""
#: pysollib/tile/tkstats.py:513 pysollib/tk/tkstats.py:663 #: pysollib/tile/tkstats.py:542 pysollib/tk/tkstats.py:663
msgid "N" msgid "N"
msgstr "" msgstr ""
#: pysollib/tile/tkstats.py:522 pysollib/tk/tkstats.py:672 #: pysollib/tile/tkstats.py:551 pysollib/tk/tkstats.py:672
msgid "Result" msgid "Result"
msgstr "" msgstr ""
#: pysollib/tile/tkstats.py:578 pysollib/tk/tkstats.py:728 #: pysollib/tile/tkstats.py:607 pysollib/tk/tkstats.py:728
#: data/glade-translations:21 #: data/glade-translations:21
msgid "Minimum" msgid "Minimum"
msgstr "" msgstr ""
#: pysollib/tile/tkstats.py:579 pysollib/tk/tkstats.py:729 #: pysollib/tile/tkstats.py:608 pysollib/tk/tkstats.py:729
#: data/glade-translations:22 #: data/glade-translations:22
msgid "Maximum" msgid "Maximum"
msgstr "" msgstr ""
#: pysollib/tile/tkstats.py:580 pysollib/tk/tkstats.py:730 #: pysollib/tile/tkstats.py:609 pysollib/tk/tkstats.py:730
#: data/glade-translations:23 #: data/glade-translations:23
msgid "Average" msgid "Average"
msgstr "" msgstr ""
#: pysollib/tile/tkstats.py:600 pysollib/tk/tkstats.py:750 #: pysollib/tile/tkstats.py:629 pysollib/tk/tkstats.py:750
#: data/glade-translations:20 #: data/glade-translations:20
msgid "Total moves:" msgid "Total moves:"
msgstr "" msgstr ""
#: pysollib/tile/tkstats.py:631 pysollib/tk/tkstats.py:781 #: pysollib/tile/tkstats.py:660 pysollib/tk/tkstats.py:781
msgid "No TOP for this game" msgid "No TOP for this game"
msgstr "" msgstr ""
@ -3360,7 +3332,7 @@ msgstr ""
msgid "Player options" msgid "Player options"
msgstr "" msgstr ""
#: pysollib/tile/toolbar.py:492 pysollib/tk/toolbar.py:466 #: pysollib/tile/toolbar.py:490 pysollib/tk/toolbar.py:466
msgid "Toolbar" msgid "Toolbar"
msgstr "" msgstr ""

29
po/ru_games.po
View file

@ -5,8 +5,8 @@
msgid "" msgid ""
msgstr "" msgstr ""
"Project-Id-Version: PySol 0.0.1\n" "Project-Id-Version: PySol 0.0.1\n"
"POT-Creation-Date: Wed Nov 15 13:22:51 2006\n" "POT-Creation-Date: Thu Nov 30 16:31:56 2006\n"
"PO-Revision-Date: 2006-11-14 17:04+0300\n" "PO-Revision-Date: 2006-11-30 16:06+0300\n"
"Last-Translator: Скоморох <skomoroh@gmail.com>\n" "Last-Translator: Скоморох <skomoroh@gmail.com>\n"
"Language-Team: Russian <ru@li.org>\n" "Language-Team: Russian <ru@li.org>\n"
"MIME-Version: 1.0\n" "MIME-Version: 1.0\n"
@ -476,9 +476,8 @@ msgstr "Горный Замок"
msgid "Castle of Indolence" msgid "Castle of Indolence"
msgstr "Замок праздности" msgstr "Замок праздности"
#, fuzzy
msgid "Castles End" msgid "Castles End"
msgstr "Замок" msgstr "Развалины замков"
msgid "Castles in Spain" msgid "Castles in Spain"
msgstr "Воздушные замки" msgstr "Воздушные замки"
@ -910,7 +909,7 @@ msgid "Eight Legions"
msgstr "Восемь легионов" msgstr "Восемь легионов"
msgid "Eight Off" msgid "Eight Off"
msgstr "" msgstr "Восемь удалённых"
msgid "Eight Squares" msgid "Eight Squares"
msgstr "Восемь квадратов" msgstr "Восемь квадратов"
@ -2050,7 +2049,7 @@ msgid "Mahjongg Mini Traditional"
msgstr "Маджонг Mini Traditional" msgstr "Маджонг Mini Traditional"
msgid "Mahjongg Mini-Layout" msgid "Mahjongg Mini-Layout"
msgstr "Маджонг Mini-Layout" msgstr "Маджонг Малый расклад"
msgid "Mahjongg Mission Impossible" msgid "Mahjongg Mission Impossible"
msgstr "Маджонг Миссия невыполнима" msgstr "Маджонг Миссия невыполнима"
@ -2068,7 +2067,7 @@ msgid "Mahjongg N for Namida"
msgstr "Маджонг N for Namida" msgstr "Маджонг N for Namida"
msgid "Mahjongg New Layout" msgid "Mahjongg New Layout"
msgstr "Маджонг New Layout" msgstr "Маджонг Новый расклад"
msgid "Mahjongg Okie's Nitemare" msgid "Mahjongg Okie's Nitemare"
msgstr "Маджонг Okie's Nitemare" msgstr "Маджонг Okie's Nitemare"
@ -2393,9 +2392,8 @@ msgstr "Минерва"
msgid "Mini Traditional" msgid "Mini Traditional"
msgstr "Маджонг Mini Traditional" msgstr "Маджонг Mini Traditional"
#, fuzzy
msgid "Mini-Layout" msgid "Mini-Layout"
msgstr "Маджонг Mini-Layout" msgstr "Маджонг Малый расклад"
msgid "Miss Milligan" msgid "Miss Milligan"
msgstr "Мисс Миллиган" msgstr "Мисс Миллиган"
@ -2516,9 +2514,8 @@ msgstr "Нестор"
msgid "New British Constitution" msgid "New British Constitution"
msgstr "Новая Британская конституция" msgstr "Новая Британская конституция"
#, fuzzy
msgid "New Layout" msgid "New Layout"
msgstr "Маджонг New Layout" msgstr "Новый расклад"
msgid "New York" msgid "New York"
msgstr "Нью-Йорк" msgstr "Нью-Йорк"
@ -2588,7 +2585,7 @@ msgid "Open Jumbo"
msgstr "Открытый гигант" msgstr "Открытый гигант"
msgid "Open Peek" msgid "Open Peek"
msgstr "" msgstr "Открытый взгляд"
msgid "Open Sly Fox" msgid "Open Sly Fox"
msgstr "Открытая Хитрая лиса" msgstr "Открытая Хитрая лиса"
@ -2667,7 +2664,7 @@ msgid "Paulownia"
msgstr "" msgstr ""
msgid "Peek" msgid "Peek"
msgstr "" msgstr "Взгляд"
msgid "Pegged" msgid "Pegged"
msgstr "" msgstr ""
@ -2720,7 +2717,6 @@ msgstr "Картинная галерея"
msgid "Picture Patience" msgid "Picture Patience"
msgstr "Картинный пасьянс" msgstr "Картинный пасьянс"
#, fuzzy
msgid "Pigtail" msgid "Pigtail"
msgstr "Косичка" msgstr "Косичка"
@ -2956,9 +2952,8 @@ msgstr "Королевская помощь"
msgid "Royal Cotillion" msgid "Royal Cotillion"
msgstr "Королевский котильон" msgstr "Королевский котильон"
#, fuzzy
msgid "Royal East" msgid "Royal East"
msgstr "Королевская семья" msgstr "Великолепный Восток"
msgid "Royal Family" msgid "Royal Family"
msgstr "Королевская семья" msgstr "Королевская семья"
@ -3006,7 +3001,7 @@ msgid "Sanibel"
msgstr "Санибел" msgstr "Санибел"
msgid "Saratoga" msgid "Saratoga"
msgstr "Дорожный сундук" msgstr "Саратога"
msgid "Saxony" msgid "Saxony"
msgstr "Саксония" msgstr "Саксония"

364
po/ru_pysol.po
View file

@ -5,8 +5,8 @@
msgid "" msgid ""
msgstr "" msgstr ""
"Project-Id-Version: PySol 0.0.1\n" "Project-Id-Version: PySol 0.0.1\n"
"POT-Creation-Date: Wed Nov 15 13:23:52 2006\n" "POT-Creation-Date: Thu Nov 30 16:32:59 2006\n"
"PO-Revision-Date: 2006-11-15 13:25+0300\n" "PO-Revision-Date: 2006-11-30 16:36+0300\n"
"Last-Translator: Скоморох <skomoroh@gmail.com>\n" "Last-Translator: Скоморох <skomoroh@gmail.com>\n"
"Language-Team: Russian <ru@li.org>\n" "Language-Team: Russian <ru@li.org>\n"
"MIME-Version: 1.0\n" "MIME-Version: 1.0\n"
@ -56,19 +56,18 @@ msgid "&Next number"
msgstr "&Следующий номер" msgstr "&Следующий номер"
#: pysollib/actions.py:315 pysollib/app.py:881 pysollib/app.py:1164 #: pysollib/actions.py:315 pysollib/app.py:881 pysollib/app.py:1164
#: pysollib/app.py:1176 pysollib/game.py:930 pysollib/game.py:1861 #: pysollib/app.py:1176 pysollib/game.py:933 pysollib/game.py:1865
#: pysollib/main.py:363 pysollib/main.py:371 pysollib/tile/colorsdialog.py:123 #: pysollib/tile/colorsdialog.py:123 pysollib/tile/edittextdialog.py:83
#: pysollib/tile/edittextdialog.py:83 pysollib/tile/fontsdialog.py:145 #: pysollib/tile/fontsdialog.py:145 pysollib/tile/fontsdialog.py:205
#: pysollib/tile/fontsdialog.py:205 pysollib/tile/gameinfodialog.py:155 #: pysollib/tile/gameinfodialog.py:155 pysollib/tile/menubar.py:1336
#: pysollib/tile/menubar.py:1337 pysollib/tile/playeroptionsdialog.py:113 #: pysollib/tile/playeroptionsdialog.py:111 pysollib/tile/selectcardset.py:397
#: pysollib/tile/selectcardset.py:396 pysollib/tile/selecttile.py:160 #: pysollib/tile/selecttile.py:161 pysollib/tile/soundoptionsdialog.py:171
#: pysollib/tile/soundoptionsdialog.py:171
#: pysollib/tile/soundoptionsdialog.py:209 pysollib/tile/timeoutsdialog.py:94 #: pysollib/tile/soundoptionsdialog.py:209 pysollib/tile/timeoutsdialog.py:94
#: pysollib/tile/tkhtml.py:501 pysollib/tile/tkstats.py:211 #: pysollib/tile/tkhtml.py:501 pysollib/tile/tkstats.py:211
#: pysollib/tile/tkstats.py:373 pysollib/tile/tkstats.py:426 #: pysollib/tile/tkstats.py:381 pysollib/tile/tkstats.py:450
#: pysollib/tile/tkstats.py:444 pysollib/tile/tkstats.py:487 #: pysollib/tile/tkstats.py:473 pysollib/tile/tkstats.py:516
#: pysollib/tile/tkstats.py:558 pysollib/tile/tkstats.py:642 #: pysollib/tile/tkstats.py:587 pysollib/tile/tkstats.py:671
#: pysollib/tile/tkwidget.py:146 pysollib/tile/tkwidget.py:305 #: pysollib/tile/tkwidget.py:146 pysollib/tile/tkwidget.py:319
#: pysollib/tk/colorsdialog.py:122 pysollib/tk/edittextdialog.py:82 #: pysollib/tk/colorsdialog.py:122 pysollib/tk/edittextdialog.py:82
#: pysollib/tk/fontsdialog.py:143 pysollib/tk/fontsdialog.py:205 #: pysollib/tk/fontsdialog.py:143 pysollib/tk/fontsdialog.py:205
#: pysollib/tk/gameinfodialog.py:155 pysollib/tk/playeroptionsdialog.py:85 #: pysollib/tk/gameinfodialog.py:155 pysollib/tk/playeroptionsdialog.py:85
@ -85,14 +84,14 @@ msgid "&OK"
msgstr "&ОК" msgstr "&ОК"
#: pysollib/actions.py:315 pysollib/app.py:882 pysollib/app.py:1176 #: pysollib/actions.py:315 pysollib/app.py:882 pysollib/app.py:1176
#: pysollib/game.py:930 pysollib/game.py:1311 pysollib/game.py:1326 #: pysollib/game.py:933 pysollib/game.py:1316 pysollib/game.py:1331
#: pysollib/game.py:1333 pysollib/game.py:1339 #: pysollib/game.py:1338 pysollib/game.py:1344
#: pysollib/tile/colorsdialog.py:123 pysollib/tile/edittextdialog.py:83 #: pysollib/tile/colorsdialog.py:123 pysollib/tile/edittextdialog.py:83
#: pysollib/tile/fontsdialog.py:145 pysollib/tile/fontsdialog.py:205 #: pysollib/tile/fontsdialog.py:145 pysollib/tile/fontsdialog.py:205
#: pysollib/tile/playeroptionsdialog.py:113 pysollib/tile/selectcardset.py:242 #: pysollib/tile/playeroptionsdialog.py:111 pysollib/tile/selectcardset.py:243
#: pysollib/tile/selectgame.py:267 pysollib/tile/selectgame.py:406 #: pysollib/tile/selectgame.py:267 pysollib/tile/selectgame.py:407
#: pysollib/tile/selecttile.py:160 pysollib/tile/soundoptionsdialog.py:171 #: pysollib/tile/selecttile.py:161 pysollib/tile/soundoptionsdialog.py:171
#: pysollib/tile/timeoutsdialog.py:94 pysollib/tile/tkwidget.py:305 #: pysollib/tile/timeoutsdialog.py:94 pysollib/tile/tkwidget.py:319
#: pysollib/tk/colorsdialog.py:122 pysollib/tk/edittextdialog.py:82 #: pysollib/tk/colorsdialog.py:122 pysollib/tk/edittextdialog.py:82
#: pysollib/tk/fontsdialog.py:143 pysollib/tk/fontsdialog.py:205 #: pysollib/tk/fontsdialog.py:143 pysollib/tk/fontsdialog.py:205
#: pysollib/tk/menubar.py:1122 pysollib/tk/menubar.py:1124 #: pysollib/tk/menubar.py:1122 pysollib/tk/menubar.py:1124
@ -177,45 +176,45 @@ msgstr ""
" добавлена в файл\n" " добавлена в файл\n"
"\n" "\n"
#: pysollib/actions.py:570 #: pysollib/actions.py:571
msgid " Demo" msgid " Demo"
msgstr " Демо" msgstr " Демо"
#: pysollib/actions.py:570 #: pysollib/actions.py:571
msgid " Demo " msgid " Demo "
msgstr " Демо " msgstr " Демо "
#: pysollib/actions.py:573 pysollib/actions.py:591 #: pysollib/actions.py:574 pysollib/actions.py:593
msgid " for " msgid " for "
msgstr " для " msgstr " для "
#: pysollib/actions.py:579 pysollib/stats.py:206 #: pysollib/actions.py:580 pysollib/stats.py:206
msgid "Statistics for " msgid "Statistics for "
msgstr "Статистика игры " msgstr "Статистика игры "
#: pysollib/actions.py:582 pysollib/tile/selectgame.py:349 #: pysollib/actions.py:583 pysollib/tile/selectgame.py:349
#: pysollib/tile/toolbar.py:247 pysollib/tk/selectgame.py:350 #: pysollib/tile/toolbar.py:247 pysollib/tk/selectgame.py:350
#: pysollib/tk/toolbar.py:208 #: pysollib/tk/toolbar.py:208
msgid "Statistics" msgid "Statistics"
msgstr "Статистика" msgstr "Статистика"
#: pysollib/actions.py:585 data/glade-translations:31 #: pysollib/actions.py:587 data/glade-translations:31
msgid "Full log" msgid "Full log"
msgstr "Полный лог" msgstr "Полный лог"
#: pysollib/actions.py:588 data/glade-translations:32 #: pysollib/actions.py:590 data/glade-translations:32
msgid "Session log" msgid "Session log"
msgstr "Лог сессии" msgstr "Лог сессии"
#: pysollib/actions.py:594 #: pysollib/actions.py:596
msgid "Game Info" msgid "Game Info"
msgstr "Информация об игре" msgstr "Информация об игре"
#: pysollib/actions.py:610 #: pysollib/actions.py:612
msgid "Reset all statistics" msgid "Reset all statistics"
msgstr "Очистить всю статистику" msgstr "Очистить всю статистику"
#: pysollib/actions.py:611 #: pysollib/actions.py:613
msgid "" msgid ""
"Reset ALL statistics and logs for player\n" "Reset ALL statistics and logs for player\n"
"%s ?" "%s ?"
@ -223,11 +222,11 @@ msgstr ""
"Очистить всю статистику и лог для игрока\n" "Очистить всю статистику и лог для игрока\n"
"%s?" "%s?"
#: pysollib/actions.py:617 #: pysollib/actions.py:619
msgid "Reset game statistics" msgid "Reset game statistics"
msgstr "Очистить статистику игры" msgstr "Очистить статистику игры"
#: pysollib/actions.py:618 #: pysollib/actions.py:620
msgid "" msgid ""
"Reset statistics and logs for player\n" "Reset statistics and logs for player\n"
"%s\n" "%s\n"
@ -239,23 +238,23 @@ msgstr ""
"и игры\n" "и игры\n"
"%s?" "%s?"
#: pysollib/actions.py:673 #: pysollib/actions.py:676
msgid "Play demo" msgid "Play demo"
msgstr "Показать демо" msgstr "Показать демо"
#: pysollib/actions.py:684 #: pysollib/actions.py:687
msgid "Set player options" msgid "Set player options"
msgstr "Установить настройки игрока" msgstr "Установить настройки игрока"
#: pysollib/actions.py:698 data/glade-translations:40 #: pysollib/actions.py:701 data/glade-translations:40
msgid "Set colors" msgid "Set colors"
msgstr "Настроить цвета" msgstr "Настроить цвета"
#: pysollib/actions.py:718 #: pysollib/actions.py:721
msgid "Set fonts" msgid "Set fonts"
msgstr "Настроить шрифт" msgstr "Настроить шрифт"
#: pysollib/actions.py:727 data/glade-translations:33 #: pysollib/actions.py:730 data/glade-translations:33
msgid "Set timeouts" msgid "Set timeouts"
msgstr "Настроить таймауты" msgstr "Настроить таймауты"
@ -263,8 +262,8 @@ msgstr "Настроить таймауты"
msgid "Unknown" msgid "Unknown"
msgstr "Неизвестный" msgstr "Неизвестный"
#: pysollib/app.py:883 pysollib/game.py:1311 pysollib/game.py:1326 #: pysollib/app.py:883 pysollib/game.py:1316 pysollib/game.py:1331
#: pysollib/game.py:1333 pysollib/game.py:1339 pysollib/tile/menubar.py:367 #: pysollib/game.py:1338 pysollib/game.py:1344 pysollib/tile/menubar.py:367
#: pysollib/tk/menubar.py:363 #: pysollib/tk/menubar.py:363
msgid "&New game" msgid "&New game"
msgstr "&Новая игра" msgstr "&Новая игра"
@ -303,15 +302,15 @@ msgstr ""
msgid "Please select a %s type %s" msgid "Please select a %s type %s"
msgstr "Выберите %s типа %s" msgstr "Выберите %s типа %s"
#: pysollib/game.py:849 pysollib/game.py:855 #: pysollib/game.py:852 pysollib/game.py:858
msgid "Player\n" msgid "Player\n"
msgstr "Игрок\n" msgstr "Игрок\n"
#: pysollib/game.py:926 #: pysollib/game.py:929
msgid "Discard current game ?" msgid "Discard current game ?"
msgstr "Завершить текущую игру?" msgstr "Завершить текущую игру?"
#: pysollib/game.py:1265 #: pysollib/game.py:1270
msgid "" msgid ""
"\n" "\n"
"You have reached\n" "You have reached\n"
@ -321,7 +320,7 @@ msgstr ""
"Вы достигли\n" "Вы достигли\n"
"#%d в %s игрового времени" "#%d в %s игрового времени"
#: pysollib/game.py:1268 #: pysollib/game.py:1275
msgid "" msgid ""
"\n" "\n"
"and #%d in the %s of moves" "and #%d in the %s of moves"
@ -329,7 +328,7 @@ msgstr ""
"\n" "\n"
"и #%d в %s количества ходов" "и #%d в %s количества ходов"
#: pysollib/game.py:1270 #: pysollib/game.py:1278
msgid "" msgid ""
"\n" "\n"
"You have reached\n" "You have reached\n"
@ -339,31 +338,13 @@ msgstr ""
"Вы достигли\n" "Вы достигли\n"
"#%d в %s количества ходов" "#%d в %s количества ходов"
#: pysollib/game.py:1273 #: pysollib/game.py:1307 pysollib/game.py:1323
msgid ""
"\n"
"and #%d in the %s of total moves"
msgstr ""
"\n"
"и #%d в %s общего количества ходов"
#: pysollib/game.py:1275
msgid ""
"\n"
"You have reached\n"
"#%d in the %s of total moves"
msgstr ""
"\n"
"Вы достигли\n"
"#%d в %s общего количества ходов"
#: pysollib/game.py:1302 pysollib/game.py:1318
#: pysollib/tile/soundoptionsdialog.py:102 #: pysollib/tile/soundoptionsdialog.py:102
#: pysollib/tk/soundoptionsdialog.py:100 #: pysollib/tk/soundoptionsdialog.py:100
msgid "Game won" msgid "Game won"
msgstr "Игра выиграна" msgstr "Игра выиграна"
#: pysollib/game.py:1303 #: pysollib/game.py:1308
msgid "" msgid ""
"\n" "\n"
"Congratulations, this\n" "Congratulations, this\n"
@ -382,7 +363,7 @@ msgstr ""
"Количество ходов: %s\n" "Количество ходов: %s\n"
"%s\n" "%s\n"
#: pysollib/game.py:1319 #: pysollib/game.py:1324
msgid "" msgid ""
"\n" "\n"
"Congratulations, you did it !\n" "Congratulations, you did it !\n"
@ -399,13 +380,13 @@ msgstr ""
"Количество ходов: %s\n" "Количество ходов: %s\n"
"%s\n" "%s\n"
#: pysollib/game.py:1331 pysollib/game.py:1337 #: pysollib/game.py:1336 pysollib/game.py:1342
#: pysollib/tile/soundoptionsdialog.py:100 #: pysollib/tile/soundoptionsdialog.py:100
#: pysollib/tk/soundoptionsdialog.py:98 #: pysollib/tk/soundoptionsdialog.py:98
msgid "Game finished" msgid "Game finished"
msgstr "Игра закончена" msgstr "Игра закончена"
#: pysollib/game.py:1332 pysollib/game.py:1862 #: pysollib/game.py:1337 pysollib/game.py:1866
msgid "" msgid ""
"\n" "\n"
"Game finished\n" "Game finished\n"
@ -413,7 +394,7 @@ msgstr ""
"\n" "\n"
"Игра закончена\n" "Игра закончена\n"
#: pysollib/game.py:1338 #: pysollib/game.py:1343
msgid "" msgid ""
"\n" "\n"
"Game finished, but not without my help...\n" "Game finished, but not without my help...\n"
@ -421,35 +402,35 @@ msgstr ""
"\n" "\n"
"Игра закончена, но не без моей помощи...\n" "Игра закончена, но не без моей помощи...\n"
#: pysollib/game.py:1339 #: pysollib/game.py:1344
msgid "&Restart" msgid "&Restart"
msgstr "&Начало" msgstr "&Начало"
#: pysollib/game.py:1753 #: pysollib/game.py:1758
msgid "Score %6d" msgid "Score %6d"
msgstr "Счёт %6d" msgstr "Счёт %6d"
#: pysollib/game.py:1852 #: pysollib/game.py:1857
msgid "&Cool" msgid "&Cool"
msgstr "&Отлично" msgstr "&Отлично"
#: pysollib/game.py:1852 #: pysollib/game.py:1857
msgid "&Great" msgid "&Great"
msgstr "&Здорово" msgstr "&Здорово"
#: pysollib/game.py:1852 #: pysollib/game.py:1857
msgid "&Wow" msgid "&Wow"
msgstr "&Ура" msgstr "&Ура"
#: pysollib/game.py:1852 #: pysollib/game.py:1857
msgid "&Yeah" msgid "&Yeah"
msgstr "&Ага" msgstr "&Ага"
#: pysollib/game.py:1853 pysollib/game.py:1865 pysollib/game.py:1878 #: pysollib/game.py:1858 pysollib/game.py:1869 pysollib/game.py:1881
msgid " Autopilot" msgid " Autopilot"
msgstr " Автопилот" msgstr " Автопилот"
#: pysollib/game.py:1854 #: pysollib/game.py:1859
msgid "" msgid ""
"\n" "\n"
"Game solved in %d moves.\n" "Game solved in %d moves.\n"
@ -457,19 +438,19 @@ msgstr ""
"\n" "\n"
"Игра решена за %d ходов\n" "Игра решена за %d ходов\n"
#: pysollib/game.py:1877 #: pysollib/game.py:1880
msgid "&Hmm" msgid "&Hmm"
msgstr "&Хмм" msgstr "&Хмм"
#: pysollib/game.py:1877 #: pysollib/game.py:1880
msgid "&Oh well" msgid "&Oh well"
msgstr "&Ох" msgstr "&Ох"
#: pysollib/game.py:1877 #: pysollib/game.py:1880
msgid "&That's life" msgid "&That's life"
msgstr "&Такова жизнь" msgstr "&Такова жизнь"
#: pysollib/game.py:1879 #: pysollib/game.py:1882
msgid "" msgid ""
"\n" "\n"
"This won't come out...\n" "This won't come out...\n"
@ -477,31 +458,31 @@ msgstr ""
"\n" "\n"
"Не удалось...\n" "Не удалось...\n"
#: pysollib/game.py:2288 #: pysollib/game.py:2291
msgid "Set bookmark" msgid "Set bookmark"
msgstr "Установить закладку" msgstr "Установить закладку"
#: pysollib/game.py:2289 #: pysollib/game.py:2292
msgid "Replace existing bookmark %d ?" msgid "Replace existing bookmark %d ?"
msgstr "Заменить существующую закладку %d ?" msgstr "Заменить существующую закладку %d ?"
#: pysollib/game.py:2311 #: pysollib/game.py:2314
msgid "Goto bookmark" msgid "Goto bookmark"
msgstr "Перейти к закладке" msgstr "Перейти к закладке"
#: pysollib/game.py:2312 #: pysollib/game.py:2315
msgid "Goto bookmark %d ?" msgid "Goto bookmark %d ?"
msgstr "Перейти к закладке %d ?" msgstr "Перейти к закладке %d ?"
#: pysollib/game.py:2343 #: pysollib/game.py:2346
msgid "Open game" msgid "Open game"
msgstr "Открыть игру" msgstr "Открыть игру"
#: pysollib/game.py:2354 pysollib/game.py:2363 pysollib/game.py:2368 #: pysollib/game.py:2357 pysollib/game.py:2366 pysollib/game.py:2371
msgid "Load game error" msgid "Load game error"
msgstr "Ошибка при загрузке игры" msgstr "Ошибка при загрузке игры"
#: pysollib/game.py:2355 #: pysollib/game.py:2358
msgid "" msgid ""
"Error while loading game.\n" "Error while loading game.\n"
"\n" "\n"
@ -513,11 +494,11 @@ msgstr ""
"Возможно повреждён файл,\n" "Возможно повреждён файл,\n"
"или ошибка в программе." "или ошибка в программе."
#: pysollib/game.py:2364 #: pysollib/game.py:2367
msgid "Error while loading game" msgid "Error while loading game"
msgstr "Ошибка при загрузке игры" msgstr "Ошибка при загрузке игры"
#: pysollib/game.py:2369 #: pysollib/game.py:2372
msgid "" msgid ""
"Internal error while loading game.\n" "Internal error while loading game.\n"
"\n" "\n"
@ -527,11 +508,11 @@ msgstr ""
"\n" "\n"
"Пожалуйста сообщите об этой ошибке." "Пожалуйста сообщите об этой ошибке."
#: pysollib/game.py:2394 #: pysollib/game.py:2397
msgid "Save game error" msgid "Save game error"
msgstr "Ошибка при сохранении игры" msgstr "Ошибка при сохранении игры"
#: pysollib/game.py:2395 #: pysollib/game.py:2398
msgid "Error while saving game" msgid "Error while saving game"
msgstr "Ошибка при сохранении игры" msgstr "Ошибка при сохранении игры"
@ -1365,7 +1346,7 @@ msgstr "Не найден файл помощи\n"
msgid " Help" msgid " Help"
msgstr " Помощь" msgstr " Помощь"
#: pysollib/main.py:66 pysollib/main.py:271 #: pysollib/main.py:66 pysollib/main.py:269
msgid "%s installation error" msgid "%s installation error"
msgstr "%s проблема с установкой" msgstr "%s проблема с установкой"
@ -1385,7 +1366,7 @@ msgstr ""
"\n" "\n"
"Пожалуйста проверьте установку %s.\n" "Пожалуйста проверьте установку %s.\n"
#: pysollib/main.py:74 pysollib/main.py:279 pysollib/tile/menubar.py:386 #: pysollib/main.py:74 pysollib/main.py:277 pysollib/tile/menubar.py:386
#: pysollib/tk/menubar.py:382 #: pysollib/tk/menubar.py:382
msgid "&Quit" msgid "&Quit"
msgstr "В&ыход" msgstr "В&ыход"
@ -1446,7 +1427,7 @@ msgstr ""
"%s: неправильное имя файла\n" "%s: неправильное имя файла\n"
"попробуйте %s --help для получения более подробной информации" "попробуйте %s --help для получения более подробной информации"
#: pysollib/main.py:272 #: pysollib/main.py:270
msgid "" msgid ""
"\n" "\n"
"No games were found !!!\n" "No games were found !!!\n"
@ -1464,31 +1445,7 @@ msgstr ""
"\n" "\n"
"Пожалуйста проверьте установку %s.\n" "Пожалуйста проверьте установку %s.\n"
#: pysollib/main.py:358 pysollib/main.py:366 #: pysollib/main.py:339
msgid "%s installation problem"
msgstr "%s проблема с установкой"
#: pysollib/main.py:359
msgid ""
"Your Python installation is compiled without thread support.\n"
"\n"
"Sounds and background music will be disabled."
msgstr ""
"Ваш дистрибутив Python собран без поддержки нитей.\n"
"\n"
"Звук и фоновая музыка будут недоступны."
#: pysollib/main.py:367
msgid ""
"The pysolsoundserver module was not found.\n"
"\n"
"Sounds and background music will be disabled."
msgstr ""
"Модуль pysolsoundserver не найден.\n"
"\n"
"Звук и фоновая музыка будут недоступны."
#: pysollib/main.py:374
msgid "Welcome to %s" msgid "Welcome to %s"
msgstr "Добро пожаловать в %s" msgstr "Добро пожаловать в %s"
@ -2026,12 +1983,12 @@ msgid "Status"
msgstr "Статус" msgstr "Статус"
#: pysollib/stats.py:119 pysollib/tile/statusbar.py:159 #: pysollib/stats.py:119 pysollib/tile/statusbar.py:159
#: pysollib/tile/tkstats.py:516 pysollib/tk/statusbar.py:158 #: pysollib/tile/tkstats.py:545 pysollib/tk/statusbar.py:158
#: pysollib/tk/tkstats.py:666 #: pysollib/tk/tkstats.py:666
msgid "Game number" msgid "Game number"
msgstr "Номер игры" msgstr "Номер игры"
#: pysollib/stats.py:119 pysollib/tile/tkstats.py:519 #: pysollib/stats.py:119 pysollib/tile/tkstats.py:548
#: pysollib/tk/tkstats.py:669 #: pysollib/tk/tkstats.py:669
msgid "Started at" msgid "Started at"
msgstr "Игра начата" msgstr "Игра начата"
@ -2060,7 +2017,7 @@ msgstr "Великолепная"
msgid "Demo" msgid "Demo"
msgstr "Демо" msgstr "Демо"
#: pysollib/stats.py:216 pysollib/tile/tkstats.py:278 #: pysollib/stats.py:216 pysollib/tile/tkstats.py:280
#: pysollib/tk/tkstats.py:418 #: pysollib/tk/tkstats.py:418
msgid "Total (%d out of %d games)" msgid "Total (%d out of %d games)"
msgstr "Всего (%d из %d игр)" msgstr "Всего (%d из %d игр)"
@ -2132,8 +2089,8 @@ msgstr "Подсветка отсутствия совпадения:"
msgid "Select color" msgid "Select color"
msgstr "Выбрать цвет" msgstr "Выбрать цвет"
#: pysollib/tile/findcarddialog.py:52 pysollib/tile/menubar.py:439 #: pysollib/tile/findcarddialog.py:54 pysollib/tile/menubar.py:439
#: pysollib/tk/findcarddialog.py:52 pysollib/tk/menubar.py:435 #: pysollib/tk/findcarddialog.py:54 pysollib/tk/menubar.py:435
msgid "Find card" msgid "Find card"
msgstr "Найти карту" msgstr "Найти карту"
@ -2288,7 +2245,7 @@ msgstr "Сохранить &как..."
msgid "&Hold and quit" msgid "&Hold and quit"
msgstr "Со&храниться и выйти" msgstr "Со&храниться и выйти"
#: pysollib/tile/menubar.py:390 pysollib/tile/selectgame.py:406 #: pysollib/tile/menubar.py:390 pysollib/tile/selectgame.py:407
#: pysollib/tk/menubar.py:386 pysollib/tk/selectgame.py:407 #: pysollib/tk/menubar.py:386 pysollib/tk/selectgame.py:407
msgid "&Select" msgid "&Select"
msgstr "&Выбрать" msgstr "&Выбрать"
@ -2570,8 +2527,8 @@ msgid "Time&outs..."
msgstr "Тайма&уты..." msgstr "Тайма&уты..."
#: pysollib/tile/menubar.py:503 #: pysollib/tile/menubar.py:503
msgid "T&heme" msgid "Set t&heme"
msgstr "" msgstr "Установить &тему"
#: pysollib/tile/menubar.py:505 pysollib/tk/menubar.py:499 #: pysollib/tile/menubar.py:505 pysollib/tk/menubar.py:499
msgid "&Toolbar" msgid "&Toolbar"
@ -2674,11 +2631,11 @@ msgstr "Выбрать "
msgid "Select table background" msgid "Select table background"
msgstr "Выбрать фоновое изображение" msgstr "Выбрать фоновое изображение"
#: pysollib/tile/menubar.py:1332 #: pysollib/tile/menubar.py:1331
msgid "Change theme" msgid "Change theme"
msgstr "Изменение темы" msgstr "Изменение темы"
#: pysollib/tile/menubar.py:1333 #: pysollib/tile/menubar.py:1332
msgid "" msgid ""
"This settings will take effect\n" "This settings will take effect\n"
"the next time you restart " "the next time you restart "
@ -2695,12 +2652,12 @@ msgstr ""
"\n" "\n"
"Пожалуйста введите Ваше имя" "Пожалуйста введите Ваше имя"
#: pysollib/tile/playeroptionsdialog.py:84 #: pysollib/tile/playeroptionsdialog.py:83
#: pysollib/tk/playeroptionsdialog.py:124 #: pysollib/tk/playeroptionsdialog.py:124
msgid "Confirm quit" msgid "Confirm quit"
msgstr "Подтверждение выхода" msgstr "Подтверждение выхода"
#: pysollib/tile/playeroptionsdialog.py:88 #: pysollib/tile/playeroptionsdialog.py:86
#: pysollib/tk/playeroptionsdialog.py:128 #: pysollib/tk/playeroptionsdialog.py:128
msgid "Update statistics and logs" msgid "Update statistics and logs"
msgstr "Обновлять статистику и лог" msgstr "Обновлять статистику и лог"
@ -2761,37 +2718,37 @@ msgstr "Большие колоды"
msgid "XLarge cardsets" msgid "XLarge cardsets"
msgstr "Очень большие колоды" msgstr "Очень большие колоды"
#: pysollib/tile/selectcardset.py:242 pysollib/tk/menubar.py:1122
#: pysollib/tk/menubar.py:1124 pysollib/tk/selectcardset.py:241
msgid "&Load"
msgstr "&Загрузить"
#: pysollib/tile/selectcardset.py:242 pysollib/tk/menubar.py:1124 #: pysollib/tile/selectcardset.py:242 pysollib/tk/menubar.py:1124
msgid "&Info..." msgid "&Info..."
msgstr "&Информация..." msgstr "&Информация..."
#: pysollib/tile/selectcardset.py:319 pysollib/tk/selectcardset.py:320 #: pysollib/tile/selectcardset.py:243 pysollib/tk/menubar.py:1122
#: pysollib/tk/menubar.py:1124 pysollib/tk/selectcardset.py:241
msgid "&Load"
msgstr "&Загрузить"
#: pysollib/tile/selectcardset.py:320 pysollib/tk/selectcardset.py:320
msgid "About cardset" msgid "About cardset"
msgstr "О наборе карт" msgstr "О наборе карт"
#: pysollib/tile/selectcardset.py:335 pysollib/tile/selectgame.py:364 #: pysollib/tile/selectcardset.py:336 pysollib/tile/selectgame.py:364
#: pysollib/tk/selectcardset.py:336 pysollib/tk/selectgame.py:365 #: pysollib/tk/selectcardset.py:336 pysollib/tk/selectgame.py:365
msgid "Type:" msgid "Type:"
msgstr "Тип:" msgstr "Тип:"
#: pysollib/tile/selectcardset.py:336 pysollib/tk/selectcardset.py:337 #: pysollib/tile/selectcardset.py:337 pysollib/tk/selectcardset.py:337
msgid "Styles:" msgid "Styles:"
msgstr "Стиль:" msgstr "Стиль:"
#: pysollib/tile/selectcardset.py:337 pysollib/tk/selectcardset.py:338 #: pysollib/tile/selectcardset.py:338 pysollib/tk/selectcardset.py:338
msgid "Nationality:" msgid "Nationality:"
msgstr "Национальность:" msgstr "Национальность:"
#: pysollib/tile/selectcardset.py:338 pysollib/tk/selectcardset.py:339 #: pysollib/tile/selectcardset.py:339 pysollib/tk/selectcardset.py:339
msgid "Year:" msgid "Year:"
msgstr "Год:" msgstr "Год:"
#: pysollib/tile/selectcardset.py:340 pysollib/tk/selectcardset.py:341 #: pysollib/tile/selectcardset.py:341 pysollib/tk/selectcardset.py:341
msgid "Size:" msgid "Size:"
msgstr "Размер:" msgstr "Размер:"
@ -2847,27 +2804,27 @@ msgstr "Популярные игры"
msgid "by Skill Level" msgid "by Skill Level"
msgstr "По уровню мастерства" msgstr "По уровню мастерства"
#: pysollib/tile/selectgame.py:171 pysollib/tile/selectgame.py:532 #: pysollib/tile/selectgame.py:171 pysollib/tile/selectgame.py:533
#: pysollib/tk/selectgame.py:170 pysollib/tk/selectgame.py:533 #: pysollib/tk/selectgame.py:170 pysollib/tk/selectgame.py:533
msgid "Luck only" msgid "Luck only"
msgstr "Только на везение" msgstr "Только на везение"
#: pysollib/tile/selectgame.py:172 pysollib/tile/selectgame.py:533 #: pysollib/tile/selectgame.py:172 pysollib/tile/selectgame.py:534
#: pysollib/tk/selectgame.py:171 pysollib/tk/selectgame.py:534 #: pysollib/tk/selectgame.py:171 pysollib/tk/selectgame.py:534
msgid "Mostly luck" msgid "Mostly luck"
msgstr "В основном на везение" msgstr "В основном на везение"
#: pysollib/tile/selectgame.py:173 pysollib/tile/selectgame.py:534 #: pysollib/tile/selectgame.py:173 pysollib/tile/selectgame.py:535
#: pysollib/tk/selectgame.py:172 pysollib/tk/selectgame.py:535 #: pysollib/tk/selectgame.py:172 pysollib/tk/selectgame.py:535
msgid "Balanced" msgid "Balanced"
msgstr "Сбалансированные" msgstr "Сбалансированные"
#: pysollib/tile/selectgame.py:174 pysollib/tile/selectgame.py:535 #: pysollib/tile/selectgame.py:174 pysollib/tile/selectgame.py:536
#: pysollib/tk/selectgame.py:173 pysollib/tk/selectgame.py:536 #: pysollib/tk/selectgame.py:173 pysollib/tk/selectgame.py:536
msgid "Mostly skill" msgid "Mostly skill"
msgstr "В основном на мастерство" msgstr "В основном на мастерство"
#: pysollib/tile/selectgame.py:175 pysollib/tile/selectgame.py:536 #: pysollib/tile/selectgame.py:175 pysollib/tile/selectgame.py:537
#: pysollib/tk/selectgame.py:174 pysollib/tk/selectgame.py:537 #: pysollib/tk/selectgame.py:174 pysollib/tk/selectgame.py:537
msgid "Skill only" msgid "Skill only"
msgstr "Только на мастерство" msgstr "Только на мастерство"
@ -3030,13 +2987,13 @@ msgstr "Выиграл:"
msgid "Lost:" msgid "Lost:"
msgstr "Проиграл:" msgstr "Проиграл:"
#: pysollib/tile/selectgame.py:372 pysollib/tile/tkstats.py:586 #: pysollib/tile/selectgame.py:372 pysollib/tile/tkstats.py:615
#: pysollib/tk/selectgame.py:373 pysollib/tk/tkstats.py:736 #: pysollib/tk/selectgame.py:373 pysollib/tk/tkstats.py:736
#: data/glade-translations:18 #: data/glade-translations:18
msgid "Playing time:" msgid "Playing time:"
msgstr "Игровое время:" msgstr "Игровое время:"
#: pysollib/tile/selectgame.py:373 pysollib/tile/tkstats.py:593 #: pysollib/tile/selectgame.py:373 pysollib/tile/tkstats.py:622
#: pysollib/tk/selectgame.py:374 pysollib/tk/tkstats.py:743 #: pysollib/tk/selectgame.py:374 pysollib/tk/tkstats.py:743
#: data/glade-translations:19 #: data/glade-translations:19
msgid "Moves:" msgid "Moves:"
@ -3050,15 +3007,15 @@ msgstr "% побед:"
msgid "&Rules" msgid "&Rules"
msgstr "&Правила" msgstr "&Правила"
#: pysollib/tile/selectgame.py:485 pysollib/tk/selectgame.py:486 #: pysollib/tile/selectgame.py:486 pysollib/tk/selectgame.py:486
msgid "Playable Preview - " msgid "Playable Preview - "
msgstr "Играемый предпросмотр - " msgstr "Играемый предпросмотр - "
#: pysollib/tile/selectgame.py:539 pysollib/tk/selectgame.py:540 #: pysollib/tile/selectgame.py:540 pysollib/tk/selectgame.py:540
msgid "variable" msgid "variable"
msgstr "переменное кол-во" msgstr "переменное кол-во"
#: pysollib/tile/selectgame.py:540 pysollib/tk/selectgame.py:541 #: pysollib/tile/selectgame.py:541 pysollib/tk/selectgame.py:541
msgid "unlimited" msgid "unlimited"
msgstr "неограниченное кол-во" msgstr "неограниченное кол-во"
@ -3090,7 +3047,7 @@ msgstr "Все фоновые изображения"
msgid "&Solid color..." msgid "&Solid color..."
msgstr "М&онотонный цвет..." msgstr "М&онотонный цвет..."
#: pysollib/tile/selecttile.py:177 pysollib/tk/selecttile.py:178 #: pysollib/tile/selecttile.py:178 pysollib/tk/selecttile.py:178
msgid "Select table color" msgid "Select table color"
msgstr "Выбрать цвет" msgstr "Выбрать цвет"
@ -3332,37 +3289,41 @@ msgstr "&Все игры..."
msgid "&Reset..." msgid "&Reset..."
msgstr "О&чистить..." msgstr "О&чистить..."
#: pysollib/tile/tkstats.py:374 pysollib/tile/tkstats.py:427 #: pysollib/tile/tkstats.py:380
#: pysollib/tile/tkstats.py:445 pysollib/tk/tkstats.py:513 msgid "&Play this game"
msgstr "&Выбрать игру"
#: pysollib/tile/tkstats.py:382 pysollib/tile/tkstats.py:451
#: pysollib/tile/tkstats.py:474 pysollib/tk/tkstats.py:513
#: pysollib/tk/tkstats.py:579 pysollib/tk/tkstats.py:594 #: pysollib/tk/tkstats.py:579 pysollib/tk/tkstats.py:594
msgid "&Save to file" msgid "&Save to file"
msgstr "&Сохранить в файл" msgstr "&Сохранить в файл"
#: pysollib/tile/tkstats.py:375 pysollib/tk/tkstats.py:514 #: pysollib/tile/tkstats.py:383 pysollib/tk/tkstats.py:514
msgid "&Reset all..." msgid "&Reset all..."
msgstr "О&чистить все..." msgstr "О&чистить все..."
#: pysollib/tile/tkstats.py:426 pysollib/tk/tkstats.py:579 #: pysollib/tile/tkstats.py:450 pysollib/tk/tkstats.py:579
msgid "Session &log..." msgid "Session &log..."
msgstr "&Лог сессии..." msgstr "&Лог сессии..."
#: pysollib/tile/tkstats.py:444 pysollib/tk/tkstats.py:594 #: pysollib/tile/tkstats.py:473 pysollib/tk/tkstats.py:594
msgid "&Full log..." msgid "&Full log..."
msgstr "&Полный лог..." msgstr "&Полный лог..."
#: pysollib/tile/tkstats.py:460 pysollib/tk/tkstats.py:609 #: pysollib/tile/tkstats.py:489 pysollib/tk/tkstats.py:609
msgid "Highlight piles: " msgid "Highlight piles: "
msgstr "Подсветка групп: " msgstr "Подсветка групп: "
#: pysollib/tile/tkstats.py:461 pysollib/tk/tkstats.py:610 #: pysollib/tile/tkstats.py:490 pysollib/tk/tkstats.py:610
msgid "Highlight cards: " msgid "Highlight cards: "
msgstr "Подсветка карт: " msgstr "Подсветка карт: "
#: pysollib/tile/tkstats.py:462 pysollib/tk/tkstats.py:611 #: pysollib/tile/tkstats.py:491 pysollib/tk/tkstats.py:611
msgid "Highlight same rank: " msgid "Highlight same rank: "
msgstr "Подсветка карт одного достоинства: " msgstr "Подсветка карт одного достоинства: "
#: pysollib/tile/tkstats.py:465 pysollib/tk/tkstats.py:614 #: pysollib/tile/tkstats.py:494 pysollib/tk/tkstats.py:614
msgid "" msgid ""
"\n" "\n"
"Redeals: " "Redeals: "
@ -3370,7 +3331,7 @@ msgstr ""
"\n" "\n"
"Раздач: " "Раздач: "
#: pysollib/tile/tkstats.py:466 pysollib/tk/tkstats.py:615 #: pysollib/tile/tkstats.py:495 pysollib/tk/tkstats.py:615
msgid "" msgid ""
"\n" "\n"
"Cards in Talon: " "Cards in Talon: "
@ -3378,7 +3339,7 @@ msgstr ""
"\n" "\n"
"Карт в колоде: " "Карт в колоде: "
#: pysollib/tile/tkstats.py:468 pysollib/tk/tkstats.py:617 #: pysollib/tile/tkstats.py:497 pysollib/tk/tkstats.py:617
msgid "" msgid ""
"\n" "\n"
"Cards in Waste: " "Cards in Waste: "
@ -3386,7 +3347,7 @@ msgstr ""
"\n" "\n"
"Карт в сбросе: " "Карт в сбросе: "
#: pysollib/tile/tkstats.py:470 pysollib/tk/tkstats.py:619 #: pysollib/tile/tkstats.py:499 pysollib/tk/tkstats.py:619
msgid "" msgid ""
"\n" "\n"
"Cards in Foundations: " "Cards in Foundations: "
@ -3394,79 +3355,79 @@ msgstr ""
"\n" "\n"
"Карт в игре: " "Карт в игре: "
#: pysollib/tile/tkstats.py:473 pysollib/tk/tkstats.py:622 #: pysollib/tile/tkstats.py:502 pysollib/tk/tkstats.py:622
msgid "Game status" msgid "Game status"
msgstr "Статус игры" msgstr "Статус игры"
#: pysollib/tile/tkstats.py:476 pysollib/tk/tkstats.py:625 #: pysollib/tile/tkstats.py:505 pysollib/tk/tkstats.py:625
msgid "Playing time: " msgid "Playing time: "
msgstr "Игровое время: " msgstr "Игровое время: "
#: pysollib/tile/tkstats.py:477 pysollib/tk/tkstats.py:626 #: pysollib/tile/tkstats.py:506 pysollib/tk/tkstats.py:626
msgid "Started at: " msgid "Started at: "
msgstr "Игра начата: " msgstr "Игра начата: "
#: pysollib/tile/tkstats.py:478 pysollib/tk/tkstats.py:627 #: pysollib/tile/tkstats.py:507 pysollib/tk/tkstats.py:627
msgid "Moves: " msgid "Moves: "
msgstr "Ходов: " msgstr "Ходов: "
#: pysollib/tile/tkstats.py:479 pysollib/tk/tkstats.py:628 #: pysollib/tile/tkstats.py:508 pysollib/tk/tkstats.py:628
msgid "Undo moves: " msgid "Undo moves: "
msgstr "Отменено ходов: " msgstr "Отменено ходов: "
#: pysollib/tile/tkstats.py:480 pysollib/tk/tkstats.py:629 #: pysollib/tile/tkstats.py:509 pysollib/tk/tkstats.py:629
msgid "Bookmark moves: " msgid "Bookmark moves: "
msgstr "Ходов по закладкам: " msgstr "Ходов по закладкам: "
#: pysollib/tile/tkstats.py:481 pysollib/tk/tkstats.py:630 #: pysollib/tile/tkstats.py:510 pysollib/tk/tkstats.py:630
msgid "Demo moves: " msgid "Demo moves: "
msgstr "Демо ходов: " msgstr "Демо ходов: "
#: pysollib/tile/tkstats.py:482 pysollib/tk/tkstats.py:631 #: pysollib/tile/tkstats.py:511 pysollib/tk/tkstats.py:631
msgid "Total player moves: " msgid "Total player moves: "
msgstr "Всего ходов игрока:" msgstr "Всего ходов игрока:"
#: pysollib/tile/tkstats.py:483 pysollib/tk/tkstats.py:632 #: pysollib/tile/tkstats.py:512 pysollib/tk/tkstats.py:632
msgid "Total moves in this game: " msgid "Total moves in this game: "
msgstr "Всего ходов в этой игре: " msgstr "Всего ходов в этой игре: "
#: pysollib/tile/tkstats.py:484 pysollib/tk/tkstats.py:633 #: pysollib/tile/tkstats.py:513 pysollib/tk/tkstats.py:633
msgid "Hints: " msgid "Hints: "
msgstr "Подсказок: " msgstr "Подсказок: "
#: pysollib/tile/tkstats.py:488 pysollib/tk/tkstats.py:637 #: pysollib/tile/tkstats.py:517 pysollib/tk/tkstats.py:637
msgid "&Statistics..." msgid "&Statistics..."
msgstr "&Статистика..." msgstr "&Статистика..."
#: pysollib/tile/tkstats.py:513 pysollib/tk/tkstats.py:663 #: pysollib/tile/tkstats.py:542 pysollib/tk/tkstats.py:663
msgid "N" msgid "N"
msgstr "N" msgstr "N"
#: pysollib/tile/tkstats.py:522 pysollib/tk/tkstats.py:672 #: pysollib/tile/tkstats.py:551 pysollib/tk/tkstats.py:672
msgid "Result" msgid "Result"
msgstr "Результат" msgstr "Результат"
#: pysollib/tile/tkstats.py:578 pysollib/tk/tkstats.py:728 #: pysollib/tile/tkstats.py:607 pysollib/tk/tkstats.py:728
#: data/glade-translations:21 #: data/glade-translations:21
msgid "Minimum" msgid "Minimum"
msgstr "Минимум" msgstr "Минимум"
#: pysollib/tile/tkstats.py:579 pysollib/tk/tkstats.py:729 #: pysollib/tile/tkstats.py:608 pysollib/tk/tkstats.py:729
#: data/glade-translations:22 #: data/glade-translations:22
msgid "Maximum" msgid "Maximum"
msgstr "Максимум" msgstr "Максимум"
#: pysollib/tile/tkstats.py:580 pysollib/tk/tkstats.py:730 #: pysollib/tile/tkstats.py:609 pysollib/tk/tkstats.py:730
#: data/glade-translations:23 #: data/glade-translations:23
msgid "Average" msgid "Average"
msgstr "Среднее" msgstr "Среднее"
#: pysollib/tile/tkstats.py:600 pysollib/tk/tkstats.py:750 #: pysollib/tile/tkstats.py:629 pysollib/tk/tkstats.py:750
#: data/glade-translations:20 #: data/glade-translations:20
msgid "Total moves:" msgid "Total moves:"
msgstr "Всего ходов:" msgstr "Всего ходов:"
#: pysollib/tile/tkstats.py:631 pysollib/tk/tkstats.py:781 #: pysollib/tile/tkstats.py:660 pysollib/tk/tkstats.py:781
msgid "No TOP for this game" msgid "No TOP for this game"
msgstr "TOP для текущей игры отсутствует" msgstr "TOP для текущей игры отсутствует"
@ -3550,7 +3511,7 @@ msgstr "Игрок"
msgid "Player options" msgid "Player options"
msgstr "Установки игрока" msgstr "Установки игрока"
#: pysollib/tile/toolbar.py:492 pysollib/tk/toolbar.py:466 #: pysollib/tile/toolbar.py:490 pysollib/tk/toolbar.py:466
msgid "Toolbar" msgid "Toolbar"
msgstr "Панель инструментов" msgstr "Панель инструментов"
@ -3629,3 +3590,40 @@ msgstr "Все игры"
#: data/glade-translations:57 #: data/glade-translations:57
msgid "Set font" msgid "Set font"
msgstr "Настроить шрифт" msgstr "Настроить шрифт"
#~ msgid ""
#~ "\n"
#~ "and #%d in the %s of total moves"
#~ msgstr ""
#~ "\n"
#~ "и #%d в %s общего количества ходов"
#~ msgid ""
#~ "\n"
#~ "You have reached\n"
#~ "#%d in the %s of total moves"
#~ msgstr ""
#~ "\n"
#~ "Вы достигли\n"
#~ "#%d в %s общего количества ходов"
#~ msgid "%s installation problem"
#~ msgstr "%s проблема с установкой"
#~ msgid ""
#~ "Your Python installation is compiled without thread support.\n"
#~ "\n"
#~ "Sounds and background music will be disabled."
#~ msgstr ""
#~ "Ваш дистрибутив Python собран без поддержки нитей.\n"
#~ "\n"
#~ "Звук и фоновая музыка будут недоступны."
#~ msgid ""
#~ "The pysolsoundserver module was not found.\n"
#~ "\n"
#~ "Sounds and background music will be disabled."
#~ msgstr ""
#~ "Модуль pysolsoundserver не найден.\n"
#~ "\n"
#~ "Звук и фоновая музыка будут недоступны."

7
pysollib/actions.py
View file

@ -559,6 +559,7 @@ class PysolMenubarActions:
def mPlayerStats(self, *args, **kw): def mPlayerStats(self, *args, **kw):
mode = kw.get("mode", 101) mode = kw.get("mode", 101)
demo = 0 demo = 0
gameid = None
while mode > 0: while mode > 0:
if mode > 1000: if mode > 1000:
demo = not demo demo = not demo
@ -581,6 +582,7 @@ class PysolMenubarActions:
elif mode == 102: elif mode == 102:
header = p1 + _("Statistics") + p2 header = p1 + _("Statistics") + p2
d = AllGames_StatsDialog(self.top, header, self.app, player) d = AllGames_StatsDialog(self.top, header, self.app, player)
gameid = d.selected_game
elif mode == 103: elif mode == 103:
header = p1 + _("Full log") + p2 header = p1 + _("Full log") + p2
d = FullLog_StatsDialog(self.top, header, self.app, player) d = FullLog_StatsDialog(self.top, header, self.app, player)
@ -621,8 +623,9 @@ class PysolMenubarActions:
self.game.updateStatus(stats=self.app.stats.getStats(self.app.opt.player, self.game.id)) self.game.updateStatus(stats=self.app.stats.getStats(self.app.opt.player, self.game.id))
elif mode == 401: elif mode == 401:
# start a new game with a gameid # start a new game with a gameid
## TODO if gameid:
pass self.game.endGame()
self.game.quitGame(gameid)
elif mode == 402: elif mode == 402:
# start a new game with a gameid / gamenumber # start a new game with a gameid / gamenumber
## TODO ## TODO

4
pysollib/app.py
View file

@ -208,7 +208,7 @@ class Options:
self.mouse_undo = False # use mouse for undo/redo self.mouse_undo = False # use mouse for undo/redo
self.negative_bottom = True self.negative_bottom = True
self.randomize_place = False self.randomize_place = False
self.cache_carsets = True self.cache_cardsets = True
# defaults & constants # defaults & constants
self.setDefaults() self.setDefaults()
self.setConstants() self.setConstants()
@ -1035,7 +1035,7 @@ class Application:
if not images.load(app=self, progress=progress): if not images.load(app=self, progress=progress):
raise Exception, "Invalid or damaged "+CARDSET raise Exception, "Invalid or damaged "+CARDSET
simages = SubsampledImages(images) simages = SubsampledImages(images)
if self.opt.cache_carsets: if self.opt.cache_cardsets:
c = self.cardsets_cache.get(cs.type) c = self.cardsets_cache.get(cs.type)
if c: if c:
##c[1].destruct() ##c[1].destruct()

37
pysollib/game.py
View file

@ -583,6 +583,8 @@ class Game:
if self.preview: if self.preview:
return return
self.app.wm_save_state() self.app.wm_save_state()
if self.pause:
self.doPause()
if holdgame: if holdgame:
return return
if bookmark: if bookmark:
@ -1251,11 +1253,10 @@ class Game:
self.stopPlayTimer() self.stopPlayTimer()
won, status, updated = self.getWinStatus() won, status, updated = self.getWinStatus()
if demo and self.getPlayerMoves() == 0: if demo and self.getPlayerMoves() == 0:
# a pure demo game - update demo stats if not self.stats.demo_updated:
self.stats.demo_updated = updated # a pure demo game - update demo stats
self.app.stats.updateStats(None, self, won) self.stats.demo_updated = updated
if won: self.app.stats.updateStats(None, self, won)
self.finished = True
return '' return ''
elif self.changed(): elif self.changed():
# must update player stats # must update player stats
@ -1265,18 +1266,18 @@ class Game:
self.updateStatus(stats=self.app.stats.getStats(self.app.opt.player, self.id)) self.updateStatus(stats=self.app.stats.getStats(self.app.opt.player, self.id))
top_msg = '' top_msg = ''
if ret: if ret:
if ret[0]: # playing time if ret[0]: # playing time
top_msg = _('\nYou have reached\n#%d in the %s of playing time') % (ret[0], TOP_TITLE) top_msg = _('''
if 1 and ret[1]: # moves You have reached
#%d in the %s of playing time''') % (ret[0], TOP_TITLE)
if ret[1]: # moves
if top_msg: if top_msg:
top_msg += _('\nand #%d in the %s of moves') % (ret[1], TOP_TITLE) top_msg += _('''
and #%d in the %s of moves''') % (ret[1], TOP_TITLE)
else: else:
top_msg = _('\nYou have reached\n#%d in the %s of moves') % (ret[1], TOP_TITLE) top_msg = _('''
if 0 and ret[2]: # total moves You have reached
if top_msg: #%d in the %s of moves''') % (ret[1], TOP_TITLE)
top_msg += _('\nand #%d in the %s of total moves') % (ret[1], TOP_TITLE)
else:
top_msg = _('\nYou have reached\n#%d in the %s of total moves') % (ret[1], TOP_TITLE)
return top_msg return top_msg
elif not demo: elif not demo:
# only update the session log # only update the session log
@ -1842,12 +1843,12 @@ for %d moves.
d, status = None, 0 d, status = None, 0
bitmap = "info" bitmap = "info"
timeout = 10000 timeout = 10000
if player_moves == 0: if 1 and player_moves == 0:
timeout = 5000 timeout = 5000
## if 0 and DEBUG and self.demo.mixed:
## timeout = 1000
if self.isGameWon(): if self.isGameWon():
self.updateTime()
finished = 1 finished = 1
self.finished = True
self.stopPlayTimer() self.stopPlayTimer()
if not self.top.winfo_ismapped(): if not self.top.winfo_ismapped():
status = 2 status = 2

1
pysollib/gamedb.py
View file

@ -354,6 +354,7 @@ class GI:
2, # Klondike 2, # Klondike
7, # Picture Galary 7, # Picture Galary
8, # FreeCell 8, # FreeCell
9, # Seahaven Towers
11, # Spider 11, # Spider
12, # Braid 12, # Braid
13, # Forty Thieves 13, # Forty Thieves

2
pysollib/tile/Tile.py
View file

@ -493,7 +493,7 @@ class Treeview(Widget, Tkinter.Listbox):
def selection(self): def selection(self):
"""Returns the list of selected items""" """Returns the list of selected items"""
pass return self.tk.call(self._w, "selection")
def selection_set(self, items): def selection_set(self, items):
"""items becomes the new selection. """ """items becomes the new selection. """

2
pysollib/tile/menubar.py
View file

@ -500,7 +500,7 @@ class PysolMenubar(PysolMenubarActions):
menu.add_command(label=n_("&Colors..."), command=self.mOptColors) menu.add_command(label=n_("&Colors..."), command=self.mOptColors)
menu.add_command(label=n_("Time&outs..."), command=self.mOptTimeouts) menu.add_command(label=n_("Time&outs..."), command=self.mOptTimeouts)
menu.add_separator() menu.add_separator()
submenu = MfxMenu(menu, label=n_("T&heme")) submenu = MfxMenu(menu, label=n_("Set t&heme"))
self.createThemesMenu(submenu) self.createThemesMenu(submenu)
submenu = MfxMenu(menu, label=n_("&Toolbar")) submenu = MfxMenu(menu, label=n_("&Toolbar"))
createToolbarMenu(self, submenu) createToolbarMenu(self, submenu)

37
pysollib/tile/tkstats.py
View file

@ -268,11 +268,13 @@ class TreeFormatter(PysolStatsFormatter):
self.tree.column(column, width=tab) self.tree.column(column, width=tab)
for result in self.getStatResults(player, sort_by): for result in self.getStatResults(player, sort_by):
# result == [name, won+lost, won, lost, time, moves, perc, id]
t1, t2, t3, t4, t5, t6, t7, t8 = result t1, t2, t3, t4, t5, t6, t7, t8 = result
t1=gettext(t1) # game name t1=gettext(t1) # game name
id = self.tree.insert(None, "end", text=t1, id = self.tree.insert(None, "end", text=t1,
values=(t2, t3, t4, t5, t6, t7)) values=(t2, t3, t4, t5, t6, t7))
self.parent_window.tree_items.append(id) self.parent_window.tree_items.append(id)
self.parent_window.games[id] = t8
total, played, won, lost, time, moves, perc = self.getStatSummary() total, played, won, lost, time, moves, perc = self.getStatSummary()
text = _("Total (%d out of %d games)") % (played, total) text = _("Total (%d out of %d games)") % (played, total)
@ -344,6 +346,8 @@ class AllGames_StatsDialog(MfxDialog):
self.sort_by = 'name' self.sort_by = 'name'
self.tree_items = [] self.tree_items = []
self.tree_tabs = None self.tree_tabs = None
self.games = {} # tree_itemid: gameid
self.selected_game = None
# #
kwdefault(kw, width=self.CHAR_W*64, height=lines*self.CHAR_H) kwdefault(kw, width=self.CHAR_W*64, height=lines*self.CHAR_H)
kw = self.initKw(kw) kw = self.initKw(kw)
@ -358,18 +362,23 @@ class AllGames_StatsDialog(MfxDialog):
frame.pack(fill='both', expand=True, padx=kw.padx, pady=kw.pady) frame.pack(fill='both', expand=True, padx=kw.padx, pady=kw.pady)
sb = Tkinter.Scrollbar(frame) sb = Tkinter.Scrollbar(frame)
sb.pack(side='right', fill='y') sb.pack(side='right', fill='y')
self.tree = Tkinter.Treeview(frame, columns=self.COLUMNS) self.tree = Tkinter.Treeview(frame, columns=self.COLUMNS,
selectmode='browse')
self.tree.pack(side='left', fill='both', expand=True) self.tree.pack(side='left', fill='both', expand=True)
self.tree.config(yscrollcommand=sb.set) self.tree.config(yscrollcommand=sb.set)
sb.config(command=self.tree.yview) sb.config(command=self.tree.yview)
self.fillCanvas(player, title) bind(self.tree, '<<TreeviewSelect>>', self.treeviewSelected)
# #
focus = self.createButtons(bottom_frame, kw) focus = self.createButtons(bottom_frame, kw)
self.fillCanvas(player, title)
#run_button = self.buttons[0]
#run_button.config(state='disabled')
self.mainloop(focus, kw.timeout) self.mainloop(focus, kw.timeout)
def initKw(self, kw): def initKw(self, kw):
kw = KwStruct(kw, kw = KwStruct(kw,
strings=(_("&OK"), strings=((_("&Play this game"), 401),
"sep", _("&OK"),
(_("&Save to file"), 202), (_("&Save to file"), 202),
(_("&Reset all..."), 301),), (_("&Reset all..."), 301),),
default=0, default=0,
@ -379,11 +388,25 @@ class AllGames_StatsDialog(MfxDialog):
) )
return MfxDialog.initKw(self, kw) return MfxDialog.initKw(self, kw)
def mDone(self, button):
sel = self.tree.selection()
if sel and len(sel) == 1:
self.selected_game = self.games[sel[0]]
MfxDialog.mDone(self, button)
def destroy(self): def destroy(self):
self.app = None self.app = None
self.tree.destroy() self.tree.destroy()
MfxDialog.destroy(self) MfxDialog.destroy(self)
def treeviewSelected(self, *args):
sel = self.tree.selection()
run_button = self.buttons[0]
if sel and len(sel) == 1:
run_button.config(state='normal')
else:
run_button.config(state='disabled')
def headerClick(self, column): def headerClick(self, column):
if column == '#0': if column == '#0':
sort_by = 'name' sort_by = 'name'
@ -404,6 +427,9 @@ class AllGames_StatsDialog(MfxDialog):
formatter = TreeFormatter(self.app, self.tree, self, formatter = TreeFormatter(self.app, self.tree, self,
self.font, self.CHAR_W, self.CHAR_H) self.font, self.CHAR_W, self.CHAR_H)
formatter.writeStats(player, sort_by=self.sort_by) formatter.writeStats(player, sort_by=self.sort_by)
if self.buttons:
run_button = self.buttons[0]
run_button.config(state='disabled')
# /*********************************************************************** # /***********************************************************************
@ -427,6 +453,11 @@ class FullLog_StatsDialog(AllGames_StatsDialog):
) )
return AllGames_StatsDialog.initKw(self, kw) return AllGames_StatsDialog.initKw(self, kw)
def mDone(self, button):
MfxDialog.mDone(self, button)
def treeviewSelected(self, *args):
pass
def headerClick(self, column): def headerClick(self, column):
pass pass

2
pysollib/tile/tkwidget.py
View file

@ -231,6 +231,8 @@ class MfxDialog: # ex. _ToplevelDialog
column += 1 column += 1
if column >= sep_column: if column >= sep_column:
widget.config(width=button_width) widget.config(width=button_width)
else:
widget.config(width=len(s))
if accel_indx >= 0: if accel_indx >= 0:
# key accelerator # key accelerator
widget.config(underline=accel_indx) widget.config(underline=accel_indx)