* updated russian translation

* fixed menubar
* minor fixes


git-svn-id: file:///home/shlomif/Backup/svn-dumps/PySolFC/svnsync-repos/pysolfc/PySolFC/trunk@206 efabe8c0-fbe8-4139-b769-b5e6d273206e

po/games.pot

@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PySol 0.0.1\n"
-"POT-Creation-Date: Sun Aug 19 18:52:43 2007\n"
+"POT-Creation-Date: Sat Sep  1 22:26:18 2007\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -120,6 +120,9 @@ msgstr ""
 msgid "American Toad"
 msgstr ""
 
+msgid "Amphibian"
+msgstr ""
+
 msgid "Anno Domini"
 msgstr ""
 
@@ -576,6 +579,9 @@ msgstr ""
 msgid "Chip"
 msgstr ""
 
+msgid "Choice"
+msgstr ""
+
 msgid "Cicely"
 msgstr ""
 
@@ -711,6 +717,9 @@ msgstr ""
 msgid "Demon"
 msgstr ""
 
+msgid "Demon Fan"
+msgstr ""
+
 msgid "Der Katzenschwanz"
 msgstr ""
 
@@ -1128,6 +1137,9 @@ msgstr ""
 msgid "Florentine Patience"
 msgstr ""
 
+msgid "Flourish"
+msgstr ""
+
 msgid "Flower Arrangement"
 msgstr ""
 
@@ -1380,7 +1392,7 @@ msgstr ""
 msgid "Griffon"
 msgstr ""
 
-msgid "Ground for a Divorce"
+msgid "Grounds for a Divorce"
 msgstr ""
 
 msgid "Gypsy"

po/ru_games.po

@@ -5,8 +5,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PySol 0.0.1\n"
-"POT-Creation-Date: Sun Aug 19 18:52:43 2007\n"
+"POT-Creation-Date: Sat Sep  1 22:26:18 2007\n"
-"PO-Revision-Date: 2007-05-11 17:25+0400\n"
+"PO-Revision-Date: 2007-09-01 23:15+0400\n"
 "Last-Translator: Скоморох <skomoroh@gmail.com>\n"
 "Language-Team: Russian <ru@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -119,6 +119,9 @@ msgstr "Американская коробочка"
 msgid "American Toad"
 msgstr "Американская жаба"
 
+msgid "Amphibian"
+msgstr "Амфибия"
+
 msgid "Anno Domini"
 msgstr "Anno Domini"
 
@@ -341,9 +344,8 @@ msgstr "Чёрная вдова"
 msgid "Blind Alleys"
 msgstr "Тёмные аллеи"
 
-#, fuzzy
 msgid "Blind Patience"
-msgstr "Бразильский пасьянс"
+msgstr "Слепой пасьянс"
 
 msgid "Blockade"
 msgstr "Блокада"
@@ -367,7 +369,7 @@ msgid "Bonaparte"
 msgstr "Бонапарт"
 
 msgid "Boomerang"
-msgstr ""
+msgstr "Бумеранг"
 
 msgid "Boost"
 msgstr "Повышение"
@@ -580,6 +582,9 @@ msgstr "Китайский Паук"
 msgid "Chip"
 msgstr "Щепка"
 
+msgid "Choice"
+msgstr "Выбор"
+
 msgid "Cicely"
 msgstr "Кервель"
 
@@ -661,9 +666,8 @@ msgstr "Конверт"
 msgid "Crescent"
 msgstr "Полумесяц"
 
-#, fuzzy
 msgid "Cringle"
-msgstr "Треугольник"
+msgstr "Люверс"
 
 msgid "Cross"
 msgstr "Крест"
@@ -717,6 +721,10 @@ msgstr "Доставка"
 msgid "Demon"
 msgstr "Демон"
 
+#, fuzzy
+msgid "Demon Fan"
+msgstr "Демон"
+
 msgid "Der Katzenschwanz"
 msgstr "Der Katzenschwanz"
 
