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

* updated gtk-binding

* updated ru.po


git-svn-id: file:///home/shlomif/Backup/svn-dumps/PySolFC/svnsync-repos/pysolfc/PySolFC/trunk@168 efabe8c0-fbe8-4139-b769-b5e6d273206e
This commit is contained in:
skomoroh 2007-05-19 21:16:57 +00:00
parent 2aa94c2858
commit 82002d061f
9 changed files with 446 additions and 379 deletions

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: Fri May 11 22:05:05 2007\n" "POT-Creation-Date: Sat May 19 16:39:10 2007\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"

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: Fri May 11 22:06:13 2007\n" "POT-Creation-Date: Sat May 19 16:40:21 2007\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.6con\n" "Generated-By: pygettext.py 1.6con\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: 2007-05-11 22:06+0400\n" "POT-Creation-Date: 2007-05-19 16:40+0400\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"
@ -32,49 +32,49 @@ msgstr ""
"Content-Type: text/plain; charset=CHARSET\n" "Content-Type: text/plain; charset=CHARSET\n"
"Content-Transfer-Encoding: 8bit\n" "Content-Transfer-Encoding: 8bit\n"
#: pysollib/actions.py:263 pysollib/tile/toolbar.py:186 #: pysollib/actions.py:267 pysollib/tile/toolbar.py:186
#: pysollib/tk/toolbar.py:189 #: pysollib/tk/toolbar.py:189
msgid "New game" msgid "New game"
msgstr "" msgstr ""
#: pysollib/actions.py:276 pysollib/tile/menubar.py:848 #: pysollib/actions.py:280 pysollib/tile/menubar.py:850
#: pysollib/tile/menubar.py:862 pysollib/tk/menubar.py:852 #: pysollib/tile/menubar.py:864 pysollib/tk/menubar.py:854
#: pysollib/tk/menubar.py:866 #: pysollib/tk/menubar.py:868
msgid "Select game" msgid "Select game"
msgstr "" msgstr ""
#: pysollib/actions.py:290 #: pysollib/actions.py:294
msgid "Invalid game number" msgid "Invalid game number"
msgstr "" msgstr ""
#: pysollib/actions.py:291 #: pysollib/actions.py:295
msgid "Invalid game number\n" msgid "Invalid game number\n"
msgstr "" msgstr ""
#: pysollib/actions.py:308 #: pysollib/actions.py:312
msgid "Select next game number" msgid "Select next game number"
msgstr "" msgstr ""
#: pysollib/actions.py:317 pysollib/actions.py:327 #: pysollib/actions.py:321 pysollib/actions.py:331
msgid "Select new game number" msgid "Select new game number"
msgstr "" msgstr ""
#: pysollib/actions.py:318 #: pysollib/actions.py:322
msgid "" msgid ""
"\n" "\n"
"\n" "\n"
"Enter new game number" "Enter new game number"
msgstr "" msgstr ""
#: pysollib/actions.py:319 #: pysollib/actions.py:323
msgid "&Next number" msgid "&Next number"
msgstr "" msgstr ""
#: pysollib/actions.py:319 pysollib/app.py:903 pysollib/app.py:1190 #: pysollib/actions.py:323 pysollib/app.py:906 pysollib/app.py:1193
#: pysollib/app.py:1202 pysollib/game.py:1030 pysollib/game.py:2293 #: pysollib/app.py:1205 pysollib/game.py:1031 pysollib/game.py:2299
#: pysollib/tile/colorsdialog.py:112 pysollib/tile/edittextdialog.py:83 #: pysollib/tile/colorsdialog.py:112 pysollib/tile/edittextdialog.py:83
#: pysollib/tile/fontsdialog.py:144 pysollib/tile/fontsdialog.py:204 #: pysollib/tile/fontsdialog.py:144 pysollib/tile/fontsdialog.py:204
#: pysollib/tile/gameinfodialog.py:155 pysollib/tile/menubar.py:1349 #: pysollib/tile/gameinfodialog.py:155 pysollib/tile/menubar.py:1351
#: pysollib/tile/playeroptionsdialog.py:111 pysollib/tile/selectcardset.py:387 #: pysollib/tile/playeroptionsdialog.py:111 pysollib/tile/selectcardset.py:387
#: pysollib/tile/selecttile.py:161 pysollib/tile/soundoptionsdialog.py:168 #: pysollib/tile/selecttile.py:161 pysollib/tile/soundoptionsdialog.py:168
#: pysollib/tile/soundoptionsdialog.py:206 pysollib/tile/timeoutsdialog.py:94 #: pysollib/tile/soundoptionsdialog.py:206 pysollib/tile/timeoutsdialog.py:94
@ -98,9 +98,9 @@ msgstr ""
msgid "&OK" msgid "&OK"
msgstr "" msgstr ""
#: pysollib/actions.py:319 pysollib/app.py:904 pysollib/app.py:1202 #: pysollib/actions.py:323 pysollib/app.py:907 pysollib/app.py:1205
#: pysollib/game.py:1030 pysollib/game.py:1694 pysollib/game.py:1710 #: pysollib/game.py:1031 pysollib/game.py:1700 pysollib/game.py:1716
#: pysollib/game.py:1717 pysollib/game.py:1723 #: pysollib/game.py:1723 pysollib/game.py:1729
#: pysollib/tile/colorsdialog.py:112 pysollib/tile/edittextdialog.py:83 #: pysollib/tile/colorsdialog.py:112 pysollib/tile/edittextdialog.py:83
#: pysollib/tile/fontsdialog.py:144 pysollib/tile/fontsdialog.py:204 #: pysollib/tile/fontsdialog.py:144 pysollib/tile/fontsdialog.py:204
#: pysollib/tile/playeroptionsdialog.py:111 pysollib/tile/selectcardset.py:237 #: pysollib/tile/playeroptionsdialog.py:111 pysollib/tile/selectcardset.py:237
@ -109,8 +109,8 @@ msgstr ""
#: pysollib/tile/timeoutsdialog.py:94 pysollib/tile/tkwidget.py:329 #: pysollib/tile/timeoutsdialog.py:94 pysollib/tile/tkwidget.py:329
#: pysollib/tile/wizarddialog.py:144 pysollib/tk/colorsdialog.py:111 #: pysollib/tile/wizarddialog.py:144 pysollib/tk/colorsdialog.py:111
#: pysollib/tk/edittextdialog.py:82 pysollib/tk/fontsdialog.py:143 #: pysollib/tk/edittextdialog.py:82 pysollib/tk/fontsdialog.py:143
#: pysollib/tk/fontsdialog.py:205 pysollib/tk/menubar.py:1156 #: pysollib/tk/fontsdialog.py:205 pysollib/tk/menubar.py:1158
#: pysollib/tk/menubar.py:1158 pysollib/tk/playeroptionsdialog.py:85 #: pysollib/tk/menubar.py:1160 pysollib/tk/playeroptionsdialog.py:85
#: pysollib/tk/playeroptionsdialog.py:160 pysollib/tk/selectcardset.py:241 #: pysollib/tk/playeroptionsdialog.py:160 pysollib/tk/selectcardset.py:241
#: pysollib/tk/selectgame.py:265 pysollib/tk/selectgame.py:406 #: pysollib/tk/selectgame.py:265 pysollib/tk/selectgame.py:406
#: pysollib/tk/selecttile.py:159 pysollib/tk/soundoptionsdialog.py:170 #: pysollib/tk/selecttile.py:159 pysollib/tk/soundoptionsdialog.py:170
@ -119,128 +119,128 @@ msgstr ""
msgid "&Cancel" msgid "&Cancel"
msgstr "" msgstr ""
#: pysollib/actions.py:335 #: pysollib/actions.py:339
msgid "Select random game" msgid "Select random game"
msgstr "" msgstr ""
#: pysollib/actions.py:371 #: pysollib/actions.py:375
msgid "Select next game" msgid "Select next game"
msgstr "" msgstr ""
#: pysollib/actions.py:404 pysollib/tile/toolbar.py:200 #: pysollib/actions.py:408 pysollib/tile/toolbar.py:201
#: pysollib/tk/toolbar.py:203 #: pysollib/tk/toolbar.py:204
msgid "Quit " msgid "Quit "
msgstr "" msgstr ""
#: pysollib/actions.py:455 #: pysollib/actions.py:459
msgid "Clear bookmarks" msgid "Clear bookmarks"
msgstr "" msgstr ""
#: pysollib/actions.py:456 #: pysollib/actions.py:460
msgid "Clear all bookmarks ?" msgid "Clear all bookmarks ?"
msgstr "" msgstr ""
#: pysollib/actions.py:466 #: pysollib/actions.py:470
msgid "Restart game" msgid "Restart game"
msgstr "" msgstr ""
#: pysollib/actions.py:467 #: pysollib/actions.py:471
msgid "Restart this game ?" msgid "Restart this game ?"
msgstr "" msgstr ""
#: pysollib/actions.py:513 #: pysollib/actions.py:522
msgid "" msgid ""
"Comments for %s:\n" "Comments for %s:\n"
"\n" "\n"
msgstr "" msgstr ""
#: pysollib/actions.py:515 #: pysollib/actions.py:524
msgid "Comments for " msgid "Comments for "
msgstr "" msgstr ""
#: pysollib/actions.py:533 pysollib/actions.py:561 #: pysollib/actions.py:542 pysollib/actions.py:570
msgid "Error while writing to file" msgid "Error while writing to file"
msgstr "" msgstr ""
#: pysollib/actions.py:536 pysollib/actions.py:564 #: pysollib/actions.py:545 pysollib/actions.py:573
msgid " Info" msgid " Info"
msgstr "" msgstr ""
#: pysollib/actions.py:537 #: pysollib/actions.py:546
msgid "" msgid ""
"Comments were appended to\n" "Comments were appended to\n"
"\n" "\n"
msgstr "" msgstr ""
#: pysollib/actions.py:548 #: pysollib/actions.py:557
msgid "Demo statistics" msgid "Demo statistics"
msgstr "" msgstr ""
#: pysollib/actions.py:551 #: pysollib/actions.py:560
msgid "Your statistics" msgid "Your statistics"
msgstr "" msgstr ""
#: pysollib/actions.py:565 #: pysollib/actions.py:574
msgid "" msgid ""
" were appended to\n" " were appended to\n"
"\n" "\n"
msgstr "" msgstr ""
#: pysollib/actions.py:580 #: pysollib/actions.py:589
msgid " Demo" msgid " Demo"
msgstr "" msgstr ""
#: pysollib/actions.py:580 #: pysollib/actions.py:589
msgid " Demo " msgid " Demo "
msgstr "" msgstr ""
#: pysollib/actions.py:583 pysollib/actions.py:603 #: pysollib/actions.py:592 pysollib/actions.py:612
msgid " for " msgid " for "
msgstr "" msgstr ""
#: pysollib/actions.py:589 pysollib/stats.py:205 #: pysollib/actions.py:598 pysollib/stats.py:205
msgid "Statistics for " msgid "Statistics for "
msgstr "" msgstr ""
#: pysollib/actions.py:593 pysollib/tile/selectgame.py:344 #: pysollib/actions.py:602 pysollib/tile/selectgame.py:344
#: pysollib/tile/tkstats.py:74 pysollib/tile/toolbar.py:197 #: pysollib/tile/tkstats.py:74 pysollib/tile/toolbar.py:198
#: pysollib/tk/selectgame.py:349 pysollib/tk/toolbar.py:200 #: pysollib/tk/selectgame.py:349 pysollib/tk/toolbar.py:201
msgid "Statistics" msgid "Statistics"
msgstr "" msgstr ""
#: pysollib/actions.py:597 pysollib/tile/tkstats.py:526 #: pysollib/actions.py:606 pysollib/tile/tkstats.py:526
#: data/glade-translations:31 #: data/glade-translations:31
msgid "Full log" msgid "Full log"
msgstr "" msgstr ""
#: pysollib/actions.py:600 pysollib/tile/tkstats.py:530 #: pysollib/actions.py:609 pysollib/tile/tkstats.py:530
#: data/glade-translations:32 #: data/glade-translations:32
msgid "Session log" msgid "Session log"
msgstr "" msgstr ""
#: pysollib/actions.py:606 #: pysollib/actions.py:615
msgid "Game Info" msgid "Game Info"
msgstr "" msgstr ""
#: pysollib/actions.py:609 #: pysollib/actions.py:618
msgid "Statistics progression" msgid "Statistics progression"
msgstr "" msgstr ""
#: pysollib/actions.py:625 #: pysollib/actions.py:634
msgid "Reset all statistics" msgid "Reset all statistics"
msgstr "" msgstr ""
#: pysollib/actions.py:626 #: pysollib/actions.py:635
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:632 #: pysollib/actions.py:641
msgid "Reset game statistics" msgid "Reset game statistics"
msgstr "" msgstr ""
#: pysollib/actions.py:633 #: pysollib/actions.py:642
msgid "" msgid ""
"Reset statistics and logs for player\n" "Reset statistics and logs for player\n"
"%s\n" "%s\n"
@ -248,23 +248,23 @@ msgid ""
"%s ?" "%s ?"
msgstr "" msgstr ""
#: pysollib/actions.py:689 #: pysollib/actions.py:698
msgid "Play demo" msgid "Play demo"
msgstr "" msgstr ""
#: pysollib/actions.py:700 #: pysollib/actions.py:709
msgid "Set player options" msgid "Set player options"
msgstr "" msgstr ""
#: pysollib/actions.py:714 data/glade-translations:40 #: pysollib/actions.py:723 data/glade-translations:40
msgid "Set colors" msgid "Set colors"
msgstr "" msgstr ""
#: pysollib/actions.py:731 #: pysollib/actions.py:740
msgid "Set fonts" msgid "Set fonts"
msgstr "" msgstr ""
#: pysollib/actions.py:740 data/glade-translations:33 #: pysollib/actions.py:749 data/glade-translations:33
msgid "Set timeouts" msgid "Set timeouts"
msgstr "" msgstr ""
@ -272,33 +272,33 @@ msgstr ""
msgid "Unknown" msgid "Unknown"
msgstr "" msgstr ""
#: pysollib/app.py:666 #: pysollib/app.py:667
msgid "can't find game: " msgid "can't find game: "
msgstr "" msgstr ""
#: pysollib/app.py:905 pysollib/game.py:1694 pysollib/game.py:1710 #: pysollib/app.py:908 pysollib/game.py:1700 pysollib/game.py:1716
#: pysollib/game.py:1717 pysollib/game.py:1723 pysollib/tile/menubar.py:356 #: pysollib/game.py:1723 pysollib/game.py:1729 pysollib/tile/menubar.py:356
#: pysollib/tk/menubar.py:353 #: pysollib/tk/menubar.py:353
msgid "&New game" msgid "&New game"
msgstr "" msgstr ""
#: pysollib/app.py:1048 #: pysollib/app.py:1051
msgid "Loading %s %s..." msgid "Loading %s %s..."
msgstr "" msgstr ""
#: pysollib/app.py:1087 #: pysollib/app.py:1090
msgid " load error" msgid " load error"
msgstr "" msgstr ""
#: pysollib/app.py:1088 #: pysollib/app.py:1091
msgid "Error while loading " msgid "Error while loading "
msgstr "" msgstr ""
#: pysollib/app.py:1182 #: pysollib/app.py:1185
msgid "Incompatible " msgid "Incompatible "
msgstr "" msgstr ""
#: pysollib/app.py:1184 #: pysollib/app.py:1187
msgid "" msgid ""
"The currently selected %s %s\n" "The currently selected %s %s\n"
"is not compatible with the game\n" "is not compatible with the game\n"
@ -307,49 +307,49 @@ msgid ""
"Please select a %s type %s.\n" "Please select a %s type %s.\n"
msgstr "" msgstr ""
#: pysollib/app.py:1200 #: pysollib/app.py:1203
msgid "Please select a %s type %s" msgid "Please select a %s type %s"
msgstr "" msgstr ""
#: pysollib/app.py:1427 #: pysollib/app.py:1430
msgid "error loading plugin %s: %s" msgid "error loading plugin %s: %s"
msgstr "" msgstr ""
#: pysollib/game.py:949 pysollib/game.py:955 #: pysollib/game.py:950 pysollib/game.py:956
msgid "Player\n" msgid "Player\n"
msgstr "" msgstr ""
#: pysollib/game.py:1026 #: pysollib/game.py:1027
msgid "Discard current game ?" msgid "Discard current game ?"
msgstr "" msgstr ""
#: pysollib/game.py:1647 #: pysollib/game.py:1653
msgid "" msgid ""
"\n" "\n"
"You have reached\n" "You have reached\n"
"#%d in the %s of playing time" "#%d in the %s of playing time"
msgstr "" msgstr ""
#: pysollib/game.py:1652 #: pysollib/game.py:1658
msgid "" msgid ""
"\n" "\n"
"and #%d in the %s of moves" "and #%d in the %s of moves"
msgstr "" msgstr ""
#: pysollib/game.py:1655 #: pysollib/game.py:1661
msgid "" msgid ""
"\n" "\n"
"You have reached\n" "You have reached\n"
"#%d in the %s of moves" "#%d in the %s of moves"
msgstr "" msgstr ""
#: pysollib/game.py:1685 pysollib/game.py:1702 #: pysollib/game.py:1691 pysollib/game.py:1708
#: 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:1686 #: pysollib/game.py:1692
msgid "" msgid ""
"\n" "\n"
"Congratulations, this\n" "Congratulations, this\n"
@ -360,7 +360,7 @@ msgid ""
"%s\n" "%s\n"
msgstr "" msgstr ""
#: pysollib/game.py:1703 #: pysollib/game.py:1709
msgid "" msgid ""
"\n" "\n"
"Congratulations, you did it !\n" "Congratulations, you did it !\n"
@ -370,101 +370,101 @@ msgid ""
"%s\n" "%s\n"
msgstr "" msgstr ""
#: pysollib/game.py:1715 pysollib/game.py:1721 #: pysollib/game.py:1721 pysollib/game.py:1727
#: 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:1716 pysollib/game.py:2294 #: pysollib/game.py:1722 pysollib/game.py:2300
msgid "" msgid ""
"\n" "\n"
"Game finished\n" "Game finished\n"
msgstr "" msgstr ""
#: pysollib/game.py:1722 #: pysollib/game.py:1728
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:1723 #: pysollib/game.py:1729
msgid "&Restart" msgid "&Restart"
msgstr "" msgstr ""
#: pysollib/game.py:2183 #: pysollib/game.py:2189
msgid "Score %6d" msgid "Score %6d"
msgstr "" msgstr ""
#: pysollib/game.py:2285 #: pysollib/game.py:2291
msgid "&Cool" msgid "&Cool"
msgstr "" msgstr ""
#: pysollib/game.py:2285 #: pysollib/game.py:2291
msgid "&Great" msgid "&Great"
msgstr "" msgstr ""
#: pysollib/game.py:2285 #: pysollib/game.py:2291
msgid "&Wow" msgid "&Wow"
msgstr "" msgstr ""
#: pysollib/game.py:2285 #: pysollib/game.py:2291
msgid "&Yeah" msgid "&Yeah"
msgstr "" msgstr ""
#: pysollib/game.py:2286 pysollib/game.py:2297 pysollib/game.py:2309 #: pysollib/game.py:2292 pysollib/game.py:2303 pysollib/game.py:2315
msgid " Autopilot" msgid " Autopilot"
msgstr "" msgstr ""
#: pysollib/game.py:2287 #: pysollib/game.py:2293
msgid "" msgid ""
"\n" "\n"
"Game solved in %d moves.\n" "Game solved in %d moves.\n"
msgstr "" msgstr ""
#: pysollib/game.py:2308 #: pysollib/game.py:2314
msgid "&Hmm" msgid "&Hmm"
msgstr "" msgstr ""
#: pysollib/game.py:2308 #: pysollib/game.py:2314
msgid "&Oh well" msgid "&Oh well"
msgstr "" msgstr ""
#: pysollib/game.py:2308 #: pysollib/game.py:2314
msgid "&That's life" msgid "&That's life"
msgstr "" msgstr ""
#: pysollib/game.py:2310 #: pysollib/game.py:2316
msgid "" msgid ""
"\n" "\n"
"This won't come out...\n" "This won't come out...\n"
msgstr "" msgstr ""
#: pysollib/game.py:2750 #: pysollib/game.py:2756
msgid "Set bookmark" msgid "Set bookmark"
msgstr "" msgstr ""
#: pysollib/game.py:2751 #: pysollib/game.py:2757
msgid "Replace existing bookmark %d ?" msgid "Replace existing bookmark %d ?"
msgstr "" msgstr ""
#: pysollib/game.py:2773 #: pysollib/game.py:2779
msgid "Goto bookmark" msgid "Goto bookmark"
msgstr "" msgstr ""
#: pysollib/game.py:2774 #: pysollib/game.py:2780
msgid "Goto bookmark %d ?" msgid "Goto bookmark %d ?"
msgstr "" msgstr ""
#: pysollib/game.py:2805 #: pysollib/game.py:2811
msgid "Open game" msgid "Open game"
msgstr "" msgstr ""
#: pysollib/game.py:2816 pysollib/game.py:2826 pysollib/game.py:2831 #: pysollib/game.py:2822 pysollib/game.py:2832 pysollib/game.py:2837
msgid "Load game error" msgid "Load game error"
msgstr "" msgstr ""
#: pysollib/game.py:2817 #: pysollib/game.py:2823
msgid "" msgid ""
"Error while loading game.\n" "Error while loading game.\n"
"\n" "\n"
@ -472,37 +472,37 @@ 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:2827 #: pysollib/game.py:2833
msgid "Error while loading game" msgid "Error while loading game"
msgstr "" msgstr ""
#: pysollib/game.py:2832 #: pysollib/game.py:2838
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:2861 pysollib/tile/menubar.py:1391 #: pysollib/game.py:2867 pysollib/tile/menubar.py:1393
#: pysollib/tk/menubar.py:1376 #: pysollib/tk/menubar.py:1378
msgid "Save game error" msgid "Save game error"
msgstr "" msgstr ""
#: pysollib/game.py:2862 #: pysollib/game.py:2868
msgid "Error while saving game" msgid "Error while saving game"
msgstr "" msgstr ""
#: pysollib/game.py:2887 #: pysollib/game.py:2893
msgid "Invalid or damaged %s save file" msgid "Invalid or damaged %s save file"
msgstr "" msgstr ""
#: pysollib/game.py:2901 #: pysollib/game.py:2907
msgid "" msgid ""
"Cannot load games saved with\n" "Cannot load games saved with\n"
"%s version %s" "%s version %s"
msgstr "" msgstr ""
#: pysollib/game.py:2918 #: pysollib/game.py:2924
msgid "" msgid ""
"Cannot load this game from version %s\n" "Cannot load this game from version %s\n"
"as the game rules have changed\n" "as the game rules have changed\n"
@ -751,13 +751,13 @@ msgid ""
msgstr "" msgstr ""
#: pysollib/games/canfield.py:528 pysollib/games/special/tarock.py:224 #: pysollib/games/canfield.py:528 pysollib/games/special/tarock.py:224
#: pysollib/stack.py:1514 pysollib/util.py:85 pysollib/wizardutil.py:158 #: pysollib/stack.py:1514 pysollib/util.py:87 pysollib/wizardutil.py:158
#: pysollib/wizardutil.py:223 #: pysollib/wizardutil.py:223
msgid "King" msgid "King"
msgstr "" msgstr ""
#: pysollib/games/canfield.py:531 pysollib/games/special/tarock.py:224 #: pysollib/games/canfield.py:531 pysollib/games/special/tarock.py:224
#: pysollib/stack.py:1513 pysollib/util.py:85 #: pysollib/stack.py:1513 pysollib/util.py:87
msgid "Queen" msgid "Queen"
msgstr "" msgstr ""
@ -809,42 +809,62 @@ msgstr ""
msgid "Round %d" msgid "Round %d"
msgstr "" msgstr ""
#: pysollib/games/mahjongg/mahjongg.py:307 #: pysollib/games/mahjongg/mahjongg.py:788
msgid "Warning"
msgstr ""
#: pysollib/games/mahjongg/mahjongg.py:789
msgid ""
"Sorry, I can't find\n"
"a solvable configuration."
msgstr ""
#: pysollib/games/mahjongg/mahjongg.py:860
msgid "" msgid ""
"No Free\n" "No Free\n"
"Matching\n" "Matching\n"
"Pairs" "Pairs"
msgstr "" msgstr ""
#: pysollib/games/mahjongg/mahjongg.py:308 #: pysollib/games/mahjongg/mahjongg.py:862
msgid "" msgid ""
"1 Free\n" "%d Free\n"
"Matching\n" "Matching\n"
"Pair" "Pair"
msgstr "" msgid_plural ""
"%d Free\n"
#: pysollib/games/mahjongg/mahjongg.py:309
msgid ""
" Free\n"
"Matching\n" "Matching\n"
"Pairs" "Pairs"
msgstr "" msgstr[0] ""
msgstr[1] ""
#: pysollib/games/mahjongg/mahjongg.py:310 #: pysollib/games/mahjongg/mahjongg.py:866
msgid "" msgid ""
"%d\n"
"Tile\n"
"Removed\n"
"\n" "\n"
msgid_plural ""
"%d\n"
"Tiles\n" "Tiles\n"
"Removed\n" "Removed\n"
"\n" "\n"
msgstr "" msgstr[0] ""
msgstr[1] ""
#: pysollib/games/mahjongg/mahjongg.py:311 #: pysollib/games/mahjongg/mahjongg.py:869
msgid "" msgid ""
"%d\n"
"Tile\n"
"Remaining\n"
"\n" "\n"
msgid_plural ""
"%d\n"
"Tiles\n" "Tiles\n"
"Remaining\n" "Remaining\n"
"\n" "\n"
msgstr "" msgstr[0] ""
msgstr[1] ""
#: pysollib/games/matriarchy.py:127 #: pysollib/games/matriarchy.py:127
msgid "Round %d/%d" msgid "Round %d/%d"
@ -913,7 +933,7 @@ msgstr ""
#: pysollib/games/special/tarock.py:223 #: pysollib/games/special/tarock.py:223
#: pysollib/games/ultra/dashavatara.py:351 #: pysollib/games/ultra/dashavatara.py:351
#: pysollib/games/ultra/hexadeck.py:273 pysollib/games/ultra/mughal.py:254 #: pysollib/games/ultra/hexadeck.py:273 pysollib/games/ultra/mughal.py:254
#: pysollib/stack.py:1515 pysollib/util.py:84 pysollib/wizardutil.py:157 #: pysollib/stack.py:1515 pysollib/util.py:86 pysollib/wizardutil.py:157
#: pysollib/wizardutil.py:161 pysollib/wizardutil.py:222 #: pysollib/wizardutil.py:161 pysollib/wizardutil.py:222
msgid "Ace" msgid "Ace"
msgstr "" msgstr ""
@ -1652,7 +1672,7 @@ msgstr ""
msgid "any card" msgid "any card"
msgstr "" msgstr ""
#: pysollib/stack.py:1512 pysollib/util.py:85 #: pysollib/stack.py:1512 pysollib/util.py:87
msgid "Jack" msgid "Jack"
msgstr "" msgstr ""
@ -2521,98 +2541,98 @@ msgstr ""
msgid "&License terms" msgid "&License terms"
msgstr "" msgstr ""
#: pysollib/tile/menubar.py:635 pysollib/tk/menubar.py:639 #: pysollib/tile/menubar.py:637 pysollib/tk/menubar.py:641
msgid "All &games..." msgid "All &games..."
msgstr "" msgstr ""
#: pysollib/tile/menubar.py:637 pysollib/tk/menubar.py:641 #: pysollib/tile/menubar.py:639 pysollib/tk/menubar.py:643
msgid "Playable pre&view..." msgid "Playable pre&view..."
msgstr "" msgstr ""
#: pysollib/tile/menubar.py:690 pysollib/tk/menubar.py:694 #: pysollib/tile/menubar.py:692 pysollib/tk/menubar.py:696
msgid "&Mahjongg games" msgid "&Mahjongg games"
msgstr "" msgstr ""
#: pysollib/tile/menubar.py:728 pysollib/tk/menubar.py:732 #: pysollib/tile/menubar.py:730 pysollib/tk/menubar.py:734
msgid "&Popular games" msgid "&Popular games"
msgstr "" msgstr ""
#: pysollib/tile/menubar.py:736 pysollib/tk/menubar.py:740 #: pysollib/tile/menubar.py:738 pysollib/tk/menubar.py:742
msgid "&French games" msgid "&French games"
msgstr "" msgstr ""
#: pysollib/tile/menubar.py:743 pysollib/tk/menubar.py:747 #: pysollib/tile/menubar.py:745 pysollib/tk/menubar.py:749
msgid "&Oriental games" msgid "&Oriental games"
msgstr "" msgstr ""
#: pysollib/tile/menubar.py:751 pysollib/tk/menubar.py:755 #: pysollib/tile/menubar.py:753 pysollib/tk/menubar.py:757
msgid "&Special games" msgid "&Special games"
msgstr "" msgstr ""
#: pysollib/tile/menubar.py:757 pysollib/tk/menubar.py:761 #: pysollib/tile/menubar.py:759 pysollib/tk/menubar.py:763
msgid "&Cusom games" msgid "&Cusom games"
msgstr "" msgstr ""
#: pysollib/tile/menubar.py:763 pysollib/tk/menubar.py:767 #: pysollib/tile/menubar.py:765 pysollib/tk/menubar.py:769
msgid "&All games by name" msgid "&All games by name"
msgstr "" msgstr ""
#: pysollib/tile/menubar.py:1045 pysollib/tk/menubar.py:1049 #: pysollib/tile/menubar.py:1047 pysollib/tk/menubar.py:1051
#: data/glade-translations:72 #: data/glade-translations:72
msgid "Sound settings" msgid "Sound settings"
msgstr "" msgstr ""
#: pysollib/tile/menubar.py:1153 pysollib/tk/menubar.py:1161 #: pysollib/tile/menubar.py:1155 pysollib/tk/menubar.py:1163
msgid "Select " msgid "Select "
msgstr "" msgstr ""
#: pysollib/tile/menubar.py:1199 pysollib/tk/menubar.py:1208 #: pysollib/tile/menubar.py:1201 pysollib/tk/menubar.py:1210
msgid "Select table background" msgid "Select table background"
msgstr "" msgstr ""
#: pysollib/tile/menubar.py:1344 #: pysollib/tile/menubar.py:1346
msgid "Change theme" msgid "Change theme"
msgstr "" msgstr ""
#: pysollib/tile/menubar.py:1345 #: pysollib/tile/menubar.py:1347
msgid "" msgid ""
"This settings will take effect\n" "This settings will take effect\n"
"the next time you restart " "the next time you restart "
msgstr "" msgstr ""
#: pysollib/tile/menubar.py:1352 #: pysollib/tile/menubar.py:1354
msgid "Set t&heme" msgid "Set t&heme"
msgstr "" msgstr ""
#: pysollib/tile/menubar.py:1358 #: pysollib/tile/menubar.py:1360
msgid "Default" msgid "Default"
msgstr "" msgstr ""
#: pysollib/tile/menubar.py:1359 #: pysollib/tile/menubar.py:1361
msgid "Classic" msgid "Classic"
msgstr "" msgstr ""
#: pysollib/tile/menubar.py:1360 #: pysollib/tile/menubar.py:1362
msgid "Revitalized" msgid "Revitalized"
msgstr "" msgstr ""
#: pysollib/tile/menubar.py:1361 #: pysollib/tile/menubar.py:1363
msgid "Windows native" msgid "Windows native"
msgstr "" msgstr ""
#: pysollib/tile/menubar.py:1362 #: pysollib/tile/menubar.py:1364
msgid "XP Native" msgid "XP Native"
msgstr "" msgstr ""
#: pysollib/tile/menubar.py:1363 #: pysollib/tile/menubar.py:1365
msgid "Aqua" msgid "Aqua"
msgstr "" msgstr ""
#: pysollib/tile/menubar.py:1381 pysollib/tk/menubar.py:1366 #: pysollib/tile/menubar.py:1383 pysollib/tk/menubar.py:1368
msgid "Solitaire Wizard" msgid "Solitaire Wizard"
msgstr "" msgstr ""
#: pysollib/tile/menubar.py:1392 pysollib/tk/menubar.py:1377 #: pysollib/tile/menubar.py:1394 pysollib/tk/menubar.py:1379
msgid "" msgid ""
"\n" "\n"
"Error while saving game.\n" "Error while saving game.\n"
@ -2693,12 +2713,12 @@ msgstr ""
msgid "XLarge cardsets" msgid "XLarge cardsets"
msgstr "" msgstr ""
#: pysollib/tile/selectcardset.py:236 pysollib/tk/menubar.py:1158 #: pysollib/tile/selectcardset.py:236 pysollib/tk/menubar.py:1160
msgid "&Info..." msgid "&Info..."
msgstr "" msgstr ""
#: pysollib/tile/selectcardset.py:237 pysollib/tk/menubar.py:1156 #: pysollib/tile/selectcardset.py:237 pysollib/tk/menubar.py:1158
#: pysollib/tk/menubar.py:1158 pysollib/tk/selectcardset.py:241 #: pysollib/tk/menubar.py:1160 pysollib/tk/selectcardset.py:241
msgid "&Load" msgid "&Load"
msgstr "" msgstr ""
@ -3543,38 +3563,46 @@ msgid "Autodrop"
msgstr "" msgstr ""
#: pysollib/tile/toolbar.py:195 pysollib/tk/toolbar.py:198 #: pysollib/tile/toolbar.py:195 pysollib/tk/toolbar.py:198
msgid "Pause" msgid "Shuffle"
msgstr "" msgstr ""
#: pysollib/tile/toolbar.py:195 pysollib/tk/toolbar.py:198 #: pysollib/tile/toolbar.py:195 pysollib/tk/toolbar.py:198
msgid "Shuffle tiles"
msgstr ""
#: pysollib/tile/toolbar.py:196 pysollib/tk/toolbar.py:199
msgid "Pause"
msgstr ""
#: pysollib/tile/toolbar.py:196 pysollib/tk/toolbar.py:199
msgid "Pause game" msgid "Pause game"
msgstr "" msgstr ""
#: pysollib/tile/toolbar.py:197 pysollib/tk/toolbar.py:200 #: pysollib/tile/toolbar.py:198 pysollib/tk/toolbar.py:201
msgid "View statistics" msgid "View statistics"
msgstr "" msgstr ""
#: pysollib/tile/toolbar.py:198 pysollib/tk/toolbar.py:201 #: pysollib/tile/toolbar.py:199 pysollib/tk/toolbar.py:202
msgid "Rules" msgid "Rules"
msgstr "" msgstr ""
#: pysollib/tile/toolbar.py:198 pysollib/tk/toolbar.py:201 #: pysollib/tile/toolbar.py:199 pysollib/tk/toolbar.py:202
msgid "Rules for this game" msgid "Rules for this game"
msgstr "" msgstr ""
#: pysollib/tile/toolbar.py:200 pysollib/tk/toolbar.py:203 #: pysollib/tile/toolbar.py:201 pysollib/tk/toolbar.py:204
msgid "Quit" msgid "Quit"
msgstr "" msgstr ""
#: pysollib/tile/toolbar.py:214 pysollib/tk/toolbar.py:217 #: pysollib/tile/toolbar.py:215 pysollib/tk/toolbar.py:218
msgid "Player" msgid "Player"
msgstr "" msgstr ""
#: pysollib/tile/toolbar.py:215 pysollib/tk/toolbar.py:218 #: pysollib/tile/toolbar.py:216 pysollib/tk/toolbar.py:219
msgid "Player options" msgid "Player options"
msgstr "" msgstr ""
#: pysollib/tile/toolbar.py:396 pysollib/tk/toolbar.py:433 #: pysollib/tile/toolbar.py:397 pysollib/tk/toolbar.py:434
msgid "Toolbar" msgid "Toolbar"
msgstr "" msgstr ""
@ -3630,31 +3658,31 @@ msgstr ""
msgid "&Full log..." msgid "&Full log..."
msgstr "" msgstr ""
#: pysollib/util.py:80 #: pysollib/util.py:82
msgid "Club" msgid "Club"
msgstr "" msgstr ""
#: pysollib/util.py:80 #: pysollib/util.py:82
msgid "Diamond" msgid "Diamond"
msgstr "" msgstr ""
#: pysollib/util.py:80 #: pysollib/util.py:82
msgid "Heart" msgid "Heart"
msgstr "" msgstr ""
#: pysollib/util.py:80 #: pysollib/util.py:82
msgid "Spade" msgid "Spade"
msgstr "" msgstr ""
#: pysollib/util.py:81 #: pysollib/util.py:83
msgid "black" msgid "black"
msgstr "" msgstr ""
#: pysollib/util.py:81 #: pysollib/util.py:83
msgid "red" msgid "red"
msgstr "" msgstr ""
#: pysollib/util.py:106 #: pysollib/util.py:108
msgid "cardset" msgid "cardset"
msgstr "" msgstr ""

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: Fri May 11 22:05:05 2007\n" "POT-Creation-Date: Sat May 19 16:39:10 2007\n"
"PO-Revision-Date: 2007-05-11 17:25+0400\n" "PO-Revision-Date: 2007-05-11 17:25+0400\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"

