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

** version 0.9.4 **

* misc improvements


git-svn-id: file:///home/shlomif/Backup/svn-dumps/PySolFC/svnsync-repos/pysolfc/PySolFC/trunk@88 efabe8c0-fbe8-4139-b769-b5e6d273206e
This commit is contained in:
skomoroh 2006-11-07 22:23:43 +00:00
parent 5ae17501e1
commit c687cdc9b6
8 changed files with 162 additions and 146 deletions

View file

@ -61,3 +61,8 @@ graft data/cardset-oxymoron
graft data/cardset-standard graft data/cardset-standard
graft data/cardset-tuxedo graft data/cardset-tuxedo
graft data/cardset-vienna-2k graft data/cardset-vienna-2k
##
## exclude dirs
##
global-exclude .xvpics/* .thumbnails/*
global-exclude .svn/* .svn/*/*

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: Mon Nov 6 09:46:50 2006\n" "POT-Creation-Date: Tue Nov 7 05:42:15 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"
@ -534,6 +534,9 @@ msgstr ""
msgid "Chinese Solitaire" msgid "Chinese Solitaire"
msgstr "" msgstr ""
msgid "Chinese Spider"
msgstr ""
msgid "Chip" msgid "Chip"
msgstr "" msgstr ""

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: Mon Nov 6 09:47:42 2006\n" "POT-Creation-Date: Tue Nov 7 05:43:10 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-06 09:47+0300\n" "POT-Creation-Date: 2006-11-07 05:43+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"
@ -69,7 +69,7 @@ msgid "&Next number"
msgstr "" msgstr ""
#: pysollib/actions.py:314 pysollib/app.py:892 pysollib/app.py:1155 #: pysollib/actions.py:314 pysollib/app.py:892 pysollib/app.py:1155
#: pysollib/app.py:1167 pysollib/game.py:929 pysollib/game.py:1865 #: pysollib/app.py:1167 pysollib/game.py:929 pysollib/game.py:1864
#: pysollib/main.py:376 pysollib/main.py:384 pysollib/tk/colorsdialog.py:122 #: pysollib/main.py:376 pysollib/main.py:384 pysollib/tk/colorsdialog.py:122
#: 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/gameinfodialog.py:155 #: pysollib/tk/fontsdialog.py:205 pysollib/tk/gameinfodialog.py:155
@ -87,8 +87,8 @@ msgid "&OK"
msgstr "" msgstr ""
#: pysollib/actions.py:314 pysollib/app.py:893 pysollib/app.py:1167 #: pysollib/actions.py:314 pysollib/app.py:893 pysollib/app.py:1167
#: pysollib/game.py:929 pysollib/game.py:1315 pysollib/game.py:1330 #: pysollib/game.py:929 pysollib/game.py:1314 pysollib/game.py:1329
#: pysollib/game.py:1337 pysollib/game.py:1343 pysollib/tk/colorsdialog.py:122 #: pysollib/game.py:1336 pysollib/game.py:1342 pysollib/tk/colorsdialog.py:122
#: 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:1122 #: pysollib/tk/fontsdialog.py:205 pysollib/tk/menubar.py:1122
#: pysollib/tk/menubar.py:1124 pysollib/tk/playeroptionsdialog.py:85 #: pysollib/tk/menubar.py:1124 pysollib/tk/playeroptionsdialog.py:85
@ -111,108 +111,108 @@ msgstr ""
msgid "Quit " msgid "Quit "
msgstr "" msgstr ""
#: pysollib/actions.py:449 #: pysollib/actions.py:450
msgid "Clear bookmarks" msgid "Clear bookmarks"
msgstr "" msgstr ""
#: pysollib/actions.py:450 #: pysollib/actions.py:451
msgid "Clear all bookmarks ?" msgid "Clear all bookmarks ?"
msgstr "" msgstr ""
#: pysollib/actions.py:460 #: pysollib/actions.py:461
msgid "Restart game" msgid "Restart game"
msgstr "" msgstr ""
#: pysollib/actions.py:461 #: pysollib/actions.py:462
msgid "Restart this game ?" msgid "Restart this game ?"
msgstr "" msgstr ""
#: pysollib/actions.py:502 #: pysollib/actions.py:503
msgid "" msgid ""
"Comments for %s:\n" "Comments for %s:\n"
"\n" "\n"
msgstr "" msgstr ""
#: pysollib/actions.py:504 #: pysollib/actions.py:505
msgid "Comments for " msgid "Comments for "
msgstr "" msgstr ""
#: pysollib/actions.py:522 pysollib/actions.py:550 #: pysollib/actions.py:523 pysollib/actions.py:551
msgid "Error while writing to file" msgid "Error while writing to file"
msgstr "" msgstr ""
#: pysollib/actions.py:525 pysollib/actions.py:553 #: pysollib/actions.py:526 pysollib/actions.py:554
msgid " Info" msgid " Info"
msgstr "" msgstr ""
#: pysollib/actions.py:526 #: pysollib/actions.py:527
msgid "" msgid ""
"Comments were appended to\n" "Comments were appended to\n"
"\n" "\n"
msgstr "" msgstr ""
#: pysollib/actions.py:537 #: pysollib/actions.py:538
msgid "Demo statistics" msgid "Demo statistics"
msgstr "" msgstr ""
#: pysollib/actions.py:540 #: pysollib/actions.py:541
msgid "Your statistics" msgid "Your statistics"
msgstr "" msgstr ""
#: pysollib/actions.py:554 #: pysollib/actions.py:555
msgid "" msgid ""
" were appended to\n" " were appended to\n"
"\n" "\n"
msgstr "" msgstr ""
#: pysollib/actions.py:568 #: pysollib/actions.py:569
msgid " Demo" msgid " Demo"
msgstr "" msgstr ""
#: pysollib/actions.py:568 #: pysollib/actions.py:569
msgid " Demo " msgid " Demo "
msgstr "" msgstr ""
#: pysollib/actions.py:571 pysollib/actions.py:589 #: pysollib/actions.py:572 pysollib/actions.py:590
msgid " for " msgid " for "
msgstr "" msgstr ""
#: pysollib/actions.py:577 pysollib/stats.py:206 #: pysollib/actions.py:578 pysollib/stats.py:206
msgid "Statistics for " msgid "Statistics for "
msgstr "" msgstr ""
#: pysollib/actions.py:580 pysollib/tk/selectgame.py:350 #: pysollib/actions.py:581 pysollib/tk/selectgame.py:350
#: pysollib/tk/toolbar.py:208 #: pysollib/tk/toolbar.py:208
msgid "Statistics" msgid "Statistics"
msgstr "" msgstr ""
#: pysollib/actions.py:583 data/glade-translations:31 #: pysollib/actions.py:584 data/glade-translations:31
msgid "Full log" msgid "Full log"
msgstr "" msgstr ""
#: pysollib/actions.py:586 data/glade-translations:32 #: pysollib/actions.py:587 data/glade-translations:32
msgid "Session log" msgid "Session log"
msgstr "" msgstr ""
#: pysollib/actions.py:592 #: pysollib/actions.py:593
msgid "Game Info" msgid "Game Info"
msgstr "" msgstr ""
#: pysollib/actions.py:608 #: pysollib/actions.py:609
msgid "Reset all statistics" msgid "Reset all statistics"
msgstr "" msgstr ""
#: pysollib/actions.py:609 #: pysollib/actions.py:610
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:615 #: pysollib/actions.py:616
msgid "Reset game statistics" msgid "Reset game statistics"
msgstr "" msgstr ""
#: pysollib/actions.py:616 #: pysollib/actions.py:617
msgid "" msgid ""
"Reset statistics and logs for player\n" "Reset statistics and logs for player\n"
"%s\n" "%s\n"
@ -220,23 +220,23 @@ msgid ""
"%s ?" "%s ?"
msgstr "" msgstr ""
#: pysollib/actions.py:671 #: pysollib/actions.py:672
msgid "Play demo" msgid "Play demo"
msgstr "" msgstr ""
#: pysollib/actions.py:682 #: pysollib/actions.py:683
msgid "Set player options" msgid "Set player options"
msgstr "" msgstr ""
#: pysollib/actions.py:696 data/glade-translations:40 #: pysollib/actions.py:697 data/glade-translations:40
msgid "Set colors" msgid "Set colors"
msgstr "" msgstr ""
#: pysollib/actions.py:716 #: pysollib/actions.py:717
msgid "Set fonts" msgid "Set fonts"
msgstr "" msgstr ""
#: pysollib/actions.py:725 data/glade-translations:33 #: pysollib/actions.py:726 data/glade-translations:33
msgid "Set timeouts" msgid "Set timeouts"
msgstr "" msgstr ""
@ -244,8 +244,8 @@ msgstr ""
msgid "Unknown" msgid "Unknown"
msgstr "" msgstr ""
#: pysollib/app.py:894 pysollib/game.py:1315 pysollib/game.py:1330 #: pysollib/app.py:894 pysollib/game.py:1314 pysollib/game.py:1329
#: pysollib/game.py:1337 pysollib/game.py:1343 pysollib/tk/menubar.py:363 #: pysollib/game.py:1336 pysollib/game.py:1342 pysollib/tk/menubar.py:363
msgid "&New game" msgid "&New game"
msgstr "" msgstr ""
@ -286,45 +286,45 @@ msgstr ""
msgid "Discard current game ?" msgid "Discard current game ?"
msgstr "" msgstr ""
#: pysollib/game.py:1269 #: pysollib/game.py:1268
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:1272 #: pysollib/game.py:1271
msgid "" msgid ""
"\n" "\n"
"and #%d in the %s of moves" "and #%d in the %s of moves"
msgstr "" msgstr ""
#: pysollib/game.py:1274 #: pysollib/game.py:1273
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:1277 #: pysollib/game.py:1276
msgid "" msgid ""
"\n" "\n"
"and #%d in the %s of total moves" "and #%d in the %s of total moves"
msgstr "" msgstr ""
#: pysollib/game.py:1279 #: pysollib/game.py:1278
msgid "" msgid ""
"\n" "\n"
"You have reached\n" "You have reached\n"
"#%d in the %s of total moves" "#%d in the %s of total moves"
msgstr "" msgstr ""
#: pysollib/game.py:1306 pysollib/game.py:1322 #: pysollib/game.py:1305 pysollib/game.py:1321
#: pysollib/tk/soundoptionsdialog.py:100 #: pysollib/tk/soundoptionsdialog.py:100
msgid "Game won" msgid "Game won"
msgstr "" msgstr ""
#: pysollib/game.py:1307 #: pysollib/game.py:1306
msgid "" msgid ""
"\n" "\n"
"Congratulations, this\n" "Congratulations, this\n"
@ -335,7 +335,7 @@ msgid ""
"%s\n" "%s\n"
msgstr "" msgstr ""
#: pysollib/game.py:1323 #: pysollib/game.py:1322
msgid "" msgid ""
"\n" "\n"
"Congratulations, you did it !\n" "Congratulations, you did it !\n"
@ -345,100 +345,100 @@ msgid ""
"%s\n" "%s\n"
msgstr "" msgstr ""
#: pysollib/game.py:1335 pysollib/game.py:1341 #: pysollib/game.py:1334 pysollib/game.py:1340
#: pysollib/tk/soundoptionsdialog.py:98 #: pysollib/tk/soundoptionsdialog.py:98
msgid "Game finished" msgid "Game finished"
msgstr "" msgstr ""
#: pysollib/game.py:1336 pysollib/game.py:1866 #: pysollib/game.py:1335 pysollib/game.py:1865
msgid "" msgid ""
"\n" "\n"
"Game finished\n" "Game finished\n"
msgstr "" msgstr ""
#: pysollib/game.py:1342 #: pysollib/game.py:1341
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:1343 #: pysollib/game.py:1342
msgid "&Restart" msgid "&Restart"
msgstr "" msgstr ""
#: pysollib/game.py:1757 #: pysollib/game.py:1756
msgid "Score %6d" msgid "Score %6d"
msgstr "" msgstr ""
#: pysollib/game.py:1856 #: pysollib/game.py:1855
msgid "&Cool" msgid "&Cool"
msgstr "" msgstr ""
#: pysollib/game.py:1856 #: pysollib/game.py:1855
msgid "&Great" msgid "&Great"
msgstr "" msgstr ""
#: pysollib/game.py:1856 #: pysollib/game.py:1855
msgid "&Wow" msgid "&Wow"
msgstr "" msgstr ""
#: pysollib/game.py:1856 #: pysollib/game.py:1855
msgid "&Yeah" msgid "&Yeah"
msgstr "" msgstr ""
#: pysollib/game.py:1857 pysollib/game.py:1869 pysollib/game.py:1882 #: pysollib/game.py:1856 pysollib/game.py:1868 pysollib/game.py:1881
msgid " Autopilot" msgid " Autopilot"
msgstr "" msgstr ""
#: pysollib/game.py:1858 #: pysollib/game.py:1857
msgid "" msgid ""
"\n" "\n"
"Game solved in %d moves.\n" "Game solved in %d moves.\n"
msgstr "" msgstr ""
#: pysollib/game.py:1881 #: pysollib/game.py:1880
msgid "&Hmm" msgid "&Hmm"
msgstr "" msgstr ""
#: pysollib/game.py:1881 #: pysollib/game.py:1880
msgid "&Oh well" msgid "&Oh well"
msgstr "" msgstr ""
#: pysollib/game.py:1881 #: pysollib/game.py:1880
msgid "&That's life" msgid "&That's life"
msgstr "" msgstr ""
#: pysollib/game.py:1883 #: 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:2295 #: pysollib/game.py:2294
msgid "Set bookmark" msgid "Set bookmark"
msgstr "" msgstr ""
#: pysollib/game.py:2296 #: pysollib/game.py:2295
msgid "Replace existing bookmark %d ?" msgid "Replace existing bookmark %d ?"
msgstr "" msgstr ""
#: pysollib/game.py:2318 #: pysollib/game.py:2317
msgid "Goto bookmark" msgid "Goto bookmark"
msgstr "" msgstr ""
#: pysollib/game.py:2319 #: pysollib/game.py:2318
msgid "Goto bookmark %d ?" msgid "Goto bookmark %d ?"
msgstr "" msgstr ""
#: pysollib/game.py:2350 #: pysollib/game.py:2349
msgid "Open game" msgid "Open game"
msgstr "" msgstr ""
#: pysollib/game.py:2361 pysollib/game.py:2370 pysollib/game.py:2375 #: pysollib/game.py:2360 pysollib/game.py:2369 pysollib/game.py:2374
msgid "Load game error" msgid "Load game error"
msgstr "" msgstr ""
#: pysollib/game.py:2362 #: pysollib/game.py:2361
msgid "" msgid ""
"Error while loading game.\n" "Error while loading game.\n"
"\n" "\n"
@ -446,22 +446,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:2371 #: pysollib/game.py:2370
msgid "Error while loading game" msgid "Error while loading game"
msgstr "" msgstr ""
#: pysollib/game.py:2376 #: pysollib/game.py:2375
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:2401 #: pysollib/game.py:2400
msgid "Save game error" msgid "Save game error"
msgstr "" msgstr ""
#: pysollib/game.py:2402 #: pysollib/game.py:2401
msgid "Error while saving game" msgid "Error while saving game"
msgstr "" msgstr ""

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: Mon Nov 6 09:46:50 2006\n" "POT-Creation-Date: Tue Nov 7 05:42:15 2006\n"
"PO-Revision-Date: 2006-10-31 19:57+0300\n" "PO-Revision-Date: 2006-11-07 05:51+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"
@ -538,6 +538,9 @@ msgstr "Китайский Клондайк"
msgid "Chinese Solitaire" msgid "Chinese Solitaire"
msgstr "Китайский пасьянс" msgstr "Китайский пасьянс"
msgid "Chinese Spider"
msgstr "Китайский Паук"
msgid "Chip" msgid "Chip"
msgstr "Щепка" msgstr "Щепка"
@ -2790,9 +2793,8 @@ msgstr "Четырёхугольник"
msgid "Quadruple Alliance" msgid "Quadruple Alliance"
msgstr "Четырёхсторонний альянс" msgstr "Четырёхсторонний альянс"
#, fuzzy
msgid "Quads" msgid "Quads"
msgstr "Четвёрка" msgstr "Четвёрки"
msgid "Quartets" msgid "Quartets"
msgstr "Квартеты" msgstr "Квартеты"
@ -3778,7 +3780,7 @@ msgid "Zeus"
msgstr "Зевс" msgstr "Зевс"
msgid "Zigzag Course" msgid "Zigzag Course"
msgstr "" msgstr "Зигзагообразный курс"
msgid "Zodiac" msgid "Zodiac"
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: Mon Nov 6 09:47:42 2006\n" "POT-Creation-Date: Tue Nov 7 05:43:10 2006\n"
"PO-Revision-Date: 2006-11-06 09:53+0300\n" "PO-Revision-Date: 2006-11-06 09:53+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"
@ -54,7 +54,7 @@ msgid "&Next number"
msgstr "&Следующий номер" msgstr "&Следующий номер"
#: pysollib/actions.py:314 pysollib/app.py:892 pysollib/app.py:1155 #: pysollib/actions.py:314 pysollib/app.py:892 pysollib/app.py:1155
#: pysollib/app.py:1167 pysollib/game.py:929 pysollib/game.py:1865 #: pysollib/app.py:1167 pysollib/game.py:929 pysollib/game.py:1864
#: pysollib/main.py:376 pysollib/main.py:384 pysollib/tk/colorsdialog.py:122 #: pysollib/main.py:376 pysollib/main.py:384 pysollib/tk/colorsdialog.py:122
#: 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/gameinfodialog.py:155 #: pysollib/tk/fontsdialog.py:205 pysollib/tk/gameinfodialog.py:155
@ -72,8 +72,8 @@ msgid "&OK"
msgstr "&ОК" msgstr "&ОК"
#: pysollib/actions.py:314 pysollib/app.py:893 pysollib/app.py:1167 #: pysollib/actions.py:314 pysollib/app.py:893 pysollib/app.py:1167
#: pysollib/game.py:929 pysollib/game.py:1315 pysollib/game.py:1330 #: pysollib/game.py:929 pysollib/game.py:1314 pysollib/game.py:1329
#: pysollib/game.py:1337 pysollib/game.py:1343 pysollib/tk/colorsdialog.py:122 #: pysollib/game.py:1336 pysollib/game.py:1342 pysollib/tk/colorsdialog.py:122
#: 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:1122 #: pysollib/tk/fontsdialog.py:205 pysollib/tk/menubar.py:1122
#: pysollib/tk/menubar.py:1124 pysollib/tk/playeroptionsdialog.py:85 #: pysollib/tk/menubar.py:1124 pysollib/tk/playeroptionsdialog.py:85
@ -96,23 +96,23 @@ msgstr "Выбрать следующую игру"
msgid "Quit " msgid "Quit "
msgstr "Выйти из " msgstr "Выйти из "
#: pysollib/actions.py:449 #: pysollib/actions.py:450
msgid "Clear bookmarks" msgid "Clear bookmarks"
msgstr "Удалить закладки" msgstr "Удалить закладки"
#: pysollib/actions.py:450 #: pysollib/actions.py:451
msgid "Clear all bookmarks ?" msgid "Clear all bookmarks ?"
msgstr "Удалить все закладки?" msgstr "Удалить все закладки?"
#: pysollib/actions.py:460 #: pysollib/actions.py:461
msgid "Restart game" msgid "Restart game"
msgstr "Начать игру с начала" msgstr "Начать игру с начала"
#: pysollib/actions.py:461 #: pysollib/actions.py:462
msgid "Restart this game ?" msgid "Restart this game ?"
msgstr "Начать игру с начала?" msgstr "Начать игру с начала?"
#: pysollib/actions.py:502 #: pysollib/actions.py:503
msgid "" msgid ""
"Comments for %s:\n" "Comments for %s:\n"
"\n" "\n"
@ -120,19 +120,19 @@ msgstr ""
"Комментарий для %s:\n" "Комментарий для %s:\n"
"\n" "\n"
#: pysollib/actions.py:504 #: pysollib/actions.py:505
msgid "Comments for " msgid "Comments for "
msgstr "Комментарий для " msgstr "Комментарий для "
#: pysollib/actions.py:522 pysollib/actions.py:550 #: pysollib/actions.py:523 pysollib/actions.py:551
msgid "Error while writing to file" msgid "Error while writing to file"
msgstr "Ошибка при записи в файл" msgstr "Ошибка при записи в файл"
#: pysollib/actions.py:525 pysollib/actions.py:553 #: pysollib/actions.py:526 pysollib/actions.py:554
msgid " Info" msgid " Info"
msgstr " Информация" msgstr " Информация"
#: pysollib/actions.py:526 #: pysollib/actions.py:527
msgid "" msgid ""
"Comments were appended to\n" "Comments were appended to\n"
"\n" "\n"
@ -140,15 +140,15 @@ msgstr ""
"Комментарий добавлен в файл\n" "Комментарий добавлен в файл\n"
"\n" "\n"
#: pysollib/actions.py:537 #: pysollib/actions.py:538
msgid "Demo statistics" msgid "Demo statistics"
msgstr "Статистика демо" msgstr "Статистика демо"
#: pysollib/actions.py:540 #: pysollib/actions.py:541
msgid "Your statistics" msgid "Your statistics"
msgstr "Ваша статистика" msgstr "Ваша статистика"
#: pysollib/actions.py:554 #: pysollib/actions.py:555
msgid "" msgid ""
" were appended to\n" " were appended to\n"
"\n" "\n"
@ -156,44 +156,44 @@ msgstr ""
" добавлена в файл\n" " добавлена в файл\n"
"\n" "\n"
#: pysollib/actions.py:568 #: pysollib/actions.py:569
msgid " Demo" msgid " Demo"
msgstr " Демо" msgstr " Демо"
#: pysollib/actions.py:568 #: pysollib/actions.py:569
msgid " Demo " msgid " Demo "
msgstr " Демо " msgstr " Демо "
#: pysollib/actions.py:571 pysollib/actions.py:589 #: pysollib/actions.py:572 pysollib/actions.py:590
msgid " for " msgid " for "
msgstr " для " msgstr " для "
#: pysollib/actions.py:577 pysollib/stats.py:206 #: pysollib/actions.py:578 pysollib/stats.py:206
msgid "Statistics for " msgid "Statistics for "
msgstr "Статистика игры " msgstr "Статистика игры "
#: pysollib/actions.py:580 pysollib/tk/selectgame.py:350 #: pysollib/actions.py:581 pysollib/tk/selectgame.py:350
#: pysollib/tk/toolbar.py:208 #: pysollib/tk/toolbar.py:208
msgid "Statistics" msgid "Statistics"
msgstr "Статистика" msgstr "Статистика"
#: pysollib/actions.py:583 data/glade-translations:31 #: pysollib/actions.py:584 data/glade-translations:31
msgid "Full log" msgid "Full log"
msgstr "Полный лог" msgstr "Полный лог"
#: pysollib/actions.py:586 data/glade-translations:32 #: pysollib/actions.py:587 data/glade-translations:32
msgid "Session log" msgid "Session log"
msgstr "Лог сессии" msgstr "Лог сессии"
#: pysollib/actions.py:592 #: pysollib/actions.py:593
msgid "Game Info" msgid "Game Info"
msgstr "Информация об игре" msgstr "Информация об игре"
#: pysollib/actions.py:608 #: pysollib/actions.py:609
msgid "Reset all statistics" msgid "Reset all statistics"
msgstr "Очистить всю статистику" msgstr "Очистить всю статистику"
#: pysollib/actions.py:609 #: pysollib/actions.py:610
msgid "" msgid ""
"Reset ALL statistics and logs for player\n" "Reset ALL statistics and logs for player\n"
"%s ?" "%s ?"
@ -201,11 +201,11 @@ msgstr ""
"Очистить всю статистику и лог для игрока\n" "Очистить всю статистику и лог для игрока\n"
"%s?" "%s?"
#: pysollib/actions.py:615 #: pysollib/actions.py:616
msgid "Reset game statistics" msgid "Reset game statistics"
msgstr "Очистить статистику игры" msgstr "Очистить статистику игры"
#: pysollib/actions.py:616 #: pysollib/actions.py:617
msgid "" msgid ""
"Reset statistics and logs for player\n" "Reset statistics and logs for player\n"
"%s\n" "%s\n"
@ -217,23 +217,23 @@ msgstr ""
"и игры\n" "и игры\n"
"%s?" "%s?"
#: pysollib/actions.py:671 #: pysollib/actions.py:672
msgid "Play demo" msgid "Play demo"
msgstr "Показать демо" msgstr "Показать демо"
#: pysollib/actions.py:682 #: pysollib/actions.py:683
msgid "Set player options" msgid "Set player options"
msgstr "Установить настройки игрока" msgstr "Установить настройки игрока"
#: pysollib/actions.py:696 data/glade-translations:40 #: pysollib/actions.py:697 data/glade-translations:40
msgid "Set colors" msgid "Set colors"
msgstr "Настроить цвета" msgstr "Настроить цвета"
#: pysollib/actions.py:716 #: pysollib/actions.py:717
msgid "Set fonts" msgid "Set fonts"
msgstr "Настроить шрифт" msgstr "Настроить шрифт"
#: pysollib/actions.py:725 data/glade-translations:33 #: pysollib/actions.py:726 data/glade-translations:33
msgid "Set timeouts" msgid "Set timeouts"
msgstr "Настроить таймауты" msgstr "Настроить таймауты"
@ -241,8 +241,8 @@ msgstr "Настроить таймауты"
msgid "Unknown" msgid "Unknown"
msgstr "Неизвестный" msgstr "Неизвестный"
#: pysollib/app.py:894 pysollib/game.py:1315 pysollib/game.py:1330 #: pysollib/app.py:894 pysollib/game.py:1314 pysollib/game.py:1329
#: pysollib/game.py:1337 pysollib/game.py:1343 pysollib/tk/menubar.py:363 #: pysollib/game.py:1336 pysollib/game.py:1342 pysollib/tk/menubar.py:363
msgid "&New game" msgid "&New game"
msgstr "&Новая игра" msgstr "&Новая игра"
@ -288,7 +288,7 @@ msgstr "Игрок\n"
msgid "Discard current game ?" msgid "Discard current game ?"
msgstr "Завершить текущую игру?" msgstr "Завершить текущую игру?"
#: pysollib/game.py:1269 #: pysollib/game.py:1268
msgid "" msgid ""
"\n" "\n"
"You have reached\n" "You have reached\n"
@ -298,7 +298,7 @@ msgstr ""
"Вы достигли\n" "Вы достигли\n"
"#%d в %s игрового времени" "#%d в %s игрового времени"
#: pysollib/game.py:1272 #: pysollib/game.py:1271
msgid "" msgid ""
"\n" "\n"
"and #%d in the %s of moves" "and #%d in the %s of moves"
@ -306,7 +306,7 @@ msgstr ""
"\n" "\n"
"и #%d в %s количества ходов" "и #%d в %s количества ходов"
#: pysollib/game.py:1274 #: pysollib/game.py:1273
msgid "" msgid ""
"\n" "\n"
"You have reached\n" "You have reached\n"
@ -316,7 +316,7 @@ msgstr ""
"Вы достигли\n" "Вы достигли\n"
"#%d в %s количества ходов" "#%d в %s количества ходов"
#: pysollib/game.py:1277 #: pysollib/game.py:1276
msgid "" msgid ""
"\n" "\n"
"and #%d in the %s of total moves" "and #%d in the %s of total moves"
@ -324,7 +324,7 @@ msgstr ""
"\n" "\n"
"и #%d в %s общего количества ходов" "и #%d в %s общего количества ходов"
#: pysollib/game.py:1279 #: pysollib/game.py:1278
msgid "" msgid ""
"\n" "\n"
"You have reached\n" "You have reached\n"
@ -334,12 +334,12 @@ msgstr ""
"Вы достигли\n" "Вы достигли\n"
"#%d в %s общего количества ходов" "#%d в %s общего количества ходов"
#: pysollib/game.py:1306 pysollib/game.py:1322 #: pysollib/game.py:1305 pysollib/game.py:1321
#: pysollib/tk/soundoptionsdialog.py:100 #: pysollib/tk/soundoptionsdialog.py:100
msgid "Game won" msgid "Game won"
msgstr "Игра выиграна" msgstr "Игра выиграна"
#: pysollib/game.py:1307 #: pysollib/game.py:1306
msgid "" msgid ""
"\n" "\n"
"Congratulations, this\n" "Congratulations, this\n"
@ -358,7 +358,7 @@ msgstr ""
"Количество ходов: %s\n" "Количество ходов: %s\n"
"%s\n" "%s\n"
#: pysollib/game.py:1323 #: pysollib/game.py:1322
msgid "" msgid ""
"\n" "\n"
"Congratulations, you did it !\n" "Congratulations, you did it !\n"
@ -375,12 +375,12 @@ msgstr ""
"Количество ходов: %s\n" "Количество ходов: %s\n"
"%s\n" "%s\n"
#: pysollib/game.py:1335 pysollib/game.py:1341 #: pysollib/game.py:1334 pysollib/game.py:1340
#: pysollib/tk/soundoptionsdialog.py:98 #: pysollib/tk/soundoptionsdialog.py:98
msgid "Game finished" msgid "Game finished"
msgstr "Игра закончена" msgstr "Игра закончена"
#: pysollib/game.py:1336 pysollib/game.py:1866 #: pysollib/game.py:1335 pysollib/game.py:1865
msgid "" msgid ""
"\n" "\n"
"Game finished\n" "Game finished\n"
@ -388,7 +388,7 @@ msgstr ""
"\n" "\n"
"Игра закончена\n" "Игра закончена\n"
#: pysollib/game.py:1342 #: pysollib/game.py:1341
msgid "" msgid ""
"\n" "\n"
"Game finished, but not without my help...\n" "Game finished, but not without my help...\n"
@ -396,35 +396,35 @@ msgstr ""
"\n" "\n"
"Игра закончена, но не без моей помощи...\n" "Игра закончена, но не без моей помощи...\n"
#: pysollib/game.py:1343 #: pysollib/game.py:1342
msgid "&Restart" msgid "&Restart"
msgstr "&Начало" msgstr "&Начало"
#: pysollib/game.py:1757 #: pysollib/game.py:1756
msgid "Score %6d" msgid "Score %6d"
msgstr "Счёт %6d" msgstr "Счёт %6d"
#: pysollib/game.py:1856 #: pysollib/game.py:1855
msgid "&Cool" msgid "&Cool"
msgstr "&Отлично" msgstr "&Отлично"
#: pysollib/game.py:1856 #: pysollib/game.py:1855
msgid "&Great" msgid "&Great"
msgstr "&Здорово" msgstr "&Здорово"
#: pysollib/game.py:1856 #: pysollib/game.py:1855
msgid "&Wow" msgid "&Wow"
msgstr "&Ура" msgstr "&Ура"
#: pysollib/game.py:1856 #: pysollib/game.py:1855
msgid "&Yeah" msgid "&Yeah"
msgstr "&Ага" msgstr "&Ага"
#: pysollib/game.py:1857 pysollib/game.py:1869 pysollib/game.py:1882 #: pysollib/game.py:1856 pysollib/game.py:1868 pysollib/game.py:1881
msgid " Autopilot" msgid " Autopilot"
msgstr " Автопилот" msgstr " Автопилот"
#: pysollib/game.py:1858 #: pysollib/game.py:1857
msgid "" msgid ""
"\n" "\n"
"Game solved in %d moves.\n" "Game solved in %d moves.\n"
@ -432,19 +432,19 @@ msgstr ""
"\n" "\n"
"Игра решена за %d ходов\n" "Игра решена за %d ходов\n"
#: pysollib/game.py:1881 #: pysollib/game.py:1880
msgid "&Hmm" msgid "&Hmm"
msgstr "&Хмм" msgstr "&Хмм"
#: pysollib/game.py:1881 #: pysollib/game.py:1880
msgid "&Oh well" msgid "&Oh well"
msgstr "&Ох" msgstr "&Ох"
#: pysollib/game.py:1881 #: pysollib/game.py:1880
msgid "&That's life" msgid "&That's life"
msgstr "&Такова жизнь" msgstr "&Такова жизнь"
#: pysollib/game.py:1883 #: pysollib/game.py:1882
msgid "" msgid ""
"\n" "\n"
"This won't come out...\n" "This won't come out...\n"
@ -452,31 +452,31 @@ msgstr ""
"\n" "\n"
"Не удалось...\n" "Не удалось...\n"
#: pysollib/game.py:2295 #: pysollib/game.py:2294
msgid "Set bookmark" msgid "Set bookmark"
msgstr "Установить закладку" msgstr "Установить закладку"
#: pysollib/game.py:2296 #: pysollib/game.py:2295
msgid "Replace existing bookmark %d ?" msgid "Replace existing bookmark %d ?"
msgstr "Заменить существующую закладку %d ?" msgstr "Заменить существующую закладку %d ?"
#: pysollib/game.py:2318 #: pysollib/game.py:2317
msgid "Goto bookmark" msgid "Goto bookmark"
msgstr "Перейти к закладке" msgstr "Перейти к закладке"
#: pysollib/game.py:2319 #: pysollib/game.py:2318
msgid "Goto bookmark %d ?" msgid "Goto bookmark %d ?"
msgstr "Перейти к закладке %d ?" msgstr "Перейти к закладке %d ?"
#: pysollib/game.py:2350 #: pysollib/game.py:2349
msgid "Open game" msgid "Open game"
msgstr "Открыть игру" msgstr "Открыть игру"
#: pysollib/game.py:2361 pysollib/game.py:2370 pysollib/game.py:2375 #: pysollib/game.py:2360 pysollib/game.py:2369 pysollib/game.py:2374
msgid "Load game error" msgid "Load game error"
msgstr "Ошибка при загрузке игры" msgstr "Ошибка при загрузке игры"
#: pysollib/game.py:2362 #: pysollib/game.py:2361
msgid "" msgid ""
"Error while loading game.\n" "Error while loading game.\n"
"\n" "\n"
@ -488,11 +488,11 @@ msgstr ""
"Возможно повреждён файл,\n" "Возможно повреждён файл,\n"
"или ошибка в программе." "или ошибка в программе."
#: pysollib/game.py:2371 #: pysollib/game.py:2370
msgid "Error while loading game" msgid "Error while loading game"
msgstr "Ошибка при загрузке игры" msgstr "Ошибка при загрузке игры"
#: pysollib/game.py:2376 #: pysollib/game.py:2375
msgid "" msgid ""
"Internal error while loading game.\n" "Internal error while loading game.\n"
"\n" "\n"
@ -502,11 +502,11 @@ msgstr ""
"\n" "\n"
"Пожалуйста сообщите об этой ошибке." "Пожалуйста сообщите об этой ошибке."
#: pysollib/game.py:2401 #: pysollib/game.py:2400
msgid "Save game error" msgid "Save game error"
msgstr "Ошибка при сохранении игры" msgstr "Ошибка при сохранении игры"
#: pysollib/game.py:2402 #: pysollib/game.py:2401
msgid "Error while saving game" msgid "Error while saving game"
msgstr "Ошибка при сохранении игры" msgstr "Ошибка при сохранении игры"