@@ -736,7 +744,7 @@ msgid "Der letzte Monarch"
 msgstr "Der letzte Monarch"
 
 msgid "Desert Island"
-msgstr ""
+msgstr "Необитаемый остров"
 
 msgid "Deuces"
 msgstr "Двойки"
@@ -823,9 +831,8 @@ msgstr "Двойной кузнечик"
 msgid "Double Fives"
 msgstr "Двойные пятёрки"
 
-#, fuzzy
 msgid "Double Footling"
-msgstr "Двойной Дельфин"
+msgstr "Двойной Пустяковый"
 
 msgid "Double FreeCell"
 msgstr "Двойная свободная ячейка"
@@ -1122,20 +1129,17 @@ msgstr "Пять кучек"
 msgid "Five Pyramids"
 msgstr "Пять пирамид"
 
-#, fuzzy
 msgid "Flake"
-msgstr "Фламенко"
+msgstr "Хлопья"
 
-#, fuzzy
 msgid "Flake (2 decks)"
-msgstr "Церлин (3 колоды)"
+msgstr "Хлопья (2 колоды)"
 
 msgid "Flamenco"
 msgstr "Фламенко"
 
-#, fuzzy
 msgid "Flipper"
-msgstr "Dieppe"
+msgstr "Флиппер"
 
 msgid "Floating City"
 msgstr "Плавающий город"
@@ -1146,6 +1150,9 @@ msgstr "Флорадора"
 msgid "Florentine Patience"
 msgstr "Флорентийский пасьянс"
 
+msgid "Flourish"
+msgstr "Завиток"
+
 msgid "Flower Arrangement"
 msgstr "Аранжировка цветов"
 
@@ -1165,15 +1172,14 @@ msgid "Flying Dragon"
 msgstr "Летящий дракон"
 
 msgid "Footling"
-msgstr ""
+msgstr "Пустяковый"
 
 #, fuzzy
 msgid "ForeCell"
 msgstr "Свободная ячейка"
 
-#, fuzzy
 msgid "Forest Glade"
-msgstr "Цветочный сад"
+msgstr "Лесная поляна"
 
 msgid "Formic"
 msgstr "Муравьиный"
@@ -1211,9 +1217,8 @@ msgstr "Четыре короля"
 msgid "Four Leaf Clovers"
 msgstr "Четырёхлистный клевер"
 
-#, fuzzy
 msgid "Four Packs"
-msgstr "Четыре кучи"
+msgstr "Четыре пакета"
 
 msgid "Four Seasons"
 msgstr "Четыре сезона"
@@ -1372,9 +1377,8 @@ msgstr "Великая Герцогиня"
 msgid "Grand Duchess +"
 msgstr "Великая Герцогиня +"
 
-#, fuzzy
 msgid "Grandee"
-msgstr "Гранада"
+msgstr "Гранд"
 
 msgid "Grandfather"
 msgstr "Дедушка"
@@ -1406,8 +1410,8 @@ msgstr "Длинная коса"
 msgid "Griffon"
 msgstr "Грифон"
 
-msgid "Ground for a Divorce"
+msgid "Grounds for a Divorce"
-msgstr "Повод для разрыва"
+msgstr "Основание для развода"
 
 msgid "Gypsy"
 msgstr "Цыганский"
@@ -1670,9 +1674,8 @@ msgstr ""
 msgid "King Only Hex A Klon"
 msgstr "Королевский Шестнадцатиричный Клондайк"
 
-#, fuzzy
 msgid "King Tut"
-msgstr "Король Альберт"
+msgstr "Король Тут"
 
 msgid "KingCell"
 msgstr "Королевская Ячейка"
@@ -1819,7 +1822,7 @@ msgid "Legion"
 msgstr "Легион"
 
 msgid "Leprechaun"
-msgstr ""
+msgstr "Лепрехун"
 
 msgid "Les Quatre Coins"
 msgstr "Les Quatre Coins"