View file

@ -5,8 +5,8 @@
msgid "" msgid ""
msgstr "" msgstr ""
"Project-Id-Version: PACKAGE VERSION\n" "Project-Id-Version: PACKAGE VERSION\n"
"POT-Creation-Date: Fri May 11 22:06:13 2007\n" "POT-Creation-Date: Sat May 19 16:40:21 2007\n"
"PO-Revision-Date: 2007-05-11 22:00+0400\n" "PO-Revision-Date: 2007-05-19 16:50+0400\n"
"Last-Translator: Skomoroh <skomoroh@gmail.com>\n" "Last-Translator: Skomoroh <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"
@ -16,34 +16,34 @@ msgstr ""
"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%" "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%"
"10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" "10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
#: pysollib/actions.py:263 pysollib/tile/toolbar.py:186 #: pysollib/actions.py:267 pysollib/tile/toolbar.py:186
#: pysollib/tk/toolbar.py:189 #: pysollib/tk/toolbar.py:189
msgid "New game" msgid "New game"
msgstr "Новая игра" msgstr "Новая игра"
#: pysollib/actions.py:276 pysollib/tile/menubar.py:848 #: pysollib/actions.py:280 pysollib/tile/menubar.py:850
#: pysollib/tile/menubar.py:862 pysollib/tk/menubar.py:852 #: pysollib/tile/menubar.py:864 pysollib/tk/menubar.py:854
#: pysollib/tk/menubar.py:866 #: pysollib/tk/menubar.py:868
msgid "Select game" msgid "Select game"
msgstr "Выбрать игру" msgstr "Выбрать игру"
#: pysollib/actions.py:290 #: pysollib/actions.py:294
msgid "Invalid game number" msgid "Invalid game number"
msgstr "Неправильный номер игры" msgstr "Неправильный номер игры"
#: pysollib/actions.py:291 #: pysollib/actions.py:295
msgid "Invalid game number\n" msgid "Invalid game number\n"
msgstr "Неправильный номер игры\n" msgstr "Неправильный номер игры\n"
#: pysollib/actions.py:308 #: pysollib/actions.py:312
msgid "Select next game number" msgid "Select next game number"
msgstr "Выберите номер следующей игры" msgstr "Выберите номер следующей игры"
#: pysollib/actions.py:317 pysollib/actions.py:327 #: pysollib/actions.py:321 pysollib/actions.py:331
msgid "Select new game number" msgid "Select new game number"
msgstr "Выберите номер новой игры" msgstr "Выберите номер новой игры"
#: pysollib/actions.py:318 #: pysollib/actions.py:322
msgid "" msgid ""
"\n" "\n"
"\n" "\n"
@ -53,15 +53,15 @@ msgstr ""
"\n" "\n"
"Введите номер новой игры" "Введите номер новой игры"
#: pysollib/actions.py:319 #: pysollib/actions.py:323
msgid "&Next number" msgid "&Next number"
msgstr "&Следующий номер" msgstr "&Следующий номер"
#: pysollib/actions.py:319 pysollib/app.py:903 pysollib/app.py:1190 #: pysollib/actions.py:323 pysollib/app.py:906 pysollib/app.py:1193
#: pysollib/app.py:1202 pysollib/game.py:1030 pysollib/game.py:2293 #: pysollib/app.py:1205 pysollib/game.py:1031 pysollib/game.py:2299
#: pysollib/tile/colorsdialog.py:112 pysollib/tile/edittextdialog.py:83 #: pysollib/tile/colorsdialog.py:112 pysollib/tile/edittextdialog.py:83
#: pysollib/tile/fontsdialog.py:144 pysollib/tile/fontsdialog.py:204 #: pysollib/tile/fontsdialog.py:144 pysollib/tile/fontsdialog.py:204
#: pysollib/tile/gameinfodialog.py:155 pysollib/tile/menubar.py:1349 #: pysollib/tile/gameinfodialog.py:155 pysollib/tile/menubar.py:1351
#: pysollib/tile/playeroptionsdialog.py:111 pysollib/tile/selectcardset.py:387 #: pysollib/tile/playeroptionsdialog.py:111 pysollib/tile/selectcardset.py:387
#: pysollib/tile/selecttile.py:161 pysollib/tile/soundoptionsdialog.py:168 #: pysollib/tile/selecttile.py:161 pysollib/tile/soundoptionsdialog.py:168
#: pysollib/tile/soundoptionsdialog.py:206 pysollib/tile/timeoutsdialog.py:94 #: pysollib/tile/soundoptionsdialog.py:206 pysollib/tile/timeoutsdialog.py:94
@ -85,9 +85,9 @@ msgstr "&Следующий номер"
msgid "&OK" msgid "&OK"
msgstr "&ОК" msgstr "&ОК"
#: pysollib/actions.py:319 pysollib/app.py:904 pysollib/app.py:1202 #: pysollib/actions.py:323 pysollib/app.py:907 pysollib/app.py:1205
#: pysollib/game.py:1030 pysollib/game.py:1694 pysollib/game.py:1710 #: pysollib/game.py:1031 pysollib/game.py:1700 pysollib/game.py:1716
#: pysollib/game.py:1717 pysollib/game.py:1723 #: pysollib/game.py:1723 pysollib/game.py:1729
#: pysollib/tile/colorsdialog.py:112 pysollib/tile/edittextdialog.py:83 #: pysollib/tile/colorsdialog.py:112 pysollib/tile/edittextdialog.py:83
#: pysollib/tile/fontsdialog.py:144 pysollib/tile/fontsdialog.py:204 #: pysollib/tile/fontsdialog.py:144 pysollib/tile/fontsdialog.py:204
#: pysollib/tile/playeroptionsdialog.py:111 pysollib/tile/selectcardset.py:237 #: pysollib/tile/playeroptionsdialog.py:111 pysollib/tile/selectcardset.py:237
@ -96,8 +96,8 @@ msgstr "&ОК"
#: pysollib/tile/timeoutsdialog.py:94 pysollib/tile/tkwidget.py:329 #: pysollib/tile/timeoutsdialog.py:94 pysollib/tile/tkwidget.py:329
#: pysollib/tile/wizarddialog.py:144 pysollib/tk/colorsdialog.py:111 #: pysollib/tile/wizarddialog.py:144 pysollib/tk/colorsdialog.py:111
#: pysollib/tk/edittextdialog.py:82 pysollib/tk/fontsdialog.py:143 #: pysollib/tk/edittextdialog.py:82 pysollib/tk/fontsdialog.py:143
#: pysollib/tk/fontsdialog.py:205 pysollib/tk/menubar.py:1156 #: pysollib/tk/fontsdialog.py:205 pysollib/tk/menubar.py:1158
#: pysollib/tk/menubar.py:1158 pysollib/tk/playeroptionsdialog.py:85 #: pysollib/tk/menubar.py:1160 pysollib/tk/playeroptionsdialog.py:85
#: pysollib/tk/playeroptionsdialog.py:160 pysollib/tk/selectcardset.py:241 #: pysollib/tk/playeroptionsdialog.py:160 pysollib/tk/selectcardset.py:241
#: pysollib/tk/selectgame.py:265 pysollib/tk/selectgame.py:406 #: pysollib/tk/selectgame.py:265 pysollib/tk/selectgame.py:406
#: pysollib/tk/selecttile.py:159 pysollib/tk/soundoptionsdialog.py:170 #: pysollib/tk/selecttile.py:159 pysollib/tk/soundoptionsdialog.py:170
@ -106,36 +106,36 @@ msgstr "&ОК"
msgid "&Cancel" msgid "&Cancel"
msgstr "От&мена" msgstr "От&мена"
#: pysollib/actions.py:335 #: pysollib/actions.py:339
msgid "Select random game" msgid "Select random game"
msgstr "Выбор случайной игры" msgstr "Выбор случайной игры"
#: pysollib/actions.py:371 #: pysollib/actions.py:375
msgid "Select next game" msgid "Select next game"
msgstr "Выбрать следующую игру" msgstr "Выбрать следующую игру"
#: pysollib/actions.py:404 pysollib/tile/toolbar.py:200 #: pysollib/actions.py:408 pysollib/tile/toolbar.py:201
#: pysollib/tk/toolbar.py:203 #: pysollib/tk/toolbar.py:204
msgid "Quit " msgid "Quit "
msgstr "Выйти из " msgstr "Выйти из "
#: pysollib/actions.py:455 #: pysollib/actions.py:459
msgid "Clear bookmarks" msgid "Clear bookmarks"
msgstr "Удалить закладки" msgstr "Удалить закладки"
#: pysollib/actions.py:456 #: pysollib/actions.py:460
msgid "Clear all bookmarks ?" msgid "Clear all bookmarks ?"
msgstr "Удалить все закладки?" msgstr "Удалить все закладки?"
#: pysollib/actions.py:466 #: pysollib/actions.py:470
msgid "Restart game" msgid "Restart game"
msgstr "Начать игру с начала" msgstr "Начать игру с начала"
#: pysollib/actions.py:467 #: pysollib/actions.py:471
msgid "Restart this game ?" msgid "Restart this game ?"
msgstr "Начать игру с начала?" msgstr "Начать игру с начала?"
#: pysollib/actions.py:513 #: pysollib/actions.py:522
msgid "" msgid ""
"Comments for %s:\n" "Comments for %s:\n"
"\n" "\n"
@ -143,19 +143,19 @@ msgstr ""
"Комментарий для %s:\n" "Комментарий для %s:\n"
"\n" "\n"
#: pysollib/actions.py:515 #: pysollib/actions.py:524
msgid "Comments for " msgid "Comments for "
msgstr "Комментарий для " msgstr "Комментарий для "
#: pysollib/actions.py:533 pysollib/actions.py:561 #: pysollib/actions.py:542 pysollib/actions.py:570
msgid "Error while writing to file" msgid "Error while writing to file"
msgstr "Ошибка при записи в файл" msgstr "Ошибка при записи в файл"
#: pysollib/actions.py:536 pysollib/actions.py:564 #: pysollib/actions.py:545 pysollib/actions.py:573
msgid " Info" msgid " Info"
msgstr " Информация" msgstr " Информация"
#: pysollib/actions.py:537 #: pysollib/actions.py:546
msgid "" msgid ""
"Comments were appended to\n" "Comments were appended to\n"
"\n" "\n"
@ -163,15 +163,15 @@ msgstr ""
"Комментарий добавлен в файл\n" "Комментарий добавлен в файл\n"
"\n" "\n"
#: pysollib/actions.py:548 #: pysollib/actions.py:557
msgid "Demo statistics" msgid "Demo statistics"
msgstr "Статистика демо" msgstr "Статистика демо"
#: pysollib/actions.py:551 #: pysollib/actions.py:560
msgid "Your statistics" msgid "Your statistics"
msgstr "Ваша статистика" msgstr "Ваша статистика"
#: pysollib/actions.py:565 #: pysollib/actions.py:574
msgid "" msgid ""
" were appended to\n" " were appended to\n"
"\n" "\n"
@ -179,51 +179,51 @@ msgstr ""
" добавлена в файл\n" " добавлена в файл\n"
"\n" "\n"
#: pysollib/actions.py:580 #: pysollib/actions.py:589
msgid " Demo" msgid " Demo"
msgstr " Демо" msgstr " Демо"
#: pysollib/actions.py:580 #: pysollib/actions.py:589
msgid " Demo " msgid " Demo "
msgstr " Демо " msgstr " Демо "
#: pysollib/actions.py:583 pysollib/actions.py:603 #: pysollib/actions.py:592 pysollib/actions.py:612
msgid " for " msgid " for "
msgstr " для " msgstr " для "
#: pysollib/actions.py:589 pysollib/stats.py:205 #: pysollib/actions.py:598 pysollib/stats.py:205
msgid "Statistics for " msgid "Statistics for "
msgstr "Статистика игры " msgstr "Статистика игры "
#: pysollib/actions.py:593 pysollib/tile/selectgame.py:344 #: pysollib/actions.py:602 pysollib/tile/selectgame.py:344
#: pysollib/tile/tkstats.py:74 pysollib/tile/toolbar.py:197 #: pysollib/tile/tkstats.py:74 pysollib/tile/toolbar.py:198
#: pysollib/tk/selectgame.py:349 pysollib/tk/toolbar.py:200 #: pysollib/tk/selectgame.py:349 pysollib/tk/toolbar.py:201
msgid "Statistics" msgid "Statistics"
msgstr "Статистика" msgstr "Статистика"
#: pysollib/actions.py:597 pysollib/tile/tkstats.py:526 #: pysollib/actions.py:606 pysollib/tile/tkstats.py:526
#: data/glade-translations:31 #: data/glade-translations:31
msgid "Full log" msgid "Full log"
msgstr "Полный лог" msgstr "Полный лог"
#: pysollib/actions.py:600 pysollib/tile/tkstats.py:530 #: pysollib/actions.py:609 pysollib/tile/tkstats.py:530
#: data/glade-translations:32 #: data/glade-translations:32
msgid "Session log" msgid "Session log"
msgstr "Лог сессии" msgstr "Лог сессии"
#: pysollib/actions.py:606 #: pysollib/actions.py:615
msgid "Game Info" msgid "Game Info"
msgstr "Информация об игре" msgstr "Информация об игре"
#: pysollib/actions.py:609 #: pysollib/actions.py:618
msgid "Statistics progression" msgid "Statistics progression"
msgstr "Прогресс статистики" msgstr "Прогресс статистики"
#: pysollib/actions.py:625 #: pysollib/actions.py:634
msgid "Reset all statistics" msgid "Reset all statistics"
msgstr "Очистить всю статистику" msgstr "Очистить всю статистику"
#: pysollib/actions.py:626 #: pysollib/actions.py:635
msgid "" msgid ""
"Reset ALL statistics and logs for player\n" "Reset ALL statistics and logs for player\n"
"%s ?" "%s ?"
@ -231,11 +231,11 @@ msgstr ""
"Очистить всю статистику и лог для игрока\n" "Очистить всю статистику и лог для игрока\n"
"%s?" "%s?"
#: pysollib/actions.py:632 #: pysollib/actions.py:641
msgid "Reset game statistics" msgid "Reset game statistics"
msgstr "Очистить статистику игры" msgstr "Очистить статистику игры"
#: pysollib/actions.py:633 #: pysollib/actions.py:642
msgid "" msgid ""
"Reset statistics and logs for player\n" "Reset statistics and logs for player\n"
"%s\n" "%s\n"
@ -247,23 +247,23 @@ msgstr ""
"и игры\n" "и игры\n"
"%s?" "%s?"
#: pysollib/actions.py:689 #: pysollib/actions.py:698
msgid "Play demo" msgid "Play demo"
msgstr "Показать демо" msgstr "Показать демо"
#: pysollib/actions.py:700 #: pysollib/actions.py:709
msgid "Set player options" msgid "Set player options"
msgstr "Установить настройки игрока" msgstr "Установить настройки игрока"
#: pysollib/actions.py:714 data/glade-translations:40 #: pysollib/actions.py:723 data/glade-translations:40
msgid "Set colors" msgid "Set colors"
msgstr "Настроить цвета" msgstr "Настроить цвета"
#: pysollib/actions.py:731 #: pysollib/actions.py:740
msgid "Set fonts" msgid "Set fonts"
msgstr "Настроить шрифт" msgstr "Настроить шрифт"
#: pysollib/actions.py:740 data/glade-translations:33 #: pysollib/actions.py:749 data/glade-translations:33
msgid "Set timeouts" msgid "Set timeouts"
msgstr "Настроить таймауты" msgstr "Настроить таймауты"
@ -271,33 +271,33 @@ msgstr "Настроить таймауты"
msgid "Unknown" msgid "Unknown"
msgstr "Неизвестный" msgstr "Неизвестный"
#: pysollib/app.py:666 #: pysollib/app.py:667
msgid "can't find game: " msgid "can't find game: "
msgstr "" msgstr ""
#: pysollib/app.py:905 pysollib/game.py:1694 pysollib/game.py:1710 #: pysollib/app.py:908 pysollib/game.py:1700 pysollib/game.py:1716
#: pysollib/game.py:1717 pysollib/game.py:1723 pysollib/tile/menubar.py:356 #: pysollib/game.py:1723 pysollib/game.py:1729 pysollib/tile/menubar.py:356
#: pysollib/tk/menubar.py:353 #: pysollib/tk/menubar.py:353
msgid "&New game" msgid "&New game"
msgstr "&Новая игра" msgstr "&Новая игра"
#: pysollib/app.py:1048 #: pysollib/app.py:1051
msgid "Loading %s %s..." msgid "Loading %s %s..."
msgstr "Загружается %s %s..." msgstr "Загружается %s %s..."
#: pysollib/app.py:1087 #: pysollib/app.py:1090
msgid " load error" msgid " load error"
msgstr " ошибка при загрузке" msgstr " ошибка при загрузке"
#: pysollib/app.py:1088 #: pysollib/app.py:1091
msgid "Error while loading " msgid "Error while loading "
msgstr "Ошибка при загрузке" msgstr "Ошибка при загрузке"
#: pysollib/app.py:1182 #: pysollib/app.py:1185
msgid "Incompatible " msgid "Incompatible "
msgstr "Несовместимый " msgstr "Несовместимый "
#: pysollib/app.py:1184 #: pysollib/app.py:1187
msgid "" msgid ""
"The currently selected %s %s\n" "The currently selected %s %s\n"
"is not compatible with the game\n" "is not compatible with the game\n"
@ -311,23 +311,23 @@ msgstr ""
"\n" "\n"
"Необходимо выбрать %s типа %s.\n" "Необходимо выбрать %s типа %s.\n"
#: pysollib/app.py:1200 #: pysollib/app.py:1203
msgid "Please select a %s type %s" msgid "Please select a %s type %s"
msgstr "Выберите %s типа %s" msgstr "Выберите %s типа %s"
#: pysollib/app.py:1427 #: pysollib/app.py:1430
msgid "error loading plugin %s: %s" msgid "error loading plugin %s: %s"
msgstr "" msgstr ""
#: pysollib/game.py:949 pysollib/game.py:955 #: pysollib/game.py:950 pysollib/game.py:956
msgid "Player\n" msgid "Player\n"
msgstr "Игрок\n" msgstr "Игрок\n"
#: pysollib/game.py:1026 #: pysollib/game.py:1027
msgid "Discard current game ?" msgid "Discard current game ?"
msgstr "Завершить текущую игру?" msgstr "Завершить текущую игру?"
#: pysollib/game.py:1647 #: pysollib/game.py:1653
msgid "" msgid ""
"\n" "\n"
"You have reached\n" "You have reached\n"
@ -337,7 +337,7 @@ msgstr ""
"Вы достигли\n" "Вы достигли\n"
"#%d в %s игрового времени" "#%d в %s игрового времени"
#: pysollib/game.py:1652 #: pysollib/game.py:1658
msgid "" msgid ""
"\n" "\n"
"and #%d in the %s of moves" "and #%d in the %s of moves"
@ -345,7 +345,7 @@ msgstr ""
"\n" "\n"
"и #%d в %s количества ходов" "и #%d в %s количества ходов"
#: pysollib/game.py:1655 #: pysollib/game.py:1661
msgid "" msgid ""
"\n" "\n"
"You have reached\n" "You have reached\n"
@ -355,13 +355,13 @@ msgstr ""
"Вы достигли\n" "Вы достигли\n"
"#%d в %s количества ходов" "#%d в %s количества ходов"
#: pysollib/game.py:1685 pysollib/game.py:1702 #: pysollib/game.py:1691 pysollib/game.py:1708
#: 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:1686 #: pysollib/game.py:1692
msgid "" msgid ""
"\n" "\n"
"Congratulations, this\n" "Congratulations, this\n"
@ -380,7 +380,7 @@ msgstr ""
"Количество ходов: %s\n" "Количество ходов: %s\n"
"%s\n" "%s\n"
#: pysollib/game.py:1703 #: pysollib/game.py:1709
msgid "" msgid ""
"\n" "\n"
"Congratulations, you did it !\n" "Congratulations, you did it !\n"
@ -397,13 +397,13 @@ msgstr ""
"Количество ходов: %s\n" "Количество ходов: %s\n"
"%s\n" "%s\n"
#: pysollib/game.py:1715 pysollib/game.py:1721 #: pysollib/game.py:1721 pysollib/game.py:1727
#: 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:1716 pysollib/game.py:2294 #: pysollib/game.py:1722 pysollib/game.py:2300
msgid "" msgid ""
"\n" "\n"
"Game finished\n" "Game finished\n"
@ -411,7 +411,7 @@ msgstr ""
"\n" "\n"
"Игра закончена\n" "Игра закончена\n"
#: pysollib/game.py:1722 #: pysollib/game.py:1728
msgid "" msgid ""
"\n" "\n"
"Game finished, but not without my help...\n" "Game finished, but not without my help...\n"
@ -419,35 +419,35 @@ msgstr ""
"\n" "\n"
"Игра закончена, но не без моей помощи...\n" "Игра закончена, но не без моей помощи...\n"
#: pysollib/game.py:1723 #: pysollib/game.py:1729
msgid "&Restart" msgid "&Restart"
msgstr "&Начало" msgstr "&Начало"
#: pysollib/game.py:2183 #: pysollib/game.py:2189
msgid "Score %6d" msgid "Score %6d"
msgstr "Счёт %6d" msgstr "Счёт %6d"
#: pysollib/game.py:2285 #: pysollib/game.py:2291
msgid "&Cool" msgid "&Cool"
msgstr "&Отлично" msgstr "&Отлично"
#: pysollib/game.py:2285 #: pysollib/game.py:2291
msgid "&Great" msgid "&Great"
msgstr "&Здорово" msgstr "&Здорово"
#: pysollib/game.py:2285 #: pysollib/game.py:2291
msgid "&Wow" msgid "&Wow"
msgstr "&Ура" msgstr "&Ура"
#: pysollib/game.py:2285 #: pysollib/game.py:2291
msgid "&Yeah" msgid "&Yeah"
msgstr "&Ага" msgstr "&Ага"
#: pysollib/game.py:2286 pysollib/game.py:2297 pysollib/game.py:2309 #: pysollib/game.py:2292 pysollib/game.py:2303 pysollib/game.py:2315
msgid " Autopilot" msgid " Autopilot"
msgstr " Автопилот" msgstr " Автопилот"
#: pysollib/game.py:2287 #: pysollib/game.py:2293
msgid "" msgid ""
"\n" "\n"
"Game solved in %d moves.\n" "Game solved in %d moves.\n"
@ -455,19 +455,19 @@ msgstr ""
"\n" "\n"
"Игра решена за %d ходов\n" "Игра решена за %d ходов\n"
#: pysollib/game.py:2308 #: pysollib/game.py:2314
msgid "&Hmm" msgid "&Hmm"
msgstr "&Хмм" msgstr "&Хмм"
#: pysollib/game.py:2308 #: pysollib/game.py:2314
msgid "&Oh well" msgid "&Oh well"
msgstr "&Ох" msgstr "&Ох"
#: pysollib/game.py:2308 #: pysollib/game.py:2314
msgid "&That's life" msgid "&That's life"
msgstr "&Такова жизнь" msgstr "&Такова жизнь"
#: pysollib/game.py:2310 #: pysollib/game.py:2316
msgid "" msgid ""
"\n" "\n"
"This won't come out...\n" "This won't come out...\n"
@ -475,31 +475,31 @@ msgstr ""
"\n" "\n"
"Не удалось...\n" "Не удалось...\n"
#: pysollib/game.py:2750 #: pysollib/game.py:2756
msgid "Set bookmark" msgid "Set bookmark"
msgstr "Установить закладку" msgstr "Установить закладку"
#: pysollib/game.py:2751 #: pysollib/game.py:2757
msgid "Replace existing bookmark %d ?" msgid "Replace existing bookmark %d ?"
msgstr "Заменить существующую закладку %d ?" msgstr "Заменить существующую закладку %d ?"
#: pysollib/game.py:2773 #: pysollib/game.py:2779
msgid "Goto bookmark" msgid "Goto bookmark"
msgstr "Перейти к закладке" msgstr "Перейти к закладке"
#: pysollib/game.py:2774 #: pysollib/game.py:2780
msgid "Goto bookmark %d ?" msgid "Goto bookmark %d ?"
msgstr "Перейти к закладке %d ?" msgstr "Перейти к закладке %d ?"
#: pysollib/game.py:2805 #: pysollib/game.py:2811
msgid "Open game" msgid "Open game"
msgstr "Открыть игру" msgstr "Открыть игру"
#: pysollib/game.py:2816 pysollib/game.py:2826 pysollib/game.py:2831 #: pysollib/game.py:2822 pysollib/game.py:2832 pysollib/game.py:2837
msgid "Load game error" msgid "Load game error"
msgstr "Ошибка при загрузке игры" msgstr "Ошибка при загрузке игры"
#: pysollib/game.py:2817 #: pysollib/game.py:2823
msgid "" msgid ""
"Error while loading game.\n" "Error while loading game.\n"
"\n" "\n"
@ -511,11 +511,11 @@ msgstr ""
"Возможно повреждён файл,\n" "Возможно повреждён файл,\n"
"или ошибка в программе." "или ошибка в программе."
#: pysollib/game.py:2827 #: pysollib/game.py:2833
msgid "Error while loading game" msgid "Error while loading game"
msgstr "Ошибка при загрузке игры" msgstr "Ошибка при загрузке игры"
#: pysollib/game.py:2832 #: pysollib/game.py:2838
msgid "" msgid ""
"Internal error while loading game.\n" "Internal error while loading game.\n"
"\n" "\n"
@ -525,26 +525,26 @@ msgstr ""
"\n" "\n"
"Пожалуйста сообщите об этой ошибке." "Пожалуйста сообщите об этой ошибке."
#: pysollib/game.py:2861 pysollib/tile/menubar.py:1391 #: pysollib/game.py:2867 pysollib/tile/menubar.py:1393
#: pysollib/tk/menubar.py:1376 #: pysollib/tk/menubar.py:1378
msgid "Save game error" msgid "Save game error"
msgstr "Ошибка при сохранении игры" msgstr "Ошибка при сохранении игры"
#: pysollib/game.py:2862 #: pysollib/game.py:2868
msgid "Error while saving game" msgid "Error while saving game"
msgstr "Ошибка при сохранении игры" msgstr "Ошибка при сохранении игры"
#: pysollib/game.py:2887 #: pysollib/game.py:2893
msgid "Invalid or damaged %s save file" msgid "Invalid or damaged %s save file"
msgstr "" msgstr ""
#: pysollib/game.py:2901 #: pysollib/game.py:2907
msgid "" msgid ""
"Cannot load games saved with\n" "Cannot load games saved with\n"
"%s version %s" "%s version %s"
msgstr "" msgstr ""
#: pysollib/game.py:2918 #: pysollib/game.py:2924
msgid "" msgid ""
"Cannot load this game from version %s\n" "Cannot load this game from version %s\n"
"as the game rules have changed\n" "as the game rules have changed\n"
@ -798,13 +798,13 @@ msgstr ""
"4: 8 Д 3 7 В 2 6 10 Т 5 9 К" "4: 8 Д 3 7 В 2 6 10 Т 5 9 К"
#: pysollib/games/canfield.py:528 pysollib/games/special/tarock.py:224 #: pysollib/games/canfield.py:528 pysollib/games/special/tarock.py:224
#: pysollib/stack.py:1514 pysollib/util.py:85 pysollib/wizardutil.py:158 #: pysollib/stack.py:1514 pysollib/util.py:87 pysollib/wizardutil.py:158
#: pysollib/wizardutil.py:223 #: pysollib/wizardutil.py:223
msgid "King" msgid "King"
msgstr "Король" msgstr "Король"
#: pysollib/games/canfield.py:531 pysollib/games/special/tarock.py:224 #: pysollib/games/canfield.py:531 pysollib/games/special/tarock.py:224
#: pysollib/stack.py:1513 pysollib/util.py:85 #: pysollib/stack.py:1513 pysollib/util.py:87
msgid "Queen" msgid "Queen"
msgstr "Королева" msgstr "Королева"
@ -859,7 +859,19 @@ msgstr "Резерв. Только для королей."
msgid "Round %d" msgid "Round %d"
msgstr "Раунд %d" msgstr "Раунд %d"
#: pysollib/games/mahjongg/mahjongg.py:307 #: pysollib/games/mahjongg/mahjongg.py:788
msgid "Warning"
msgstr "Предупреждение:"
#: pysollib/games/mahjongg/mahjongg.py:789
msgid ""
"Sorry, I can't find\n"
"a solvable configuration."
msgstr ""
"Извините, не удалось создать\n"
"решаемую конфигурацию."
#: pysollib/games/mahjongg/mahjongg.py:860
msgid "" msgid ""
"No Free\n" "No Free\n"
"Matching\n" "Matching\n"
@ -869,45 +881,79 @@ msgstr ""
"свободных\n" "свободных\n"
"пар" "пар"
#: pysollib/games/mahjongg/mahjongg.py:308 #: pysollib/games/mahjongg/mahjongg.py:862
msgid "" msgid ""
"1 Free\n" "%d Free\n"
"Matching\n" "Matching\n"
"Pair" "Pair"
msgstr "" msgid_plural ""
"1\n" "%d Free\n"
"свободная\n"
"пара"
#: pysollib/games/mahjongg/mahjongg.py:309
msgid ""
" Free\n"
"Matching\n" "Matching\n"
"Pairs" "Pairs"
msgstr "" msgstr[0] ""
" \n" "%d\n"
"свободная\n"
"пара"
msgstr[1] ""
"%d\n"
"свободных\n"
"пары"
msgstr[2] ""
"%d\n"
"свободных\n" "свободных\n"
"пар" "пар"
#: pysollib/games/mahjongg/mahjongg.py:310 #: pysollib/games/mahjongg/mahjongg.py:866
msgid "" msgid ""
"%d\n"
"Tile\n"
"Removed\n"
"\n" "\n"
msgid_plural ""
"%d\n"
"Tiles\n" "Tiles\n"
"Removed\n" "Removed\n"
"\n" "\n"
msgstr "" msgstr[0] ""
"%d\n"
"фишка\n"
"удалена\n"
"\n" "\n"
msgstr[1] ""
"%d\n"
"фишки\n"
"удалены\n"
"\n"
msgstr[2] ""
"%d\n"
"фишек\n"
"удалено\n" "удалено\n"
"\n" "\n"
#: pysollib/games/mahjongg/mahjongg.py:311 #: pysollib/games/mahjongg/mahjongg.py:869
msgid "" msgid ""
"%d\n"
"Tile\n"
"Remaining\n"
"\n" "\n"
msgid_plural ""
"%d\n"
"Tiles\n" "Tiles\n"
"Remaining\n" "Remaining\n"
"\n" "\n"
msgstr "" msgstr[0] ""
"%d\n"
"фишка\n"
"осталась\n"
"\n" "\n"
msgstr[1] ""
"%d\n"
"фишки\n"
"осталось\n"
"\n"
msgstr[2] ""
"%d\n"
"фишек\n"
"осталось\n" "осталось\n"
"\n" "\n"
@ -991,7 +1037,7 @@ msgstr "Жезлы"
#: pysollib/games/special/tarock.py:223 #: pysollib/games/special/tarock.py:223
#: pysollib/games/ultra/dashavatara.py:351 #: pysollib/games/ultra/dashavatara.py:351
#: pysollib/games/ultra/hexadeck.py:273 pysollib/games/ultra/mughal.py:254 #: pysollib/games/ultra/hexadeck.py:273 pysollib/games/ultra/mughal.py:254
#: pysollib/stack.py:1515 pysollib/util.py:84 pysollib/wizardutil.py:157 #: pysollib/stack.py:1515 pysollib/util.py:86 pysollib/wizardutil.py:157
#: pysollib/wizardutil.py:161 pysollib/wizardutil.py:222 #: pysollib/wizardutil.py:161 pysollib/wizardutil.py:222
msgid "Ace" msgid "Ace"
msgstr "Туз" msgstr "Туз"
@ -1790,7 +1836,7 @@ msgstr "Пустой ряд не заполняется."
msgid "any card" msgid "any card"
msgstr "любая карта" msgstr "любая карта"
#: pysollib/stack.py:1512 pysollib/util.py:85 #: pysollib/stack.py:1512 pysollib/util.py:87
msgid "Jack" msgid "Jack"
msgstr "Валет" msgstr "Валет"
@ -2684,60 +2730,60 @@ msgstr "&Правила текущей игры"
msgid "&License terms" msgid "&License terms"
msgstr "&Лицензия" msgstr "&Лицензия"
#: pysollib/tile/menubar.py:635 pysollib/tk/menubar.py:639 #: pysollib/tile/menubar.py:637 pysollib/tk/menubar.py:641
msgid "All &games..." msgid "All &games..."
msgstr "&Все игры..." msgstr "&Все игры..."
#: pysollib/tile/menubar.py:637 pysollib/tk/menubar.py:641 #: pysollib/tile/menubar.py:639 pysollib/tk/menubar.py:643
msgid "Playable pre&view..." msgid "Playable pre&view..."
msgstr "Играемый &предпросмотр..." msgstr "Играемый &предпросмотр..."
#: pysollib/tile/menubar.py:690 pysollib/tk/menubar.py:694 #: pysollib/tile/menubar.py:692 pysollib/tk/menubar.py:696
msgid "&Mahjongg games" msgid "&Mahjongg games"
msgstr "Игры маджонг" msgstr "Игры маджонг"
#: pysollib/tile/menubar.py:728 pysollib/tk/menubar.py:732 #: pysollib/tile/menubar.py:730 pysollib/tk/menubar.py:734
msgid "&Popular games" msgid "&Popular games"
msgstr "&Популярные игры" msgstr "&Популярные игры"
#: pysollib/tile/menubar.py:736 pysollib/tk/menubar.py:740 #: pysollib/tile/menubar.py:738 pysollib/tk/menubar.py:742
msgid "&French games" msgid "&French games"
msgstr "&Классические игры" msgstr "&Классические игры"
#: pysollib/tile/menubar.py:743 pysollib/tk/menubar.py:747 #: pysollib/tile/menubar.py:745 pysollib/tk/menubar.py:749
msgid "&Oriental games" msgid "&Oriental games"
msgstr "&Восточные игры" msgstr "&Восточные игры"
#: pysollib/tile/menubar.py:751 pysollib/tk/menubar.py:755 #: pysollib/tile/menubar.py:753 pysollib/tk/menubar.py:757
msgid "&Special games" msgid "&Special games"
msgstr "&Особые игры" msgstr "&Особые игры"
#: pysollib/tile/menubar.py:757 pysollib/tk/menubar.py:761 #: pysollib/tile/menubar.py:759 pysollib/tk/menubar.py:763
msgid "&Cusom games" msgid "&Cusom games"
msgstr "Самодельные игры" msgstr "Самодельные игры"
#: pysollib/tile/menubar.py:763 pysollib/tk/menubar.py:767 #: pysollib/tile/menubar.py:765 pysollib/tk/menubar.py:769
msgid "&All games by name" msgid "&All games by name"
msgstr "&Все игры по имени" msgstr "&Все игры по имени"
#: pysollib/tile/menubar.py:1045 pysollib/tk/menubar.py:1049 #: pysollib/tile/menubar.py:1047 pysollib/tk/menubar.py:1051
#: data/glade-translations:72 #: data/glade-translations:72
msgid "Sound settings" msgid "Sound settings"
msgstr "Настройка звука" msgstr "Настройка звука"
#: pysollib/tile/menubar.py:1153 pysollib/tk/menubar.py:1161 #: pysollib/tile/menubar.py:1155 pysollib/tk/menubar.py:1163
msgid "Select " msgid "Select "
msgstr "Выбрать " msgstr "Выбрать "
#: pysollib/tile/menubar.py:1199 pysollib/tk/menubar.py:1208 #: pysollib/tile/menubar.py:1201 pysollib/tk/menubar.py:1210
msgid "Select table background" msgid "Select table background"
msgstr "Выбрать фоновое изображение" msgstr "Выбрать фоновое изображение"
#: pysollib/tile/menubar.py:1344 #: pysollib/tile/menubar.py:1346
msgid "Change theme" msgid "Change theme"
msgstr "Изменение темы" msgstr "Изменение темы"
#: pysollib/tile/menubar.py:1345 #: pysollib/tile/menubar.py:1347
msgid "" msgid ""
"This settings will take effect\n" "This settings will take effect\n"
"the next time you restart " "the next time you restart "
@ -2745,41 +2791,41 @@ msgstr ""
"Эта установка вступит в силу\n" "Эта установка вступит в силу\n"
"при следующем запуске " "при следующем запуске "
#: pysollib/tile/menubar.py:1352 #: pysollib/tile/menubar.py:1354
msgid "Set t&heme" msgid "Set t&heme"
msgstr "Установить &тему" msgstr "Установить &тему"
#: pysollib/tile/menubar.py:1358 #: pysollib/tile/menubar.py:1360
#, fuzzy #, fuzzy
msgid "Default" msgid "Default"
msgstr "Сдача" msgstr "Сдача"
#: pysollib/tile/menubar.py:1359 #: pysollib/tile/menubar.py:1361
#, fuzzy #, fuzzy
msgid "Classic" msgid "Classic"
msgstr "Классический вид" msgstr "Классический вид"
#: pysollib/tile/menubar.py:1360 #: pysollib/tile/menubar.py:1362
msgid "Revitalized" msgid "Revitalized"
msgstr "" msgstr ""
#: pysollib/tile/menubar.py:1361 #: pysollib/tile/menubar.py:1363
msgid "Windows native" msgid "Windows native"
msgstr "" msgstr ""
#: pysollib/tile/menubar.py:1362 #: pysollib/tile/menubar.py:1364
msgid "XP Native" msgid "XP Native"
msgstr "" msgstr ""
#: pysollib/tile/menubar.py:1363 #: pysollib/tile/menubar.py:1365
msgid "Aqua" msgid "Aqua"
msgstr "" msgstr ""
#: pysollib/tile/menubar.py:1381 pysollib/tk/menubar.py:1366 #: pysollib/tile/menubar.py:1383 pysollib/tk/menubar.py:1368
msgid "Solitaire Wizard" msgid "Solitaire Wizard"
msgstr "" msgstr "Конструктор пасьянсов"
#: pysollib/tile/menubar.py:1392 pysollib/tk/menubar.py:1377 #: pysollib/tile/menubar.py:1394 pysollib/tk/menubar.py:1379
msgid "" msgid ""
"\n" "\n"
"Error while saving game.\n" "Error while saving game.\n"
@ -2866,12 +2912,12 @@ msgstr "Большие колоды"
msgid "XLarge cardsets" msgid "XLarge cardsets"
msgstr "Очень большие колоды" msgstr "Очень большие колоды"
#: pysollib/tile/selectcardset.py:236 pysollib/tk/menubar.py:1158 #: pysollib/tile/selectcardset.py:236 pysollib/tk/menubar.py:1160
msgid "&Info..." msgid "&Info..."
msgstr "&Информация..." msgstr "&Информация..."
#: pysollib/tile/selectcardset.py:237 pysollib/tk/menubar.py:1156 #: pysollib/tile/selectcardset.py:237 pysollib/tk/menubar.py:1158
#: pysollib/tk/menubar.py:1158 pysollib/tk/selectcardset.py:241 #: pysollib/tk/menubar.py:1160 pysollib/tk/selectcardset.py:241
msgid "&Load" msgid "&Load"
msgstr "&Загрузить" msgstr "&Загрузить"
@ -3736,38 +3782,46 @@ msgid "Autodrop"
msgstr "Сбросить" msgstr "Сбросить"
#: pysollib/tile/toolbar.py:195 pysollib/tk/toolbar.py:198 #: pysollib/tile/toolbar.py:195 pysollib/tk/toolbar.py:198
msgid "Shuffle"
msgstr "Перемешать"
#: pysollib/tile/toolbar.py:195 pysollib/tk/toolbar.py:198
msgid "Shuffle tiles"
msgstr "Перемешать фишки"
#: pysollib/tile/toolbar.py:196 pysollib/tk/toolbar.py:199
msgid "Pause" msgid "Pause"
msgstr "Пауза" msgstr "Пауза"
#: pysollib/tile/toolbar.py:195 pysollib/tk/toolbar.py:198 #: pysollib/tile/toolbar.py:196 pysollib/tk/toolbar.py:199
msgid "Pause game" msgid "Pause game"
msgstr "Приостановить игру" msgstr "Приостановить игру"
#: pysollib/tile/toolbar.py:197 pysollib/tk/toolbar.py:200 #: pysollib/tile/toolbar.py:198 pysollib/tk/toolbar.py:201
msgid "View statistics" msgid "View statistics"
msgstr "Посмотреть статистику" msgstr "Посмотреть статистику"
#: pysollib/tile/toolbar.py:198 pysollib/tk/toolbar.py:201 #: pysollib/tile/toolbar.py:199 pysollib/tk/toolbar.py:202
msgid "Rules" msgid "Rules"
msgstr "Правила" msgstr "Правила"
#: pysollib/tile/toolbar.py:198 pysollib/tk/toolbar.py:201 #: pysollib/tile/toolbar.py:199 pysollib/tk/toolbar.py:202
msgid "Rules for this game" msgid "Rules for this game"
msgstr "Правила текущей игры" msgstr "Правила текущей игры"
#: pysollib/tile/toolbar.py:200 pysollib/tk/toolbar.py:203 #: pysollib/tile/toolbar.py:201 pysollib/tk/toolbar.py:204
msgid "Quit" msgid "Quit"
msgstr "Выйти" msgstr "Выйти"
#: pysollib/tile/toolbar.py:214 pysollib/tk/toolbar.py:217 #: pysollib/tile/toolbar.py:215 pysollib/tk/toolbar.py:218
msgid "Player" msgid "Player"
msgstr "Игрок" msgstr "Игрок"
#: pysollib/tile/toolbar.py:215 pysollib/tk/toolbar.py:218 #: pysollib/tile/toolbar.py:216 pysollib/tk/toolbar.py:219
msgid "Player options" msgid "Player options"
msgstr "Установки игрока" msgstr "Установки игрока"
#: pysollib/tile/toolbar.py:396 pysollib/tk/toolbar.py:433 #: pysollib/tile/toolbar.py:397 pysollib/tk/toolbar.py:434
msgid "Toolbar" msgid "Toolbar"
msgstr "Панель инструментов" msgstr "Панель инструментов"
@ -3823,31 +3877,31 @@ msgstr "&Лог сессии..."
msgid "&Full log..." msgid "&Full log..."
msgstr "&Полный лог..." msgstr "&Полный лог..."
#: pysollib/util.py:80 #: pysollib/util.py:82
msgid "Club" msgid "Club"
msgstr "Треф" msgstr "Треф"
#: pysollib/util.py:80 #: pysollib/util.py:82
msgid "Diamond" msgid "Diamond"
msgstr "Буби" msgstr "Буби"
#: pysollib/util.py:80 #: pysollib/util.py:82
msgid "Heart" msgid "Heart"
msgstr "Черви" msgstr "Черви"
#: pysollib/util.py:80 #: pysollib/util.py:82
msgid "Spade" msgid "Spade"
msgstr "Пики" msgstr "Пики"
#: pysollib/util.py:81 #: pysollib/util.py:83
msgid "black" msgid "black"
msgstr "чёрный" msgstr "чёрный"
#: pysollib/util.py:81 #: pysollib/util.py:83
msgid "red" msgid "red"
msgstr "красный" msgstr "красный"
#: pysollib/util.py:106 #: pysollib/util.py:108
msgid "cardset" msgid "cardset"
msgstr "набор карт" msgstr "набор карт"
@ -4146,6 +4200,15 @@ msgstr "Всего ходов"
msgid "Set font" msgid "Set font"
msgstr "Настроить шрифт" msgstr "Настроить шрифт"
#~ msgid ""
#~ " Free\n"
#~ "Matching\n"
#~ "Pairs"
#~ msgstr ""
#~ " \n"
#~ "свободных\n"
#~ "пар"
#~ msgid " cards" #~ msgid " cards"
#~ msgstr " карт" #~ msgstr " карт"