View file

@ -337,6 +337,7 @@ class GI:
('fc-0.9.1', tuple(range(421, 441))), ('fc-0.9.1', tuple(range(421, 441))),
('fc-0.9.2', tuple(range(441, 466))), ('fc-0.9.2', tuple(range(441, 466))),
('fc-0.9.3', tuple(range(466, 661))), ('fc-0.9.3', tuple(range(466, 661))),
('fc-0.9.4', tuple(range(661, 671))),
) )
# deprecated - the correct way is to or a GI.GT_XXX flag # deprecated - the correct way is to or a GI.GT_XXX flag

View file

@ -268,7 +268,8 @@ class HTMLViewer:
# create text widget # create text widget
text_frame = Tkinter.Frame(parent) text_frame = Tkinter.Frame(parent)
text_frame.grid(row=1, column=0, columnspan=4, sticky='nsew') text_frame.grid(row=1, column=0, columnspan=4,
sticky='nsew', padx=1, pady=1)
vbar = Tkinter.Scrollbar(text_frame) vbar = Tkinter.Scrollbar(text_frame)
vbar.pack(side=Tkinter.RIGHT, fill=Tkinter.Y) vbar.pack(side=Tkinter.RIGHT, fill=Tkinter.Y)
self.text = Tkinter.Text(text_frame, self.text = Tkinter.Text(text_frame,

View file

@ -78,12 +78,16 @@ class AbstractToolbarButton:
self.visible = True self.visible = True
if orient == Tkinter.HORIZONTAL: if orient == Tkinter.HORIZONTAL:
padx, pady = 0, 2 padx, pady = 0, 2
if os.name == 'nt':
padx, pady = 0, 0
self.grid(row=0, self.grid(row=0,
column=self.position, column=self.position,
padx=padx, pady=pady, padx=padx, pady=pady,
sticky='nsew') sticky='nsew')
else: else:
padx, pady = 2, 0 padx, pady = 2, 0
if os.name == 'nt':
padx, pady = 0, 0
self.grid(row=self.position, self.grid(row=self.position,
column=0, column=0,
padx=padx, pady=pady, padx=padx, pady=pady,