@@ -1840,7 +1843,7 @@ msgid "Limited"
 msgstr "Ограниченный"
 
 msgid "Limpopo"
-msgstr ""
+msgstr "Лимпопо"
 
 msgid "Lion"
 msgstr "Лев"
@@ -1864,9 +1867,8 @@ msgstr "Маленький Наполеон"
 msgid "Lobachevsky"
 msgstr "Лобачевский"
 
-#, fuzzy
 msgid "Locked Cards"
-msgstr "Угловая карта"
+msgstr "Блокированные карты"
 
 msgid "Long Braid"
 msgstr "Долгая коса"
@@ -1877,9 +1879,8 @@ msgstr "Долгое путешествие в Куддапах"
 msgid "Long Tail"
 msgstr "Длинный хвост"
 
-#, fuzzy
 msgid "Long Trip"
-msgstr "Длинный хвост"
+msgstr "Долгий путь"
 
 msgid "Loose Ends"
 msgstr "Свободные концы"
@@ -2562,9 +2563,8 @@ msgstr "Монтана"
 msgid "Monte Carlo"
 msgstr "Монте-Карло"
 
-#, fuzzy
 msgid "Monte Carlo (2 decks)"
-msgstr "Монте-Карло"
+msgstr "Монте-Карло (2 колоды)"
 
 msgid "Moonlight"
 msgstr "Лунный свет"
@@ -2823,9 +2823,8 @@ msgstr ""
 msgid "Peek"
 msgstr "Взгляд"
 
-#, fuzzy
 msgid "Peek II"
-msgstr "Взгляд"
+msgstr "Взгляд II"
 
 msgid "Pegged"
 msgstr ""
@@ -3049,9 +3048,8 @@ msgstr "Смягчённый Паук"
 msgid "Repair"
 msgstr "Ремонт"
 
-#, fuzzy
 msgid "Reserves"
-msgstr "Полушария"
+msgstr "Резервные ячейки"
 
 msgid "Retinue"
 msgstr "Свита"
@@ -3243,9 +3241,8 @@ msgstr "Тенистые аллеи"
 msgid "Shamrocks"
 msgstr "Трилистники"
 
-#, fuzzy
 msgid "Shamrocks II"
-msgstr "Трилистники"
+msgstr "Трилистники II"
 
 msgid "Shamsher"
 msgstr ""
@@ -3607,9 +3604,8 @@ msgstr "Сад"
 msgid "The Great Wall"
 msgstr "Великая Стена"
 
-#, fuzzy
 msgid "The Jolly Roger"
-msgstr "Дверь"
+msgstr "Весёлый Роджер"
 
 msgid "The Last Monarch"
 msgstr "Последний Монарх"
@@ -3703,11 +3699,10 @@ msgid "Toni"
 msgstr ""
 
 msgid "Topsy-Turvy Queens"
-msgstr ""
+msgstr "Дамы кувырком"
 
-#, fuzzy
 msgid "Tornado"
-msgstr "Жаба"
+msgstr "Торнадо"
 
 #, fuzzy
 msgid "Totally Random-Made"
@@ -3735,9 +3730,8 @@ msgstr "Люк"
 msgid "Trapdoor Spider"
 msgstr "Люк Паука"
 
-#, fuzzy
 msgid "Travellers"
-msgstr "Волны"
+msgstr "Путешественники"
 
 msgid "Treasure Trove"
 msgstr "Клад"
@@ -3800,22 +3794,20 @@ msgstr "Тройка"
 msgid "Trusty Twelve"
 msgstr "Верные двенадцать"
 
-#, fuzzy
 msgid "Turncoats"
-msgstr "Турнир"
+msgstr "Перебежчики"
 
 msgid "Tuxedo"
 msgstr "Смокинг"
 
 msgid "Twelve Sleeping Maids"
-msgstr ""
+msgstr "Двенадцать спящих дев"
 
 msgid "Twenty"
 msgstr "Двенадцать"
 