View file

@ -29,7 +29,6 @@ __all__ = []
# Imports # Imports
import sys, re import sys, re
import time import time
from gettext import ungettext
#from tkFont import Font #from tkFont import Font
# PySol imports # PySol imports
@ -838,6 +837,8 @@ a solvable configuration.'''),
if self.preview > 1 or self.texts.info is None: if self.preview > 1 or self.texts.info is None:
return return
from gettext import ungettext
# find matching tiles # find matching tiles
stacks = [] stacks = []
for r in self.s.rows: for r in self.s.rows:
@ -867,7 +868,7 @@ a solvable configuration.'''),
t) % t t) % t
r2 = ungettext('%d\nTile\nRemaining\n\n', r2 = ungettext('%d\nTile\nRemaining\n\n',
'%d\nTiles\nRemaining\n\n', '%d\nTiles\nRemaining\n\n',
t) % (self.NCARDS - t) self.NCARDS - t) % (self.NCARDS - t)
t = r1 + r2 + f t = r1 + r2 + f
self.texts.info.config(text=t) self.texts.info.config(text=t)

View file

@ -125,6 +125,10 @@ class PysolMenubar(PysolMenubarActions):
ltk2gtk('&Redo'), 'R', ltk2gtk('&Redo'), 'R',
ltk2gtk('Redo'), ltk2gtk('Redo'),
self.mRedo), self.mRedo),
('shuffle', gtk.STOCK_EXECUTE,
ltk2gtk('Shuffle tiles'), 'F',
ltk2gtk('Shuffle tiles'),
self.mShuffle),
('autodrop', gtk.STOCK_JUMP_TO, ('autodrop', gtk.STOCK_JUMP_TO,
ltk2gtk('&Auto drop'), 'A', ltk2gtk('&Auto drop'), 'A',
ltk2gtk('Auto drop'), ltk2gtk('Auto drop'),
@ -289,7 +293,7 @@ class PysolMenubar(PysolMenubarActions):
('animationnone', None, ltk2gtk('&None'), None, None, 0), ('animationnone', None, ltk2gtk('&None'), None, None, 0),
('animationveryfast', None, ltk2gtk('&Very fast'), None, None, 1), ('animationveryfast', None, ltk2gtk('&Very fast'), None, None, 1),
('animationfast', None, ltk2gtk('&Fast'), None, None, 2), ('animationfast', None, ltk2gtk('&Fast'), None, None, 2),
('animationmedium', None, ltk2gtk('&Medium'), None, None, 3), ('animationmedium', None, ltk2gtk('&Medium'), None, None, 3),
('animationslow', None, ltk2gtk('&Slow'), None, None, 4), ('animationslow', None, ltk2gtk('&Slow'), None, None, 4),
('animationveryslow', None, ltk2gtk('V&ery slow'), None, None, 5), ('animationveryslow', None, ltk2gtk('V&ery slow'), None, None, 5),
) )

View file

@ -63,6 +63,7 @@ class PysolToolbar(PysolToolbarActions):
<separator/> <separator/>
<toolitem action='undo'/> <toolitem action='undo'/>
<toolitem action='redo'/> <toolitem action='redo'/>
<toolitem action='shuffle'/>
<toolitem action='autodrop'/> <toolitem action='autodrop'/>
<toolitem action='pause'/> <toolitem action='pause'/>
<separator/> <separator/>
@ -160,40 +161,7 @@ class PysolToolbar(PysolToolbarActions):
# FIXME # FIXME
pass pass
def config(self, w, v):
# /*********************************************************************** # FIXME
# // pass
# ************************************************************************/
#%ifndef BUNDLE
class TestToolbar(PysolToolbar):
def __init__(self, top, args):
from util import DataLoader
dir = "kde-large"
dir = "gnome-large"
if len(args) > 1: dir = args[1]
dir = os.path.join(os.pardir, os.pardir, "data", "toolbar", dir)
##print dataloader.dir
PysolToolbar.__init__(self, top, dir)
# test some settings
self.updateText(player="Player\nPySol")
self.undo_button.set_state(STATE_INSENSITIVE)
def mQuit(self, *args):
gtk.main_quit()
def toolbar_main(args):
from tkwrap import MfxRoot
root = MfxRoot()
root.connect("destroy", mainquit)
root.connect("delete_event", mainquit)
toolbar = TestToolbar(root, args)
root.show_all()
mainloop()
return 0
if __name__ == '__main__':
sys.exit(toolbar_main(sys.argv))
#%endif

View file

@ -483,8 +483,9 @@ class AllGamesFrame(Tkinter.Frame):
def fillTreeview(self, player): def fillTreeview(self, player):
if self.tree_items: if self.tree_items:
self.tree.delete(tuple(self.tree_items)) return
self.tree_items = [] #self.tree.delete(tuple(self.tree_items))
#self.tree_items = []
self.formatter.writeStats(player, sort_by=self.sort_by) self.formatter.writeStats(player, sort_by=self.sort_by)
if self.dialog.buttons: if self.dialog.buttons:
run_button = self.dialog.buttons[0] run_button = self.dialog.buttons[0]

View file

@ -61,16 +61,18 @@ __all__ = ['SUITS',
# imports # imports
import sys, os, re, time import sys, os, re, time
try:
import Image, ImageTk, ImageOps
except ImportError:
Image = ImageTk = ImageOps = None
# PySol imports # PySol imports
from settings import DATA_DIRS from settings import DATA_DIRS, TOOLKIT
from mfxutil import Image from mfxutil import Image
# PIL
Image = ImageTk = ImageOps = None
if TOOLKIT == 'tk':
try:
import Image, ImageTk, ImageOps
except ImportError:
pass
# /*********************************************************************** # /***********************************************************************
# // constants # // constants