-#, fuzzy
 msgid "Twilight Zone"
-msgstr "Маджонг Tile Fighter"
+msgstr "Сумеречная зона"
 
 msgid "Twin"
 msgstr "Двоня"
@@ -3839,9 +3831,8 @@ msgstr "Два знакомца"
 msgid "Two Pyramids"
 msgstr "Две пирамиды"
 
-#, fuzzy
 msgid "Two Rings"
-msgstr "Круги"
+msgstr "Два кольца"
 
 msgid "Two Squares"
 msgstr "Два квадрата"
@@ -3907,7 +3898,7 @@ msgid "Virginia Reel"
 msgstr "Виргинский Рил"
 
 msgid "Voracious"
-msgstr ""
+msgstr "Ненасытный"
 
 #, fuzzy
 msgid "Wake-Robin"
@@ -3929,9 +3920,8 @@ msgstr "Фаворит Вашингтона"
 msgid "Wasp"
 msgstr "Оса"
 
-#, fuzzy
 msgid "Waterfall"
-msgstr "Ватерлоо"
+msgstr "Водопад"
 
 msgid "Waterloo"
 msgstr "Ватерлоо"
@@ -3952,9 +3942,8 @@ msgstr "Свадьбы"
 msgid "Wedges"
 msgstr "Клинья"
 
-#, fuzzy
 msgid "Well"
-msgstr "Стена"
+msgstr "Колодец"
 
 #, fuzzy
 msgid "Well2"
@@ -3978,9 +3967,8 @@ msgstr "Колесо фортуны"
 msgid "Whitehead"
 msgstr "Уайтхэд"
 
-#, fuzzy
 msgid "Whitehorse"
-msgstr "Риттенхаус"
+msgstr "Уайтхорс"
 
 msgid "Wicked"
 msgstr "Злой"

pysollib/actions.py

@@ -497,18 +497,6 @@ class PysolMenubarActions:
             if self.game.canShuffle():
                 self.game._mahjonggShuffle()
 
-    def mStatus(self, *args):
-        if self._cancelDrag(break_pause=False): return
-        self.mPlayerStats(mode=100)
-
-    def mTop10(self, *args):
-        if self._cancelDrag(break_pause=False): return
-        self.mPlayerStats(mode=105)
-
-    def mGameInfo(self, *args):
-        if self._cancelDrag(break_pause=False): return
-        self.mPlayerStats(mode=106)
-
     def mFindCard(self, *args):
         create_find_card_dialog(self.game.top, self.game,
                                 self.app.getFindCardImagesDir())
@@ -897,11 +885,6 @@ class PysolToolbarActions:
             self.menubar.mPause()
         return 1
 
-    def mStatus(self, *args):
-        if not self._busy():
-            self.menubar.mStatus()
-        return 1
-
     def mPlayerStats(self, *args):
         if not self._busy():
             self.menubar.mPlayerStats()

pysollib/pysolgtk/menubar.py

@@ -890,3 +890,8 @@ class PysolMenubar(PysolMenubarActions):
     def _setPauseMenu(self, v):
         # FIXME
         pass
+
+    def mStatus(self, *args):
+        if self._cancelDrag(break_pause=False): return
+        self.mPlayerStats(mode=100)
+

pysollib/stack.py

@@ -880,7 +880,7 @@ class Stack:
             return False
         if self.CARD_YOFFSET[0] <= 0:
             return False
-        if len(self.cards) <= 8:        # XXX
+        if len(self.cards) <= 1:
             return False
         if not self.canvas.winfo_ismapped():
             return False

pysollib/tile/menubar.py

@@ -356,10 +356,10 @@ class PysolMenubar(PysolMenubarActions):
         submenu = MfxMenu(menu, label=n_("R&ecent games"))
         ##menu.add_command(label=n_("Select &random game"), command=self.mSelectRandomGame, accelerator=m+"R")
         submenu = MfxMenu(menu, label=n_("Select &random game"))
-        submenu.add_command(label=n_("&All games"), command=lambda self=self: self.mSelectRandomGame('all'), accelerator=m+"R")
+        submenu.add_command(label=n_("&All games"), command=lambda : self.mSelectRandomGame('all'), accelerator=m+"R")
-        submenu.add_command(label=n_("Games played and &won"), command=lambda self=self: self.mSelectRandomGame('won'))
+        submenu.add_command(label=n_("Games played and &won"), command=lambda : self.mSelectRandomGame('won'))
-        submenu.add_command(label=n_("Games played and &not won"), command=lambda self=self: self.mSelectRandomGame('not won'))
+        submenu.add_command(label=n_("Games played and &not won"), command=lambda : self.mSelectRandomGame('not won'))
-        submenu.add_command(label=n_("Games not &played"), command=lambda self=self: self.mSelectRandomGame('not played'))
+        submenu.add_command(label=n_("Games not &played"), command=lambda : self.mSelectRandomGame('not played'))
         menu.add_command(label=n_("Select game by nu&mber..."), command=self.mSelectGameById, accelerator=m+"M")
         menu.add_separator()
         submenu = MfxMenu(menu, label=n_("Fa&vorite games"))
@@ -390,12 +390,12 @@ class PysolMenubar(PysolMenubarActions):
         submenu = MfxMenu(menu, label=n_("&Set bookmark"))
         for i in range(9):
             label = _("Bookmark %d") % (i + 1)
-            submenu.add_command(label=label, command=lambda self=self, i=i: self.mSetBookmark(i))
+            submenu.add_command(label=label, command=lambda i=i: self.mSetBookmark(i))
         submenu = MfxMenu(menu, label=n_("Go&to bookmark"))
         for i in range(9):
             label = _("Bookmark %d") % (i + 1)
             acc = m + "%d" % (i + 1)
-            submenu.add_command(label=label, command=lambda self=self, i=i: self.mGotoBookmark(i), accelerator=acc)
+            submenu.add_command(label=label, command=lambda i=i: self.mGotoBookmark(i), accelerator=acc)
         menu.add_command(label=n_("&Clear bookmarks"), command=self.mClearBookmarks)
         menu.add_separator()
 
@@ -412,13 +412,13 @@ class PysolMenubar(PysolMenubarActions):
         menu.add_checkbutton(label=n_("&Pause"), variable=self.tkopt.pause, command=self.mPause, accelerator="P")
         #menu.add_command(label=n_("&Pause"), command=self.mPause, accelerator="P")
         menu.add_separator()
-        menu.add_command(label=n_("S&tatus..."), command=self.mStatus, accelerator=m+"Y")
+        menu.add_command(label=n_("S&tatus..."), command=lambda : self.mPlayerStats(mode=100), accelerator=m+"Y")
         menu.add_checkbutton(label=n_("&Comments..."), variable=self.tkopt.comment, command=self.mEditGameComment)
         menu.add_separator()
-        menu.add_command(label=n_("&Statistics..."), command=self.mPlayerStats)
+        menu.add_command(label=n_("&Statistics..."), command=self.mPlayerStats, accelerator=m+"T")
-        menu.add_command(label=n_("Log..."), command=lambda self=self: self.mPlayerStats(mode=103))
+        menu.add_command(label=n_("Log..."), command=lambda : self.mPlayerStats(mode=103))
         menu.add_separator()
-        menu.add_command(label=n_("D&emo statistics"), command=lambda self=self: self.mPlayerStats(mode=1101))
+        menu.add_command(label=n_("D&emo statistics"), command=lambda : self.mPlayerStats(mode=1101))
 
         menu = MfxMenu(self.__menubar, label=n_("&Assist"))
         menu.add_command(label=n_("&Hint"), command=self.mHint, accelerator="H")
@@ -428,9 +428,9 @@ class PysolMenubar(PysolMenubarActions):
         menu.add_command(label=n_("&Demo"), command=self.mDemo, accelerator=m+"D")
         menu.add_command(label=n_("Demo (&all games)"), command=self.mMixedDemo)
         if USE_FREECELL_SOLVER:
-            menu.add_command(label=n_("&Solver (experimental)"), command=self.mSolver)
+            menu.add_command(label=n_("&Solver"), command=self.mSolver)
         else:
-            menu.add_command(label=n_("&Solver (experimental)"), command=self.mSolver, state='disabled')
+            menu.add_command(label=n_("&Solver"), state='disabled')
         menu.add_separator()
         menu.add_command(label=n_("&Piles description"), command=self.mStackDesk, accelerator="F2")
 
@@ -530,7 +530,7 @@ class PysolMenubar(PysolMenubarActions):
         self._bindKey("",   "n", self.mNewGame)
         self._bindKey(ctrl, "w", self.mSelectGameDialog)
         self._bindKey(ctrl, "v", self.mSelectGameDialogWithPreview)
-        self._bindKey(ctrl, "r", lambda e, self=self: self.mSelectRandomGame())
+        self._bindKey(ctrl, "r", lambda e: self.mSelectRandomGame())
         self._bindKey(ctrl, "m", self.mSelectGameById)
         self._bindKey(ctrl, "n", self.mNewGameWithNextId)
         self._bindKey(ctrl, "o", self.mOpen)
@@ -543,8 +543,8 @@ class PysolMenubar(PysolMenubarActions):
         self._bindKey("",   "r", self.mRedo)
         self._bindKey(ctrl, "g", self.mRestart)
         self._bindKey("",   "space", self.mDeal)        # undocumented
-        self._bindKey(ctrl, "y", self.mStatus)
+        self._bindKey(ctrl, "y", lambda e: self.mPlayerStats(mode=100))
-        self._bindKey(ctrl, "t", self.mTop10)
+        self._bindKey(ctrl, "t", self.mPlayerStats)
         self._bindKey("",   "h", self.mHint)
         self._bindKey(ctrl, "h", self.mHint1)           # undocumented
         ##self._bindKey("",   "Shift_L", self.mHighlightPiles)
@@ -575,12 +575,12 @@ class PysolMenubar(PysolMenubarActions):
 
         self._bindKey("",   "F2", self.mStackDesk)
         #
-        self._bindKey("",   "slash", self.mGameInfo) # undocumented, devel
+        self._bindKey("", "slash", lambda e: self.mPlayerStats(mode=106)) # undocumented, devel
         #
         self._bindKey("",   "f", self.mShuffle)
 
         for i in range(9):
-            self._bindKey(ctrl, str(i+1),  lambda event, self=self, i=i: self.mGotoBookmark(i, confirm=0))
+            self._bindKey(ctrl, str(i+1),  lambda e, i=i: self.mGotoBookmark(i, confirm=0))
 
         # undocumented, devel
         self._bindKey(ctrl, "End", self.mPlayNextMusic)

pysollib/tk/menubar.py

@@ -353,10 +353,10 @@ class PysolMenubar(PysolMenubarActions):
         submenu = MfxMenu(menu, label=n_("R&ecent games"))
         ##menu.add_command(label=n_("Select &random game"), command=self.mSelectRandomGame, accelerator=m+"R")
         submenu = MfxMenu(menu, label=n_("Select &random game"))
-        submenu.add_command(label=n_("&All games"), command=lambda self=self: self.mSelectRandomGame('all'), accelerator=m+"R")
+        submenu.add_command(label=n_("&All games"), command=lambda : self.mSelectRandomGame('all'), accelerator=m+"R")
-        submenu.add_command(label=n_("Games played and &won"), command=lambda self=self: self.mSelectRandomGame('won'))
+        submenu.add_command(label=n_("Games played and &won"), command=lambda : self.mSelectRandomGame('won'))
-        submenu.add_command(label=n_("Games played and &not won"), command=lambda self=self: self.mSelectRandomGame('not won'))
+        submenu.add_command(label=n_("Games played and &not won"), command=lambda : self.mSelectRandomGame('not won'))
-        submenu.add_command(label=n_("Games not &played"), command=lambda self=self: self.mSelectRandomGame('not played'))
+        submenu.add_command(label=n_("Games not &played"), command=lambda : self.mSelectRandomGame('not played'))
         menu.add_command(label=n_("Select game by nu&mber..."), command=self.mSelectGameById, accelerator=m+"M")
         menu.add_separator()
         submenu = MfxMenu(menu, label=n_("Fa&vorite games"))
@@ -387,12 +387,12 @@ class PysolMenubar(PysolMenubarActions):
         submenu = MfxMenu(menu, label=n_("&Set bookmark"))
         for i in range(9):
             label = _("Bookmark %d") % (i + 1)
-            submenu.add_command(label=label, command=lambda self=self, i=i: self.mSetBookmark(i))
+            submenu.add_command(label=label, command=lambda i=i: self.mSetBookmark(i))
         submenu = MfxMenu(menu, label=n_("Go&to bookmark"))
         for i in range(9):
             label = _("Bookmark %d") % (i + 1)
             acc = m + "%d" % (i + 1)
-            submenu.add_command(label=label, command=lambda self=self, i=i: self.mGotoBookmark(i), accelerator=acc)
+            submenu.add_command(label=label, command=lambda i=i: self.mGotoBookmark(i), accelerator=acc)
         menu.add_command(label=n_("&Clear bookmarks"), command=self.mClearBookmarks)
         menu.add_separator()
 
@@ -409,21 +409,21 @@ class PysolMenubar(PysolMenubarActions):
         menu.add_checkbutton(label=n_("&Pause"), variable=self.tkopt.pause, command=self.mPause, accelerator="P")
         #menu.add_command(label=n_("&Pause"), command=self.mPause, accelerator="P")
         menu.add_separator()
-        menu.add_command(label=n_("S&tatus..."), command=self.mStatus, accelerator=m+"Y")
+        menu.add_command(label=n_("S&tatus..."), command=lambda : self.mPlayerStats(mode=100), accelerator=m+"Y")
         menu.add_checkbutton(label=n_("&Comments..."), variable=self.tkopt.comment, command=self.mEditGameComment)
         menu.add_separator()
         submenu = MfxMenu(menu, label=n_("&Statistics"))
-        submenu.add_command(label=n_("Current game..."), command=lambda self=self: self.mPlayerStats(mode=101))
+        submenu.add_command(label=n_("Current game..."), command=lambda : self.mPlayerStats(mode=101))
-        submenu.add_command(label=n_("All games..."), command=lambda self=self: self.mPlayerStats(mode=102))
+        submenu.add_command(label=n_("All games..."), command=lambda : self.mPlayerStats(mode=102))
         submenu.add_separator()
-        submenu.add_command(label=n_("Session log..."), command=lambda self=self: self.mPlayerStats(mode=104))
+        submenu.add_command(label=n_("Session log..."), command=lambda : self.mPlayerStats(mode=104))
-        submenu.add_command(label=n_("Full log..."), command=lambda self=self: self.mPlayerStats(mode=103))
+        submenu.add_command(label=n_("Full log..."), command=lambda : self.mPlayerStats(mode=103))
         submenu.add_separator()
-        submenu.add_command(label=TOP_TITLE+"...", command=self.mTop10, accelerator=m+"T")
+        submenu.add_command(label=TOP_TITLE+"...", command=lambda : self.mPlayerStats(mode=105), accelerator=m+"T")
-        submenu.add_command(label=n_("Progression..."), command=lambda self=self: self.mPlayerStats(mode=107))
+        submenu.add_command(label=n_("Progression..."), command=lambda : self.mPlayerStats(mode=107))
         submenu = MfxMenu(menu, label=n_("D&emo statistics"))
-        submenu.add_command(label=n_("Current game..."), command=lambda self=self: self.mPlayerStats(mode=1101))
+        submenu.add_command(label=n_("Current game..."), command=lambda : self.mPlayerStats(mode=1101))
-        submenu.add_command(label=n_("All games..."), command=lambda self=self: self.mPlayerStats(mode=1102))
+        submenu.add_command(label=n_("All games..."), command=lambda : self.mPlayerStats(mode=1102))
 
         menu = MfxMenu(self.__menubar, label=n_("&Assist"))
         menu.add_command(label=n_("&Hint"), command=self.mHint, accelerator="H")
@@ -433,9 +433,9 @@ class PysolMenubar(PysolMenubarActions):
         menu.add_command(label=n_("&Demo"), command=self.mDemo, accelerator=m+"D")
         menu.add_command(label=n_("Demo (&all games)"), command=self.mMixedDemo)
         if USE_FREECELL_SOLVER:
-            menu.add_command(label=n_("&Solver (experimental)"), command=self.mSolver)
+            menu.add_command(label=n_("&Solver"), command=self.mSolver)
         else:
-            menu.add_command(label=n_("&Solver (experimental)"), command=self.mSolver, state='disabled')
+            menu.add_command(label=n_("&Solver"), state='disabled')
         menu.add_separator()
         menu.add_command(label=n_("&Piles description"), command=self.mStackDesk, accelerator="F2")
 
@@ -534,7 +534,7 @@ class PysolMenubar(PysolMenubarActions):
         self._bindKey("",   "n", self.mNewGame)
         self._bindKey(ctrl, "w", self.mSelectGameDialog)
         self._bindKey(ctrl, "v", self.mSelectGameDialogWithPreview)
-        self._bindKey(ctrl, "r", lambda e, self=self: self.mSelectRandomGame())
+        self._bindKey(ctrl, "r", lambda e: self.mSelectRandomGame())
         self._bindKey(ctrl, "m", self.mSelectGameById)
         self._bindKey(ctrl, "n", self.mNewGameWithNextId)
         self._bindKey(ctrl, "o", self.mOpen)
@@ -547,8 +547,8 @@ class PysolMenubar(PysolMenubarActions):
         self._bindKey("",   "r", self.mRedo)
         self._bindKey(ctrl, "g", self.mRestart)
         self._bindKey("",   "space", self.mDeal)        # undocumented
-        self._bindKey(ctrl, "y", self.mStatus)
+        self._bindKey(ctrl, "y", lambda e: self.mPlayerStats(mode=100))
-        self._bindKey(ctrl, "t", self.mTop10)
+        self._bindKey(ctrl, "t", lambda e: self.mPlayerStats(mode=105))
         self._bindKey("",   "h", self.mHint)
         self._bindKey(ctrl, "h", self.mHint1)           # undocumented
         ##self._bindKey("",   "Shift_L", self.mHighlightPiles)
@@ -579,12 +579,12 @@ class PysolMenubar(PysolMenubarActions):
 
         self._bindKey("",   "F2", self.mStackDesk)
         #
-        self._bindKey("",   "slash", self.mGameInfo) # undocumented, devel
+        self._bindKey("", "slash", lambda e: self.mPlayerStats(mode=106)) # undocumented, devel
         #
         self._bindKey("",   "f", self.mShuffle)
 
         for i in range(9):
-            self._bindKey(ctrl, str(i+1),  lambda event, self=self, i=i: self.mGotoBookmark(i, confirm=0))
+            self._bindKey(ctrl, str(i+1),  lambda e, i=i: self.mGotoBookmark(i, confirm=0))
 
         # undocumented, devel
         self._bindKey(ctrl, "End", self.mPlayNextMusic)

pysollib/wizardutil.py

@@ -334,7 +334,7 @@ WizardWidgets = (
     _('Reserves'),
     ReservesNum,
     ReservesMaxAccept,
-    _('Initial dealing'),
+    _('Opening deal'),
     DealType,
     DealFaceDown,
     DealFaceUp,