diff --git a/Makefile b/Makefile index 6c2531cb..2f182e32 100644 --- a/Makefile +++ b/Makefile @@ -27,8 +27,11 @@ rules: mv data/html-src/html data pot: - pygettext.py -k n_ -o po/pysol.pot $(PYSOLLIB_FILES) ./scripts/all_games.py gettext > po/games.pot + pygettext.py -k n_ -o po/pysol-1.pot $(PYSOLLIB_FILES) + xgettext -L C --keyword=N_ -o po/pysol-2.pot data/glade-translations + msgcat po/pysol-1.pot po/pysol-2.pot > po/pysol.pot + rm -f po/pysol-1.pot po/pysol-2.pot for lng in ru; do \ mv -f po/$${lng}_pysol.po po/$${lng}_pysol.old.po; \ msgmerge po/$${lng}_pysol.old.po po/pysol.pot > po/$${lng}_pysol.po; \ diff --git a/data/glade-translations b/data/glade-translations new file mode 100644 index 00000000..020d0e77 --- /dev/null +++ b/data/glade-translations @@ -0,0 +1,71 @@ +/* + * Translatable strings file generated by Glade. + * Add this file to your project's POTFILES.in. + * DO NOT compile it as part of your application. + */ + +gchar *s = N_("Game Statistics"); +gchar *s = N_("Game:"); +gchar *s = N_("Won:"); +gchar *s = N_("Total:"); +gchar *s = N_("Lost:"); +gchar *s = N_("Current session"); +gchar *s = N_("Won:"); +gchar *s = N_("Lost:"); +gchar *s = N_("Total:"); +gchar *s = N_("Total"); +gchar *s = N_("Current game"); +gchar *s = N_("Playing time:"); +gchar *s = N_("Moves:"); +gchar *s = N_("Total moves:"); +gchar *s = N_("Minimum"); +gchar *s = N_("Maximum"); +gchar *s = N_("Average"); +gchar *s = N_("Summary"); +gchar *s = N_("Playing time"); +gchar *s = N_("Moves"); +gchar *s = N_("Total moves"); +gchar *s = N_("Game:"); +gchar *s = N_("Top 10"); +gchar *s = N_("All games"); +gchar *s = N_("Full log"); +gchar *s = N_("Session log"); +gchar *s = N_("Set timeouts"); +gchar *s = N_("Demo:"); +gchar *s = N_("Hint:"); +gchar *s = N_("Raise card:"); +gchar *s = N_("Highlight piles:"); +gchar *s = N_("Highlight cards:"); +gchar *s = N_("Highlight same rank:"); +gchar *s = N_("Set colors"); +gchar *s = N_("Text foreground:"); +gchar *s = N_("Highlight piles:"); +gchar *s = N_("Highlight cards 1:"); +gchar *s = N_("Highlight cards 2:"); +gchar *s = N_("Highlight same rank 1:"); +gchar *s = N_("Highlight same rank 2:"); +gchar *s = N_("Hint arrow:"); +gchar *s = N_("Highlight not matching:"); +gchar *s = N_("Change..."); +gchar *s = N_("Change..."); +gchar *s = N_("Change..."); +gchar *s = N_("Change..."); +gchar *s = N_("Change..."); +gchar *s = N_("Change..."); +gchar *s = N_("Change..."); +gchar *s = N_("Change..."); +gchar *s = N_("Set font"); +gchar *s = N_("HTML: "); +gchar *s = N_("Small: "); +gchar *s = N_("Fixed: "); +gchar *s = N_("Tableau default: "); +gchar *s = N_("Tableau fixed: "); +gchar *s = N_("Tableau small: "); +gchar *s = N_("Tableau large: "); +gchar *s = N_("Change..."); +gchar *s = N_("Change..."); +gchar *s = N_("Change..."); +gchar *s = N_("Change..."); +gchar *s = N_("Change..."); +gchar *s = N_("Change..."); +gchar *s = N_("Change..."); diff --git a/data/images/buttons/bluecurve/cancel.gif b/data/images/buttons/bluecurve/cancel.gif new file mode 100644 index 00000000..808d3535 Binary files /dev/null and b/data/images/buttons/bluecurve/cancel.gif differ diff --git a/data/images/buttons/bluecurve/ok.gif b/data/images/buttons/bluecurve/ok.gif new file mode 100644 index 00000000..e4e63621 Binary files /dev/null and b/data/images/buttons/bluecurve/ok.gif differ diff --git a/data/images/cards/large/01c.gif b/data/images/cards/large/01c.gif new file mode 100644 index 00000000..efe55528 Binary files /dev/null and b/data/images/cards/large/01c.gif differ diff --git a/data/images/cards/large/01d.gif b/data/images/cards/large/01d.gif new file mode 100644 index 00000000..7442e176 Binary files /dev/null and b/data/images/cards/large/01d.gif differ diff --git a/data/images/cards/large/01h.gif b/data/images/cards/large/01h.gif new file mode 100644 index 00000000..7e4245b0 Binary files /dev/null and b/data/images/cards/large/01h.gif differ diff --git a/data/images/cards/large/01s.gif b/data/images/cards/large/01s.gif new file mode 100644 index 00000000..428b4b57 Binary files /dev/null and b/data/images/cards/large/01s.gif differ diff --git a/data/images/cards/large/02c.gif b/data/images/cards/large/02c.gif new file mode 100644 index 00000000..d815d101 Binary files /dev/null and b/data/images/cards/large/02c.gif differ diff --git a/data/images/cards/large/02d.gif b/data/images/cards/large/02d.gif new file mode 100644 index 00000000..b84eb53c Binary files /dev/null and b/data/images/cards/large/02d.gif differ diff --git a/data/images/cards/large/02h.gif b/data/images/cards/large/02h.gif new file mode 100644 index 00000000..2f515dd6 Binary files /dev/null and b/data/images/cards/large/02h.gif differ diff --git a/data/images/cards/large/02s.gif b/data/images/cards/large/02s.gif new file mode 100644 index 00000000..3caf6f3f Binary files /dev/null and b/data/images/cards/large/02s.gif differ diff --git a/data/images/cards/large/03c.gif b/data/images/cards/large/03c.gif new file mode 100644 index 00000000..a72cfbfe Binary files /dev/null and b/data/images/cards/large/03c.gif differ diff --git a/data/images/cards/large/03d.gif b/data/images/cards/large/03d.gif new file mode 100644 index 00000000..d428399a Binary files /dev/null and b/data/images/cards/large/03d.gif differ diff --git a/data/images/cards/large/03h.gif b/data/images/cards/large/03h.gif new file mode 100644 index 00000000..e15b43e6 Binary files /dev/null and b/data/images/cards/large/03h.gif differ diff --git a/data/images/cards/large/03s.gif b/data/images/cards/large/03s.gif new file mode 100644 index 00000000..3685e57e Binary files /dev/null and b/data/images/cards/large/03s.gif differ diff --git a/data/images/cards/large/04c.gif b/data/images/cards/large/04c.gif new file mode 100644 index 00000000..1fcec84d Binary files /dev/null and b/data/images/cards/large/04c.gif differ diff --git a/data/images/cards/large/04d.gif b/data/images/cards/large/04d.gif new file mode 100644 index 00000000..5133cee8 Binary files /dev/null and b/data/images/cards/large/04d.gif differ diff --git a/data/images/cards/large/04h.gif b/data/images/cards/large/04h.gif new file mode 100644 index 00000000..5f8c2968 Binary files /dev/null and b/data/images/cards/large/04h.gif differ diff --git a/data/images/cards/large/04s.gif b/data/images/cards/large/04s.gif new file mode 100644 index 00000000..1f53a577 Binary files /dev/null and b/data/images/cards/large/04s.gif differ diff --git a/data/images/cards/large/05c.gif b/data/images/cards/large/05c.gif new file mode 100644 index 00000000..8e1bd618 Binary files /dev/null and b/data/images/cards/large/05c.gif differ diff --git a/data/images/cards/large/05d.gif b/data/images/cards/large/05d.gif new file mode 100644 index 00000000..060bfaf1 Binary files /dev/null and b/data/images/cards/large/05d.gif differ diff --git a/data/images/cards/large/05h.gif b/data/images/cards/large/05h.gif new file mode 100644 index 00000000..b4ab65d5 Binary files /dev/null and b/data/images/cards/large/05h.gif differ diff --git a/data/images/cards/large/05s.gif b/data/images/cards/large/05s.gif new file mode 100644 index 00000000..11341e8c Binary files /dev/null and b/data/images/cards/large/05s.gif differ diff --git a/data/images/cards/large/06c.gif b/data/images/cards/large/06c.gif new file mode 100644 index 00000000..4a81d9ed Binary files /dev/null and b/data/images/cards/large/06c.gif differ diff --git a/data/images/cards/large/06d.gif b/data/images/cards/large/06d.gif new file mode 100644 index 00000000..6afc6931 Binary files /dev/null and b/data/images/cards/large/06d.gif differ diff --git a/data/images/cards/large/06h.gif b/data/images/cards/large/06h.gif new file mode 100644 index 00000000..021073ee Binary files /dev/null and b/data/images/cards/large/06h.gif differ diff --git a/data/images/cards/large/06s.gif b/data/images/cards/large/06s.gif new file mode 100644 index 00000000..ce3d111c Binary files /dev/null and b/data/images/cards/large/06s.gif differ diff --git a/data/images/cards/large/07c.gif b/data/images/cards/large/07c.gif new file mode 100644 index 00000000..9ec4c31f Binary files /dev/null and b/data/images/cards/large/07c.gif differ diff --git a/data/images/cards/large/07d.gif b/data/images/cards/large/07d.gif new file mode 100644 index 00000000..f1a15070 Binary files /dev/null and b/data/images/cards/large/07d.gif differ diff --git a/data/images/cards/large/07h.gif b/data/images/cards/large/07h.gif new file mode 100644 index 00000000..81f6f3b5 Binary files /dev/null and b/data/images/cards/large/07h.gif differ diff --git a/data/images/cards/large/07s.gif b/data/images/cards/large/07s.gif new file mode 100644 index 00000000..3594c96e Binary files /dev/null and b/data/images/cards/large/07s.gif differ diff --git a/data/images/cards/large/08c.gif b/data/images/cards/large/08c.gif new file mode 100644 index 00000000..373ac362 Binary files /dev/null and b/data/images/cards/large/08c.gif differ diff --git a/data/images/cards/large/08d.gif b/data/images/cards/large/08d.gif new file mode 100644 index 00000000..2cf637e3 Binary files /dev/null and b/data/images/cards/large/08d.gif differ diff --git a/data/images/cards/large/08h.gif b/data/images/cards/large/08h.gif new file mode 100644 index 00000000..6171bac4 Binary files /dev/null and b/data/images/cards/large/08h.gif differ diff --git a/data/images/cards/large/08s.gif b/data/images/cards/large/08s.gif new file mode 100644 index 00000000..616d54d9 Binary files /dev/null and b/data/images/cards/large/08s.gif differ diff --git a/data/images/cards/large/09c.gif b/data/images/cards/large/09c.gif new file mode 100644 index 00000000..084ea6f2 Binary files /dev/null and b/data/images/cards/large/09c.gif differ diff --git a/data/images/cards/large/09d.gif b/data/images/cards/large/09d.gif new file mode 100644 index 00000000..d0161ad2 Binary files /dev/null and b/data/images/cards/large/09d.gif differ diff --git a/data/images/cards/large/09h.gif b/data/images/cards/large/09h.gif new file mode 100644 index 00000000..04291df2 Binary files /dev/null and b/data/images/cards/large/09h.gif differ diff --git a/data/images/cards/large/09s.gif b/data/images/cards/large/09s.gif new file mode 100644 index 00000000..de99e2b4 Binary files /dev/null and b/data/images/cards/large/09s.gif differ diff --git a/data/images/cards/large/10c.gif b/data/images/cards/large/10c.gif new file mode 100644 index 00000000..0a45d8bf Binary files /dev/null and b/data/images/cards/large/10c.gif differ diff --git a/data/images/cards/large/10d.gif b/data/images/cards/large/10d.gif new file mode 100644 index 00000000..4820eb10 Binary files /dev/null and b/data/images/cards/large/10d.gif differ diff --git a/data/images/cards/large/10h.gif b/data/images/cards/large/10h.gif new file mode 100644 index 00000000..e4efda3a Binary files /dev/null and b/data/images/cards/large/10h.gif differ diff --git a/data/images/cards/large/10s.gif b/data/images/cards/large/10s.gif new file mode 100644 index 00000000..caf7db67 Binary files /dev/null and b/data/images/cards/large/10s.gif differ diff --git a/data/images/cards/large/11c.gif b/data/images/cards/large/11c.gif new file mode 100644 index 00000000..ace224de Binary files /dev/null and b/data/images/cards/large/11c.gif differ diff --git a/data/images/cards/large/11d.gif b/data/images/cards/large/11d.gif new file mode 100644 index 00000000..ab026893 Binary files /dev/null and b/data/images/cards/large/11d.gif differ diff --git a/data/images/cards/large/11h.gif b/data/images/cards/large/11h.gif new file mode 100644 index 00000000..0b5721a1 Binary files /dev/null and b/data/images/cards/large/11h.gif differ diff --git a/data/images/cards/large/11s.gif b/data/images/cards/large/11s.gif new file mode 100644 index 00000000..1475102e Binary files /dev/null and b/data/images/cards/large/11s.gif differ diff --git a/data/images/cards/large/12c.gif b/data/images/cards/large/12c.gif new file mode 100644 index 00000000..757194e9 Binary files /dev/null and b/data/images/cards/large/12c.gif differ diff --git a/data/images/cards/large/12d.gif b/data/images/cards/large/12d.gif new file mode 100644 index 00000000..66e43ecd Binary files /dev/null and b/data/images/cards/large/12d.gif differ diff --git a/data/images/cards/large/12h.gif b/data/images/cards/large/12h.gif new file mode 100644 index 00000000..871cb18d Binary files /dev/null and b/data/images/cards/large/12h.gif differ diff --git a/data/images/cards/large/12s.gif b/data/images/cards/large/12s.gif new file mode 100644 index 00000000..5245071c Binary files /dev/null and b/data/images/cards/large/12s.gif differ diff --git a/data/images/cards/large/13c.gif b/data/images/cards/large/13c.gif new file mode 100644 index 00000000..7404c69d Binary files /dev/null and b/data/images/cards/large/13c.gif differ diff --git a/data/images/cards/large/13d.gif b/data/images/cards/large/13d.gif new file mode 100644 index 00000000..ac446382 Binary files /dev/null and b/data/images/cards/large/13d.gif differ diff --git a/data/images/cards/large/13h.gif b/data/images/cards/large/13h.gif new file mode 100644 index 00000000..d5558a46 Binary files /dev/null and b/data/images/cards/large/13h.gif differ diff --git a/data/images/cards/large/13s.gif b/data/images/cards/large/13s.gif new file mode 100644 index 00000000..adf32058 Binary files /dev/null and b/data/images/cards/large/13s.gif differ diff --git a/data/images/cards/small/01c.gif b/data/images/cards/small/01c.gif new file mode 100644 index 00000000..075bf96d Binary files /dev/null and b/data/images/cards/small/01c.gif differ diff --git a/data/images/cards/small/01d.gif b/data/images/cards/small/01d.gif new file mode 100644 index 00000000..ab3b5506 Binary files /dev/null and b/data/images/cards/small/01d.gif differ diff --git a/data/images/cards/small/01h.gif b/data/images/cards/small/01h.gif new file mode 100644 index 00000000..12e3a888 Binary files /dev/null and b/data/images/cards/small/01h.gif differ diff --git a/data/images/cards/small/01s.gif b/data/images/cards/small/01s.gif new file mode 100644 index 00000000..7dc98781 Binary files /dev/null and b/data/images/cards/small/01s.gif differ diff --git a/data/images/cards/small/02c.gif b/data/images/cards/small/02c.gif new file mode 100644 index 00000000..29bc364c Binary files /dev/null and b/data/images/cards/small/02c.gif differ diff --git a/data/images/cards/small/02d.gif b/data/images/cards/small/02d.gif new file mode 100644 index 00000000..e16eced8 Binary files /dev/null and b/data/images/cards/small/02d.gif differ diff --git a/data/images/cards/small/02h.gif b/data/images/cards/small/02h.gif new file mode 100644 index 00000000..43015f41 Binary files /dev/null and b/data/images/cards/small/02h.gif differ diff --git a/data/images/cards/small/02s.gif b/data/images/cards/small/02s.gif new file mode 100644 index 00000000..e302a206 Binary files /dev/null and b/data/images/cards/small/02s.gif differ diff --git a/data/images/cards/small/03c.gif b/data/images/cards/small/03c.gif new file mode 100644 index 00000000..6c7ee694 Binary files /dev/null and b/data/images/cards/small/03c.gif differ diff --git a/data/images/cards/small/03d.gif b/data/images/cards/small/03d.gif new file mode 100644 index 00000000..fc2b4cf2 Binary files /dev/null and b/data/images/cards/small/03d.gif differ diff --git a/data/images/cards/small/03h.gif b/data/images/cards/small/03h.gif new file mode 100644 index 00000000..4877ee5a Binary files /dev/null and b/data/images/cards/small/03h.gif differ diff --git a/data/images/cards/small/03s.gif b/data/images/cards/small/03s.gif new file mode 100644 index 00000000..598486a2 Binary files /dev/null and b/data/images/cards/small/03s.gif differ diff --git a/data/images/cards/small/04c.gif b/data/images/cards/small/04c.gif new file mode 100644 index 00000000..c63679d8 Binary files /dev/null and b/data/images/cards/small/04c.gif differ diff --git a/data/images/cards/small/04d.gif b/data/images/cards/small/04d.gif new file mode 100644 index 00000000..6ccc0879 Binary files /dev/null and b/data/images/cards/small/04d.gif differ diff --git a/data/images/cards/small/04h.gif b/data/images/cards/small/04h.gif new file mode 100644 index 00000000..ae9637a9 Binary files /dev/null and b/data/images/cards/small/04h.gif differ diff --git a/data/images/cards/small/04s.gif b/data/images/cards/small/04s.gif new file mode 100644 index 00000000..0695de74 Binary files /dev/null and b/data/images/cards/small/04s.gif differ diff --git a/data/images/cards/small/05c.gif b/data/images/cards/small/05c.gif new file mode 100644 index 00000000..868eae85 Binary files /dev/null and b/data/images/cards/small/05c.gif differ diff --git a/data/images/cards/small/05d.gif b/data/images/cards/small/05d.gif new file mode 100644 index 00000000..a4039608 Binary files /dev/null and b/data/images/cards/small/05d.gif differ diff --git a/data/images/cards/small/05h.gif b/data/images/cards/small/05h.gif new file mode 100644 index 00000000..bdfe316d Binary files /dev/null and b/data/images/cards/small/05h.gif differ diff --git a/data/images/cards/small/05s.gif b/data/images/cards/small/05s.gif new file mode 100644 index 00000000..80aef8f8 Binary files /dev/null and b/data/images/cards/small/05s.gif differ diff --git a/data/images/cards/small/06c.gif b/data/images/cards/small/06c.gif new file mode 100644 index 00000000..9fe310e9 Binary files /dev/null and b/data/images/cards/small/06c.gif differ diff --git a/data/images/cards/small/06d.gif b/data/images/cards/small/06d.gif new file mode 100644 index 00000000..d7e888b6 Binary files /dev/null and b/data/images/cards/small/06d.gif differ diff --git a/data/images/cards/small/06h.gif b/data/images/cards/small/06h.gif new file mode 100644 index 00000000..df524ccd Binary files /dev/null and b/data/images/cards/small/06h.gif differ diff --git a/data/images/cards/small/06s.gif b/data/images/cards/small/06s.gif new file mode 100644 index 00000000..7cf6b271 Binary files /dev/null and b/data/images/cards/small/06s.gif differ diff --git a/data/images/cards/small/07c.gif b/data/images/cards/small/07c.gif new file mode 100644 index 00000000..d5414976 Binary files /dev/null and b/data/images/cards/small/07c.gif differ diff --git a/data/images/cards/small/07d.gif b/data/images/cards/small/07d.gif new file mode 100644 index 00000000..fb9333f7 Binary files /dev/null and b/data/images/cards/small/07d.gif differ diff --git a/data/images/cards/small/07h.gif b/data/images/cards/small/07h.gif new file mode 100644 index 00000000..58e04478 Binary files /dev/null and b/data/images/cards/small/07h.gif differ diff --git a/data/images/cards/small/07s.gif b/data/images/cards/small/07s.gif new file mode 100644 index 00000000..90f452ee Binary files /dev/null and b/data/images/cards/small/07s.gif differ diff --git a/data/images/cards/small/08c.gif b/data/images/cards/small/08c.gif new file mode 100644 index 00000000..e719d46e Binary files /dev/null and b/data/images/cards/small/08c.gif differ diff --git a/data/images/cards/small/08d.gif b/data/images/cards/small/08d.gif new file mode 100644 index 00000000..a5df71f7 Binary files /dev/null and b/data/images/cards/small/08d.gif differ diff --git a/data/images/cards/small/08h.gif b/data/images/cards/small/08h.gif new file mode 100644 index 00000000..ff7b20bd Binary files /dev/null and b/data/images/cards/small/08h.gif differ diff --git a/data/images/cards/small/08s.gif b/data/images/cards/small/08s.gif new file mode 100644 index 00000000..46020572 Binary files /dev/null and b/data/images/cards/small/08s.gif differ diff --git a/data/images/cards/small/09c.gif b/data/images/cards/small/09c.gif new file mode 100644 index 00000000..500e35c1 Binary files /dev/null and b/data/images/cards/small/09c.gif differ diff --git a/data/images/cards/small/09d.gif b/data/images/cards/small/09d.gif new file mode 100644 index 00000000..d625c638 Binary files /dev/null and b/data/images/cards/small/09d.gif differ diff --git a/data/images/cards/small/09h.gif b/data/images/cards/small/09h.gif new file mode 100644 index 00000000..f0943d12 Binary files /dev/null and b/data/images/cards/small/09h.gif differ diff --git a/data/images/cards/small/09s.gif b/data/images/cards/small/09s.gif new file mode 100644 index 00000000..538f3355 Binary files /dev/null and b/data/images/cards/small/09s.gif differ diff --git a/data/images/cards/small/10c.gif b/data/images/cards/small/10c.gif new file mode 100644 index 00000000..4a7d1c64 Binary files /dev/null and b/data/images/cards/small/10c.gif differ diff --git a/data/images/cards/small/10d.gif b/data/images/cards/small/10d.gif new file mode 100644 index 00000000..2d8276a4 Binary files /dev/null and b/data/images/cards/small/10d.gif differ diff --git a/data/images/cards/small/10h.gif b/data/images/cards/small/10h.gif new file mode 100644 index 00000000..97588d79 Binary files /dev/null and b/data/images/cards/small/10h.gif differ diff --git a/data/images/cards/small/10s.gif b/data/images/cards/small/10s.gif new file mode 100644 index 00000000..56d934f6 Binary files /dev/null and b/data/images/cards/small/10s.gif differ diff --git a/data/images/cards/small/11c.gif b/data/images/cards/small/11c.gif new file mode 100644 index 00000000..c7440484 Binary files /dev/null and b/data/images/cards/small/11c.gif differ diff --git a/data/images/cards/small/11d.gif b/data/images/cards/small/11d.gif new file mode 100644 index 00000000..f27484a9 Binary files /dev/null and b/data/images/cards/small/11d.gif differ diff --git a/data/images/cards/small/11h.gif b/data/images/cards/small/11h.gif new file mode 100644 index 00000000..c90684d3 Binary files /dev/null and b/data/images/cards/small/11h.gif differ diff --git a/data/images/cards/small/11s.gif b/data/images/cards/small/11s.gif new file mode 100644 index 00000000..1603694d Binary files /dev/null and b/data/images/cards/small/11s.gif differ diff --git a/data/images/cards/small/12c.gif b/data/images/cards/small/12c.gif new file mode 100644 index 00000000..d61caafe Binary files /dev/null and b/data/images/cards/small/12c.gif differ diff --git a/data/images/cards/small/12d.gif b/data/images/cards/small/12d.gif new file mode 100644 index 00000000..bce5b44d Binary files /dev/null and b/data/images/cards/small/12d.gif differ diff --git a/data/images/cards/small/12h.gif b/data/images/cards/small/12h.gif new file mode 100644 index 00000000..d0c51f18 Binary files /dev/null and b/data/images/cards/small/12h.gif differ diff --git a/data/images/cards/small/12s.gif b/data/images/cards/small/12s.gif new file mode 100644 index 00000000..794926af Binary files /dev/null and b/data/images/cards/small/12s.gif differ diff --git a/data/images/cards/small/13c.gif b/data/images/cards/small/13c.gif new file mode 100644 index 00000000..d28e7a5c Binary files /dev/null and b/data/images/cards/small/13c.gif differ diff --git a/data/images/cards/small/13d.gif b/data/images/cards/small/13d.gif new file mode 100644 index 00000000..8cedbb1c Binary files /dev/null and b/data/images/cards/small/13d.gif differ diff --git a/data/images/cards/small/13h.gif b/data/images/cards/small/13h.gif new file mode 100644 index 00000000..045609f2 Binary files /dev/null and b/data/images/cards/small/13h.gif differ diff --git a/data/images/cards/small/13s.gif b/data/images/cards/small/13s.gif new file mode 100644 index 00000000..b9a2689f Binary files /dev/null and b/data/images/cards/small/13s.gif differ diff --git a/data/images/demo/demo01.gif b/data/images/demo/demo01.gif new file mode 100644 index 00000000..86f637f2 Binary files /dev/null and b/data/images/demo/demo01.gif differ diff --git a/data/images/demo/demo02.gif b/data/images/demo/demo02.gif new file mode 100644 index 00000000..015e82c5 Binary files /dev/null and b/data/images/demo/demo02.gif differ diff --git a/data/images/demo/demo03.gif b/data/images/demo/demo03.gif new file mode 100644 index 00000000..72448f2d Binary files /dev/null and b/data/images/demo/demo03.gif differ diff --git a/data/images/demo/demo04.gif b/data/images/demo/demo04.gif new file mode 100644 index 00000000..914b8cc8 Binary files /dev/null and b/data/images/demo/demo04.gif differ diff --git a/data/images/demo/demo05.gif b/data/images/demo/demo05.gif new file mode 100644 index 00000000..f2e64a3a Binary files /dev/null and b/data/images/demo/demo05.gif differ diff --git a/data/images/dialog/bluecurve/error.gif b/data/images/dialog/bluecurve/error.gif new file mode 100644 index 00000000..162aab24 Binary files /dev/null and b/data/images/dialog/bluecurve/error.gif differ diff --git a/data/images/dialog/bluecurve/info.gif b/data/images/dialog/bluecurve/info.gif new file mode 100644 index 00000000..d6eed5a3 Binary files /dev/null and b/data/images/dialog/bluecurve/info.gif differ diff --git a/data/images/dialog/bluecurve/question.gif b/data/images/dialog/bluecurve/question.gif new file mode 100644 index 00000000..67116154 Binary files /dev/null and b/data/images/dialog/bluecurve/question.gif differ diff --git a/data/images/dialog/bluecurve/warning.gif b/data/images/dialog/bluecurve/warning.gif new file mode 100644 index 00000000..964e14d1 Binary files /dev/null and b/data/images/dialog/bluecurve/warning.gif differ diff --git a/data/images/dialog/default/error.gif b/data/images/dialog/default/error.gif new file mode 100644 index 00000000..b6049aba Binary files /dev/null and b/data/images/dialog/default/error.gif differ diff --git a/data/images/dialog/default/info.gif b/data/images/dialog/default/info.gif new file mode 100644 index 00000000..c5e5a79a Binary files /dev/null and b/data/images/dialog/default/info.gif differ diff --git a/data/images/dialog/default/question.gif b/data/images/dialog/default/question.gif new file mode 100644 index 00000000..4e76f6d2 Binary files /dev/null and b/data/images/dialog/default/question.gif differ diff --git a/data/images/dialog/default/warning.gif b/data/images/dialog/default/warning.gif new file mode 100644 index 00000000..b56bf69f Binary files /dev/null and b/data/images/dialog/default/warning.gif differ diff --git a/data/images/htmlviewer/disk.gif b/data/images/htmlviewer/disk.gif new file mode 100644 index 00000000..5566e474 Binary files /dev/null and b/data/images/htmlviewer/disk.gif differ diff --git a/data/images/logos/joker07_40_774.gif b/data/images/logos/joker07_40_774.gif new file mode 100644 index 00000000..4d0b031a Binary files /dev/null and b/data/images/logos/joker07_40_774.gif differ diff --git a/data/images/logos/joker07_50_774.gif b/data/images/logos/joker07_50_774.gif new file mode 100644 index 00000000..2db7eb34 Binary files /dev/null and b/data/images/logos/joker07_50_774.gif differ diff --git a/data/images/logos/joker08_40_774.gif b/data/images/logos/joker08_40_774.gif new file mode 100644 index 00000000..2115b763 Binary files /dev/null and b/data/images/logos/joker08_40_774.gif differ diff --git a/data/images/logos/joker08_50_774.gif b/data/images/logos/joker08_50_774.gif new file mode 100644 index 00000000..27b31057 Binary files /dev/null and b/data/images/logos/joker08_50_774.gif differ diff --git a/data/images/logos/joker10_100.gif b/data/images/logos/joker10_100.gif new file mode 100644 index 00000000..7f5e75c3 Binary files /dev/null and b/data/images/logos/joker10_100.gif differ diff --git a/data/images/logos/joker11_100_774.gif b/data/images/logos/joker11_100_774.gif new file mode 100644 index 00000000..1cad929d Binary files /dev/null and b/data/images/logos/joker11_100_774.gif differ diff --git a/data/images/misc/pysol01.png b/data/images/misc/pysol01.png new file mode 100644 index 00000000..d7308517 Binary files /dev/null and b/data/images/misc/pysol01.png differ diff --git a/data/images/misc/pysol02.png b/data/images/misc/pysol02.png new file mode 100644 index 00000000..2f962b00 Binary files /dev/null and b/data/images/misc/pysol02.png differ diff --git a/data/images/noredeal.gif b/data/images/noredeal.gif new file mode 100644 index 00000000..0d960df6 Binary files /dev/null and b/data/images/noredeal.gif differ diff --git a/data/images/pause/pause01.gif b/data/images/pause/pause01.gif new file mode 100644 index 00000000..1a5f05ac Binary files /dev/null and b/data/images/pause/pause01.gif differ diff --git a/data/images/pause/pause02.gif b/data/images/pause/pause02.gif new file mode 100644 index 00000000..cabaec07 Binary files /dev/null and b/data/images/pause/pause02.gif differ diff --git a/data/images/pause/pause03.gif b/data/images/pause/pause03.gif new file mode 100644 index 00000000..dac60b49 Binary files /dev/null and b/data/images/pause/pause03.gif differ diff --git a/data/images/redeal.gif b/data/images/redeal.gif new file mode 100644 index 00000000..8674b8da Binary files /dev/null and b/data/images/redeal.gif differ diff --git a/data/images/selectgame.gif b/data/images/selectgame.gif new file mode 100644 index 00000000..d2b8c3f2 Binary files /dev/null and b/data/images/selectgame.gif differ diff --git a/data/images/stats/barchart.gif b/data/images/stats/barchart.gif new file mode 100644 index 00000000..af67fca7 Binary files /dev/null and b/data/images/stats/barchart.gif differ diff --git a/data/images/stoplight.gif b/data/images/stoplight.gif new file mode 100644 index 00000000..30c9ba1d Binary files /dev/null and b/data/images/stoplight.gif differ diff --git a/data/images/stopsign.gif b/data/images/stopsign.gif new file mode 100644 index 00000000..72ba47bd Binary files /dev/null and b/data/images/stopsign.gif differ diff --git a/data/images/toolbar/bluecurve/large/autodrop.gif b/data/images/toolbar/bluecurve/large/autodrop.gif new file mode 100644 index 00000000..42cf5ce1 Binary files /dev/null and b/data/images/toolbar/bluecurve/large/autodrop.gif differ diff --git a/data/images/toolbar/bluecurve/large/new.gif b/data/images/toolbar/bluecurve/large/new.gif new file mode 100644 index 00000000..be3ed975 Binary files /dev/null and b/data/images/toolbar/bluecurve/large/new.gif differ diff --git a/data/images/toolbar/bluecurve/large/open.gif b/data/images/toolbar/bluecurve/large/open.gif new file mode 100644 index 00000000..4a772482 Binary files /dev/null and b/data/images/toolbar/bluecurve/large/open.gif differ diff --git a/data/images/toolbar/bluecurve/large/pause.gif b/data/images/toolbar/bluecurve/large/pause.gif new file mode 100644 index 00000000..8c3d83a7 Binary files /dev/null and b/data/images/toolbar/bluecurve/large/pause.gif differ diff --git a/data/images/toolbar/bluecurve/large/quit.gif b/data/images/toolbar/bluecurve/large/quit.gif new file mode 100644 index 00000000..89515b04 Binary files /dev/null and b/data/images/toolbar/bluecurve/large/quit.gif differ diff --git a/data/images/toolbar/bluecurve/large/redo.gif b/data/images/toolbar/bluecurve/large/redo.gif new file mode 100644 index 00000000..01ea4dca Binary files /dev/null and b/data/images/toolbar/bluecurve/large/redo.gif differ diff --git a/data/images/toolbar/bluecurve/large/restart.gif b/data/images/toolbar/bluecurve/large/restart.gif new file mode 100644 index 00000000..8deaece8 Binary files /dev/null and b/data/images/toolbar/bluecurve/large/restart.gif differ diff --git a/data/images/toolbar/bluecurve/large/rules.gif b/data/images/toolbar/bluecurve/large/rules.gif new file mode 100644 index 00000000..c6c6fa28 Binary files /dev/null and b/data/images/toolbar/bluecurve/large/rules.gif differ diff --git a/data/images/toolbar/bluecurve/large/save.gif b/data/images/toolbar/bluecurve/large/save.gif new file mode 100644 index 00000000..cfe6df2d Binary files /dev/null and b/data/images/toolbar/bluecurve/large/save.gif differ diff --git a/data/images/toolbar/bluecurve/large/statistics.gif b/data/images/toolbar/bluecurve/large/statistics.gif new file mode 100644 index 00000000..2f04b7d4 Binary files /dev/null and b/data/images/toolbar/bluecurve/large/statistics.gif differ diff --git a/data/images/toolbar/bluecurve/large/undo.gif b/data/images/toolbar/bluecurve/large/undo.gif new file mode 100644 index 00000000..3d155f3c Binary files /dev/null and b/data/images/toolbar/bluecurve/large/undo.gif differ diff --git a/data/images/toolbar/bluecurve/small/autodrop.gif b/data/images/toolbar/bluecurve/small/autodrop.gif new file mode 100644 index 00000000..0bce94e9 Binary files /dev/null and b/data/images/toolbar/bluecurve/small/autodrop.gif differ diff --git a/data/images/toolbar/bluecurve/small/new.gif b/data/images/toolbar/bluecurve/small/new.gif new file mode 100644 index 00000000..a053c2cc Binary files /dev/null and b/data/images/toolbar/bluecurve/small/new.gif differ diff --git a/data/images/toolbar/bluecurve/small/open.gif b/data/images/toolbar/bluecurve/small/open.gif new file mode 100644 index 00000000..ac8b38ef Binary files /dev/null and b/data/images/toolbar/bluecurve/small/open.gif differ diff --git a/data/images/toolbar/bluecurve/small/pause.gif b/data/images/toolbar/bluecurve/small/pause.gif new file mode 100644 index 00000000..a25232af Binary files /dev/null and b/data/images/toolbar/bluecurve/small/pause.gif differ diff --git a/data/images/toolbar/bluecurve/small/quit.gif b/data/images/toolbar/bluecurve/small/quit.gif new file mode 100644 index 00000000..d0dc3241 Binary files /dev/null and b/data/images/toolbar/bluecurve/small/quit.gif differ diff --git a/data/images/toolbar/bluecurve/small/redo.gif b/data/images/toolbar/bluecurve/small/redo.gif new file mode 100644 index 00000000..c1271878 Binary files /dev/null and b/data/images/toolbar/bluecurve/small/redo.gif differ diff --git a/data/images/toolbar/bluecurve/small/restart.gif b/data/images/toolbar/bluecurve/small/restart.gif new file mode 100644 index 00000000..10b11965 Binary files /dev/null and b/data/images/toolbar/bluecurve/small/restart.gif differ diff --git a/data/images/toolbar/bluecurve/small/rules.gif b/data/images/toolbar/bluecurve/small/rules.gif new file mode 100644 index 00000000..75743c9b Binary files /dev/null and b/data/images/toolbar/bluecurve/small/rules.gif differ diff --git a/data/images/toolbar/bluecurve/small/save.gif b/data/images/toolbar/bluecurve/small/save.gif new file mode 100644 index 00000000..31fcc983 Binary files /dev/null and b/data/images/toolbar/bluecurve/small/save.gif differ diff --git a/data/images/toolbar/bluecurve/small/statistics.gif b/data/images/toolbar/bluecurve/small/statistics.gif new file mode 100644 index 00000000..ee714fa7 Binary files /dev/null and b/data/images/toolbar/bluecurve/small/statistics.gif differ diff --git a/data/images/toolbar/bluecurve/small/undo.gif b/data/images/toolbar/bluecurve/small/undo.gif new file mode 100644 index 00000000..35fe78d3 Binary files /dev/null and b/data/images/toolbar/bluecurve/small/undo.gif differ diff --git a/data/images/toolbar/bluecurve/xlarge/autodrop.gif b/data/images/toolbar/bluecurve/xlarge/autodrop.gif new file mode 100644 index 00000000..508206f4 Binary files /dev/null and b/data/images/toolbar/bluecurve/xlarge/autodrop.gif differ diff --git a/data/images/toolbar/bluecurve/xlarge/new.gif b/data/images/toolbar/bluecurve/xlarge/new.gif new file mode 100644 index 00000000..54cf7bbe Binary files /dev/null and b/data/images/toolbar/bluecurve/xlarge/new.gif differ diff --git a/data/images/toolbar/bluecurve/xlarge/open.gif b/data/images/toolbar/bluecurve/xlarge/open.gif new file mode 100644 index 00000000..7e48a65f Binary files /dev/null and b/data/images/toolbar/bluecurve/xlarge/open.gif differ diff --git a/data/images/toolbar/bluecurve/xlarge/pause.gif b/data/images/toolbar/bluecurve/xlarge/pause.gif new file mode 100644 index 00000000..ef0794fc Binary files /dev/null and b/data/images/toolbar/bluecurve/xlarge/pause.gif differ diff --git a/data/images/toolbar/bluecurve/xlarge/quit.gif b/data/images/toolbar/bluecurve/xlarge/quit.gif new file mode 100644 index 00000000..d52725f6 Binary files /dev/null and b/data/images/toolbar/bluecurve/xlarge/quit.gif differ diff --git a/data/images/toolbar/bluecurve/xlarge/redo.gif b/data/images/toolbar/bluecurve/xlarge/redo.gif new file mode 100644 index 00000000..0f79e1c4 Binary files /dev/null and b/data/images/toolbar/bluecurve/xlarge/redo.gif differ diff --git a/data/images/toolbar/bluecurve/xlarge/restart.gif b/data/images/toolbar/bluecurve/xlarge/restart.gif new file mode 100644 index 00000000..4e6e78f9 Binary files /dev/null and b/data/images/toolbar/bluecurve/xlarge/restart.gif differ diff --git a/data/images/toolbar/bluecurve/xlarge/rules.gif b/data/images/toolbar/bluecurve/xlarge/rules.gif new file mode 100644 index 00000000..fc9e37d0 Binary files /dev/null and b/data/images/toolbar/bluecurve/xlarge/rules.gif differ diff --git a/data/images/toolbar/bluecurve/xlarge/save.gif b/data/images/toolbar/bluecurve/xlarge/save.gif new file mode 100644 index 00000000..9315de2b Binary files /dev/null and b/data/images/toolbar/bluecurve/xlarge/save.gif differ diff --git a/data/images/toolbar/bluecurve/xlarge/statistics.gif b/data/images/toolbar/bluecurve/xlarge/statistics.gif new file mode 100644 index 00000000..95c8c7d5 Binary files /dev/null and b/data/images/toolbar/bluecurve/xlarge/statistics.gif differ diff --git a/data/images/toolbar/bluecurve/xlarge/undo.gif b/data/images/toolbar/bluecurve/xlarge/undo.gif new file mode 100644 index 00000000..0686390d Binary files /dev/null and b/data/images/toolbar/bluecurve/xlarge/undo.gif differ diff --git a/data/images/toolbar/crystal/README.ICONS b/data/images/toolbar/crystal/README.ICONS new file mode 100644 index 00000000..92d58b7e --- /dev/null +++ b/data/images/toolbar/crystal/README.ICONS @@ -0,0 +1 @@ +Icons compliments of Crystal Icons 0.9 Icon Theme by Everaldo and crystal staff (www.everaldo.com) diff --git a/data/images/toolbar/crystal/large/autodrop.gif b/data/images/toolbar/crystal/large/autodrop.gif new file mode 100644 index 00000000..84ca8215 Binary files /dev/null and b/data/images/toolbar/crystal/large/autodrop.gif differ diff --git a/data/images/toolbar/crystal/large/new.gif b/data/images/toolbar/crystal/large/new.gif new file mode 100644 index 00000000..9cf30174 Binary files /dev/null and b/data/images/toolbar/crystal/large/new.gif differ diff --git a/data/images/toolbar/crystal/large/open.gif b/data/images/toolbar/crystal/large/open.gif new file mode 100644 index 00000000..81adb77f Binary files /dev/null and b/data/images/toolbar/crystal/large/open.gif differ diff --git a/data/images/toolbar/crystal/large/pause.gif b/data/images/toolbar/crystal/large/pause.gif new file mode 100644 index 00000000..8c3d83a7 Binary files /dev/null and b/data/images/toolbar/crystal/large/pause.gif differ diff --git a/data/images/toolbar/crystal/large/quit.gif b/data/images/toolbar/crystal/large/quit.gif new file mode 100644 index 00000000..0e57a747 Binary files /dev/null and b/data/images/toolbar/crystal/large/quit.gif differ diff --git a/data/images/toolbar/crystal/large/redo.gif b/data/images/toolbar/crystal/large/redo.gif new file mode 100644 index 00000000..46b12e7c Binary files /dev/null and b/data/images/toolbar/crystal/large/redo.gif differ diff --git a/data/images/toolbar/crystal/large/restart.gif b/data/images/toolbar/crystal/large/restart.gif new file mode 100644 index 00000000..c3b7d0f6 Binary files /dev/null and b/data/images/toolbar/crystal/large/restart.gif differ diff --git a/data/images/toolbar/crystal/large/rules.gif b/data/images/toolbar/crystal/large/rules.gif new file mode 100644 index 00000000..9c29b450 Binary files /dev/null and b/data/images/toolbar/crystal/large/rules.gif differ diff --git a/data/images/toolbar/crystal/large/save.gif b/data/images/toolbar/crystal/large/save.gif new file mode 100644 index 00000000..0eedb292 Binary files /dev/null and b/data/images/toolbar/crystal/large/save.gif differ diff --git a/data/images/toolbar/crystal/large/statistics.gif b/data/images/toolbar/crystal/large/statistics.gif new file mode 100644 index 00000000..d3237d55 Binary files /dev/null and b/data/images/toolbar/crystal/large/statistics.gif differ diff --git a/data/images/toolbar/crystal/large/undo.gif b/data/images/toolbar/crystal/large/undo.gif new file mode 100644 index 00000000..15558dba Binary files /dev/null and b/data/images/toolbar/crystal/large/undo.gif differ diff --git a/data/images/toolbar/crystal/small/autodrop.gif b/data/images/toolbar/crystal/small/autodrop.gif new file mode 100644 index 00000000..16c18457 Binary files /dev/null and b/data/images/toolbar/crystal/small/autodrop.gif differ diff --git a/data/images/toolbar/crystal/small/new.gif b/data/images/toolbar/crystal/small/new.gif new file mode 100644 index 00000000..fa215993 Binary files /dev/null and b/data/images/toolbar/crystal/small/new.gif differ diff --git a/data/images/toolbar/crystal/small/open.gif b/data/images/toolbar/crystal/small/open.gif new file mode 100644 index 00000000..7e8b03cc Binary files /dev/null and b/data/images/toolbar/crystal/small/open.gif differ diff --git a/data/images/toolbar/crystal/small/pause.gif b/data/images/toolbar/crystal/small/pause.gif new file mode 100644 index 00000000..03e79cb4 Binary files /dev/null and b/data/images/toolbar/crystal/small/pause.gif differ diff --git a/data/images/toolbar/crystal/small/quit.gif b/data/images/toolbar/crystal/small/quit.gif new file mode 100644 index 00000000..b3be7031 Binary files /dev/null and b/data/images/toolbar/crystal/small/quit.gif differ diff --git a/data/images/toolbar/crystal/small/redo.gif b/data/images/toolbar/crystal/small/redo.gif new file mode 100644 index 00000000..057f8a46 Binary files /dev/null and b/data/images/toolbar/crystal/small/redo.gif differ diff --git a/data/images/toolbar/crystal/small/restart.gif b/data/images/toolbar/crystal/small/restart.gif new file mode 100644 index 00000000..dd00235c Binary files /dev/null and b/data/images/toolbar/crystal/small/restart.gif differ diff --git a/data/images/toolbar/crystal/small/rules.gif b/data/images/toolbar/crystal/small/rules.gif new file mode 100644 index 00000000..056b7634 Binary files /dev/null and b/data/images/toolbar/crystal/small/rules.gif differ diff --git a/data/images/toolbar/crystal/small/save.gif b/data/images/toolbar/crystal/small/save.gif new file mode 100644 index 00000000..380dcf8a Binary files /dev/null and b/data/images/toolbar/crystal/small/save.gif differ diff --git a/data/images/toolbar/crystal/small/statistics.gif b/data/images/toolbar/crystal/small/statistics.gif new file mode 100644 index 00000000..93a49086 Binary files /dev/null and b/data/images/toolbar/crystal/small/statistics.gif differ diff --git a/data/images/toolbar/crystal/small/undo.gif b/data/images/toolbar/crystal/small/undo.gif new file mode 100644 index 00000000..de28996d Binary files /dev/null and b/data/images/toolbar/crystal/small/undo.gif differ diff --git a/data/images/toolbar/default/empty-large/autodrop.gif b/data/images/toolbar/default/empty-large/autodrop.gif new file mode 100644 index 00000000..e08c90c0 Binary files /dev/null and b/data/images/toolbar/default/empty-large/autodrop.gif differ diff --git a/data/images/toolbar/default/empty-large/new.gif b/data/images/toolbar/default/empty-large/new.gif new file mode 100644 index 00000000..72664926 Binary files /dev/null and b/data/images/toolbar/default/empty-large/new.gif differ diff --git a/data/images/toolbar/default/empty-large/open.gif b/data/images/toolbar/default/empty-large/open.gif new file mode 100644 index 00000000..213c32a9 Binary files /dev/null and b/data/images/toolbar/default/empty-large/open.gif differ diff --git a/data/images/toolbar/default/empty-large/quit.gif b/data/images/toolbar/default/empty-large/quit.gif new file mode 100644 index 00000000..dd3bed25 Binary files /dev/null and b/data/images/toolbar/default/empty-large/quit.gif differ diff --git a/data/images/toolbar/default/empty-large/redo.gif b/data/images/toolbar/default/empty-large/redo.gif new file mode 100644 index 00000000..8b892e0e Binary files /dev/null and b/data/images/toolbar/default/empty-large/redo.gif differ diff --git a/data/images/toolbar/default/empty-large/restart.gif b/data/images/toolbar/default/empty-large/restart.gif new file mode 100644 index 00000000..d3c90548 Binary files /dev/null and b/data/images/toolbar/default/empty-large/restart.gif differ diff --git a/data/images/toolbar/default/empty-large/rules.gif b/data/images/toolbar/default/empty-large/rules.gif new file mode 100644 index 00000000..1586582e Binary files /dev/null and b/data/images/toolbar/default/empty-large/rules.gif differ diff --git a/data/images/toolbar/default/empty-large/save.gif b/data/images/toolbar/default/empty-large/save.gif new file mode 100644 index 00000000..a489fcb0 Binary files /dev/null and b/data/images/toolbar/default/empty-large/save.gif differ diff --git a/data/images/toolbar/default/empty-large/statistics.gif b/data/images/toolbar/default/empty-large/statistics.gif new file mode 100644 index 00000000..949aa4c6 Binary files /dev/null and b/data/images/toolbar/default/empty-large/statistics.gif differ diff --git a/data/images/toolbar/default/empty-large/undo.gif b/data/images/toolbar/default/empty-large/undo.gif new file mode 100644 index 00000000..717e2f55 Binary files /dev/null and b/data/images/toolbar/default/empty-large/undo.gif differ diff --git a/data/images/toolbar/default/large/autodrop.gif b/data/images/toolbar/default/large/autodrop.gif new file mode 100644 index 00000000..8365d49e Binary files /dev/null and b/data/images/toolbar/default/large/autodrop.gif differ diff --git a/data/images/toolbar/default/large/new.gif b/data/images/toolbar/default/large/new.gif new file mode 100644 index 00000000..7bac4e04 Binary files /dev/null and b/data/images/toolbar/default/large/new.gif differ diff --git a/data/images/toolbar/default/large/open.gif b/data/images/toolbar/default/large/open.gif new file mode 100644 index 00000000..b0fde787 Binary files /dev/null and b/data/images/toolbar/default/large/open.gif differ diff --git a/data/images/toolbar/default/large/pause.gif b/data/images/toolbar/default/large/pause.gif new file mode 100644 index 00000000..8c3d83a7 Binary files /dev/null and b/data/images/toolbar/default/large/pause.gif differ diff --git a/data/images/toolbar/default/large/quit.gif b/data/images/toolbar/default/large/quit.gif new file mode 100644 index 00000000..1ee09f47 Binary files /dev/null and b/data/images/toolbar/default/large/quit.gif differ diff --git a/data/images/toolbar/default/large/redo.gif b/data/images/toolbar/default/large/redo.gif new file mode 100644 index 00000000..c5b46a2c Binary files /dev/null and b/data/images/toolbar/default/large/redo.gif differ diff --git a/data/images/toolbar/default/large/restart.gif b/data/images/toolbar/default/large/restart.gif new file mode 100644 index 00000000..f45a9069 Binary files /dev/null and b/data/images/toolbar/default/large/restart.gif differ diff --git a/data/images/toolbar/default/large/rules.gif b/data/images/toolbar/default/large/rules.gif new file mode 100644 index 00000000..ee2abcad Binary files /dev/null and b/data/images/toolbar/default/large/rules.gif differ diff --git a/data/images/toolbar/default/large/save.gif b/data/images/toolbar/default/large/save.gif new file mode 100644 index 00000000..92c26bb4 Binary files /dev/null and b/data/images/toolbar/default/large/save.gif differ diff --git a/data/images/toolbar/default/large/statistics.gif b/data/images/toolbar/default/large/statistics.gif new file mode 100644 index 00000000..7795c7cb Binary files /dev/null and b/data/images/toolbar/default/large/statistics.gif differ diff --git a/data/images/toolbar/default/large/undo.gif b/data/images/toolbar/default/large/undo.gif new file mode 100644 index 00000000..6b637b36 Binary files /dev/null and b/data/images/toolbar/default/large/undo.gif differ diff --git a/data/images/toolbar/default/small/autodrop.gif b/data/images/toolbar/default/small/autodrop.gif new file mode 100644 index 00000000..bd4a8dfc Binary files /dev/null and b/data/images/toolbar/default/small/autodrop.gif differ diff --git a/data/images/toolbar/default/small/new.gif b/data/images/toolbar/default/small/new.gif new file mode 100644 index 00000000..a5c1c7df Binary files /dev/null and b/data/images/toolbar/default/small/new.gif differ diff --git a/data/images/toolbar/default/small/open.gif b/data/images/toolbar/default/small/open.gif new file mode 100644 index 00000000..5903f801 Binary files /dev/null and b/data/images/toolbar/default/small/open.gif differ diff --git a/data/images/toolbar/default/small/pause.gif b/data/images/toolbar/default/small/pause.gif new file mode 100644 index 00000000..03e79cb4 Binary files /dev/null and b/data/images/toolbar/default/small/pause.gif differ diff --git a/data/images/toolbar/default/small/quit.gif b/data/images/toolbar/default/small/quit.gif new file mode 100644 index 00000000..6b791545 Binary files /dev/null and b/data/images/toolbar/default/small/quit.gif differ diff --git a/data/images/toolbar/default/small/redo.gif b/data/images/toolbar/default/small/redo.gif new file mode 100644 index 00000000..b0f1f03e Binary files /dev/null and b/data/images/toolbar/default/small/redo.gif differ diff --git a/data/images/toolbar/default/small/restart.gif b/data/images/toolbar/default/small/restart.gif new file mode 100644 index 00000000..9350c8bd Binary files /dev/null and b/data/images/toolbar/default/small/restart.gif differ diff --git a/data/images/toolbar/default/small/rules.gif b/data/images/toolbar/default/small/rules.gif new file mode 100644 index 00000000..84cc5cbd Binary files /dev/null and b/data/images/toolbar/default/small/rules.gif differ diff --git a/data/images/toolbar/default/small/save.gif b/data/images/toolbar/default/small/save.gif new file mode 100644 index 00000000..8707b749 Binary files /dev/null and b/data/images/toolbar/default/small/save.gif differ diff --git a/data/images/toolbar/default/small/statistics.gif b/data/images/toolbar/default/small/statistics.gif new file mode 100644 index 00000000..7db06f8a Binary files /dev/null and b/data/images/toolbar/default/small/statistics.gif differ diff --git a/data/images/toolbar/default/small/undo.gif b/data/images/toolbar/default/small/undo.gif new file mode 100644 index 00000000..7045f29d Binary files /dev/null and b/data/images/toolbar/default/small/undo.gif differ diff --git a/data/images/tree/emptynode.gif b/data/images/tree/emptynode.gif new file mode 100644 index 00000000..a0865055 Binary files /dev/null and b/data/images/tree/emptynode.gif differ diff --git a/data/images/tree/folder.gif b/data/images/tree/folder.gif new file mode 100644 index 00000000..bda3b430 Binary files /dev/null and b/data/images/tree/folder.gif differ diff --git a/data/images/tree/minusnode.gif b/data/images/tree/minusnode.gif new file mode 100644 index 00000000..5a38d019 Binary files /dev/null and b/data/images/tree/minusnode.gif differ diff --git a/data/images/tree/node.gif b/data/images/tree/node.gif new file mode 100644 index 00000000..274bcaef Binary files /dev/null and b/data/images/tree/node.gif differ diff --git a/data/images/tree/openfolder.gif b/data/images/tree/openfolder.gif new file mode 100644 index 00000000..4a3d97f0 Binary files /dev/null and b/data/images/tree/openfolder.gif differ diff --git a/data/images/tree/plusnode.gif b/data/images/tree/plusnode.gif new file mode 100644 index 00000000..d802f4a9 Binary files /dev/null and b/data/images/tree/plusnode.gif differ diff --git a/data/images/tree/python.gif b/data/images/tree/python.gif new file mode 100644 index 00000000..c34426fb Binary files /dev/null and b/data/images/tree/python.gif differ diff --git a/data/images/tree/tk.gif b/data/images/tree/tk.gif new file mode 100644 index 00000000..f99dcab6 Binary files /dev/null and b/data/images/tree/tk.gif differ diff --git a/data/images/wizard.gif b/data/images/wizard.gif new file mode 100644 index 00000000..8c7c9d7b Binary files /dev/null and b/data/images/wizard.gif differ diff --git a/data/images/wizardcards.gif b/data/images/wizardcards.gif new file mode 100644 index 00000000..489fc78b Binary files /dev/null and b/data/images/wizardcards.gif differ diff --git a/data/pysol.ico b/data/pysol.ico new file mode 100644 index 00000000..23ecfaf6 Binary files /dev/null and b/data/pysol.ico differ diff --git a/data/pysol.xbm b/data/pysol.xbm new file mode 100644 index 00000000..b481ec4e --- /dev/null +++ b/data/pysol.xbm @@ -0,0 +1,20 @@ +#define pysol_width 41 +#define pysol_height 40 +static char pysol_bits[] = { + 0x00,0x00,0x00,0x00,0x00,0xfe,0x00,0x00,0x00,0x00,0x00,0xfe,0x00,0x00,0x7c, + 0x00,0x00,0xfe,0x00,0x00,0xff,0x01,0x00,0xfe,0x00,0x80,0xff,0x03,0x00,0xfe, + 0x00,0xc0,0xff,0x07,0x00,0xfe,0x00,0xe0,0xff,0x0f,0x00,0xfe,0x00,0xe0,0xff, + 0x0f,0x00,0xfe,0x00,0xf0,0xff,0x1f,0x00,0xfe,0x00,0xf0,0xff,0x1f,0x00,0xfe, + 0x00,0xf0,0xff,0x1f,0x00,0xfe,0x00,0xf0,0xff,0x1f,0x00,0xfe,0x00,0xf0,0xff, + 0x1f,0x00,0xfe,0x00,0xe0,0xff,0x0f,0x00,0xfe,0x00,0xe0,0xff,0x0f,0x00,0xfe, + 0x00,0xc0,0xff,0x07,0x00,0xfe,0x00,0x9f,0xff,0xf3,0x01,0xfe,0xc0,0x7f,0xff, + 0xfd,0x07,0xfe,0xe0,0xff,0x7c,0xfe,0x0f,0xfe,0xf0,0xff,0x39,0xff,0x1f,0xfe, + 0xf8,0xff,0xbb,0xff,0x3f,0xfe,0xf8,0xff,0xbb,0xff,0x3f,0xfe,0xfc,0xff,0xff, + 0xff,0x7f,0xfe,0xfc,0xff,0xff,0xff,0x7f,0xfe,0xfc,0xff,0xff,0xff,0x7f,0xfe, + 0xfc,0xff,0xff,0xff,0x7f,0xfe,0xfc,0xff,0xff,0xff,0x7f,0xfe,0xf8,0xff,0xbb, + 0xff,0x3f,0xfe,0xf8,0xff,0xbb,0xff,0x3f,0xfe,0xf0,0xff,0x39,0xff,0x1f,0xfe, + 0xe0,0xff,0x39,0xfe,0x0f,0xfe,0xc0,0x7f,0x38,0xfc,0x07,0xfe,0x00,0x1f,0x7c, + 0xf0,0x01,0xfe,0x00,0x00,0x7c,0x00,0x00,0xfe,0x00,0x00,0xfe,0x00,0x00,0xfe, + 0x00,0x00,0xfe,0x00,0x00,0xfe,0x00,0x00,0xff,0x01,0x00,0xfe,0x00,0x80,0xff, + 0x03,0x00,0xfe,0x00,0x00,0x00,0x00,0x00,0xfe,0x00,0x00,0x00,0x00,0x00,0xfe + }; diff --git a/data/pysol.xpm b/data/pysol.xpm new file mode 100644 index 00000000..90128009 --- /dev/null +++ b/data/pysol.xpm @@ -0,0 +1,49 @@ +/* XPM */ +static char *magick[] = { +/* columns rows colors chars-per-pixel */ +"32 32 11 1", +" c Gray0", +". c #191919", +"X c Gray20", +"o c #4c4c4c", +"O c #666667", +"+ c Gray60", +"@ c #b2b2b2", +"# c Gray80", +"$ c Gray90", +"% c Gray100", +"& c None", +/* pixels */ +"&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&", +"&&&&&&&&&&&&&&+@@@&&&&&&&&&&&&&&", +"&&&&&&&&&&&&@o o@&&&&&&&&&&&&", +"&&&&&&&&&&&# #&&&&&&&&&&&", +"&&&&&&&&&&# #&&&&&&&&&&", +"&&&&&&&&&& &&&&&&&&&&", +"&&&&&&&&&+ @&&&&&&&&&", +"&&&&&&&&&o o&&&&&&&&&", +"&&&&&&&&&o o&&&&&&&&&", +"&&&&&&&&&o o&&&&&&&&&", +"&&&&&&&&&# #&&&&&&&&&", +"&&&&&&&&&&. .&&&&&&&&&&", +"&&&&&&$$$$&X X&$$$$&&&&&&", +"&&&&$@ +@X X@+ @$&&&&", +"&&&&X .+@ @@ X&&&&", +"&&&X .&$ $& X&&&", +"&&o $ $ o&&", +"&&. + + .$&", +"&+ +&", +"&+ +&", +"&+ +&", +"&# O O #&", +"&&o $ $ o&&", +"&&$ @& &@ .$&&", +"&&&& .$& &&+ &&&&", +"&&&&$O o+&&+ +&&+o O$&&&&", +"&&&&&&@+@+&&&& &&&&+@+@&&&&&&", +"&&&&&&&&&&&&&O O&&&&&&&&&&&&&", +"&&&&&&&&&&&&&. .&&&&&&&&&&&&&", +"&&&&&&&&&&&$. .$&&&&&&&&&&&", +"&&&&&&&&&&&$+++@@@++$&&&&&&&&&&&", +"&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&" +}; diff --git a/data/pysolfc.glade b/data/pysolfc.glade index a9443ba1..cd69eb3d 100644 --- a/data/pysolfc.glade +++ b/data/pysolfc.glade @@ -113,7 +113,7 @@ 50 True - 0 + False False GTK_JUSTIFY_LEFT @@ -138,7 +138,7 @@ 50 True - 0 + False False GTK_JUSTIFY_LEFT @@ -163,7 +163,7 @@ 50 True - 0% + False False GTK_JUSTIFY_LEFT @@ -188,7 +188,7 @@ 50 True - 0% + False False GTK_JUSTIFY_LEFT @@ -213,7 +213,7 @@ 50 True - 0 + False False GTK_JUSTIFY_LEFT @@ -391,7 +391,7 @@ 50 True - 0 + False False GTK_JUSTIFY_LEFT @@ -416,7 +416,7 @@ 50 True - 0 + False False GTK_JUSTIFY_LEFT @@ -441,7 +441,7 @@ 50 True - 0% + False False GTK_JUSTIFY_LEFT @@ -466,7 +466,7 @@ 50 True - 0% + False False GTK_JUSTIFY_LEFT @@ -491,7 +491,7 @@ 50 True - 0 + False False GTK_JUSTIFY_LEFT @@ -738,7 +738,7 @@ True - 0:00 + False False GTK_JUSTIFY_LEFT @@ -762,7 +762,7 @@ True - 0:00 + False False GTK_JUSTIFY_LEFT @@ -786,7 +786,7 @@ True - 0:00 + False False GTK_JUSTIFY_LEFT @@ -834,7 +834,7 @@ True - 0 + False False GTK_JUSTIFY_LEFT @@ -858,7 +858,7 @@ True - 0 + False False GTK_JUSTIFY_LEFT @@ -882,7 +882,7 @@ True - 0 + False False GTK_JUSTIFY_LEFT @@ -930,7 +930,7 @@ True - 0 + False False GTK_JUSTIFY_LEFT @@ -954,7 +954,7 @@ True - 0 + False False GTK_JUSTIFY_LEFT @@ -978,7 +978,7 @@ True - 0 + False False GTK_JUSTIFY_LEFT @@ -1492,14 +1492,14 @@ Set timeouts GTK_WINDOW_TOPLEVEL - GTK_WIN_POS_NONE + GTK_WIN_POS_CENTER_ON_PARENT True True False True False False - GDK_WINDOW_TYPE_HINT_NORMAL + GDK_WINDOW_TYPE_HINT_DIALOG GDK_GRAVITY_NORTH_WEST True @@ -1985,7 +1985,7 @@ Set colors GTK_WINDOW_TOPLEVEL - GTK_WIN_POS_NONE + GTK_WIN_POS_CENTER_ON_PARENT True True False @@ -2043,6 +2043,7 @@ + 4 True 8 3 @@ -2256,214 +2257,6 @@ - - - True - #000000 - False - False - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - - - 1 - 2 - 0 - 1 - 4 - 4 - fill - - - - - - - True - #000000 - False - False - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - - - 1 - 2 - 1 - 2 - 4 - 4 - fill - - - - - - - True - #000000 - False - False - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - - - 1 - 2 - 2 - 3 - 4 - 4 - fill - - - - - - - True - #000000 - False - False - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - - - 1 - 2 - 3 - 4 - 4 - 4 - fill - - - - - - - True - #000000 - False - False - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - - - 1 - 2 - 5 - 6 - 4 - 4 - fill - - - - - - - True - #000000 - False - False - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - - - 1 - 2 - 4 - 5 - 4 - 4 - fill - - - - - - - True - #000000 - False - False - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - - - 1 - 2 - 6 - 7 - 4 - 4 - fill - - - - - - - True - #000000 - False - False - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - - - 1 - 2 - 7 - 8 - 4 - 4 - fill - - - - True @@ -3079,6 +2872,1244 @@ + + + + True + True + False + + + + True + + False + False + GTK_JUSTIFY_LEFT + False + False + 0.5 + 0.5 + 4 + 0 + + + + + 1 + 2 + 1 + 2 + fill + fill + + + + + + True + True + False + + + + True + + False + False + GTK_JUSTIFY_LEFT + False + False + 0.5 + 0.5 + 4 + 0 + + + + + 1 + 2 + 2 + 3 + fill + fill + + + + + + True + True + False + + + + True + + False + False + GTK_JUSTIFY_LEFT + False + False + 0.5 + 0.5 + 4 + 0 + + + + + 1 + 2 + 3 + 4 + fill + fill + + + + + + True + True + False + + + + True + + False + False + GTK_JUSTIFY_LEFT + False + False + 0.5 + 0.5 + 4 + 0 + + + + + 1 + 2 + 4 + 5 + fill + fill + + + + + + True + True + False + + + + True + + False + False + GTK_JUSTIFY_LEFT + False + False + 0.5 + 0.5 + 4 + 0 + + + + + 1 + 2 + 5 + 6 + fill + fill + + + + + + True + True + False + + + + True + + False + False + GTK_JUSTIFY_LEFT + False + False + 0.5 + 0.5 + 4 + 0 + + + + + 1 + 2 + 6 + 7 + fill + fill + + + + + + True + True + False + + + + True + + False + False + GTK_JUSTIFY_LEFT + False + False + 0.5 + 0.5 + 4 + 0 + + + + + 1 + 2 + 7 + 8 + fill + fill + + + + + + True + True + False + + + + True + + False + False + GTK_JUSTIFY_LEFT + False + False + 0.5 + 0.5 + 4 + 0 + + + + + 1 + 2 + 0 + 1 + fill + fill + + + + + 0 + True + True + + + + + + + + Set font + GTK_WINDOW_TOPLEVEL + GTK_WIN_POS_CENTER_ON_PARENT + True + True + False + True + False + False + GDK_WINDOW_TYPE_HINT_DIALOG + GDK_GRAVITY_NORTH_WEST + True + + + + True + False + 0 + + + + True + GTK_BUTTONBOX_END + + + + True + True + True + gtk-cancel + True + GTK_RELIEF_NORMAL + True + -6 + + + + + + True + True + True + gtk-ok + True + GTK_RELIEF_NORMAL + True + -5 + + + + + 0 + False + True + GTK_PACK_END + + + + + + 4 + True + 7 + 3 + False + 0 + 0 + + + + True + HTML: + False + False + GTK_JUSTIFY_LEFT + False + False + 0 + 0.5 + 0 + 0 + + + 0 + 1 + 0 + 1 + 4 + 4 + fill + + + + + + + True + Small: + False + False + GTK_JUSTIFY_LEFT + False + False + 0 + 0.5 + 0 + 0 + + + 0 + 1 + 1 + 2 + 4 + 4 + fill + + + + + + + True + Fixed: + False + False + GTK_JUSTIFY_LEFT + False + False + 0 + 0.5 + 0 + 0 + + + 0 + 1 + 2 + 3 + 4 + 4 + fill + + + + + + + True + Tableau default: + False + False + GTK_JUSTIFY_LEFT + False + False + 0 + 0.5 + 0 + 0 + + + 0 + 1 + 3 + 4 + 4 + 4 + fill + + + + + + + True + Tableau fixed: + False + False + GTK_JUSTIFY_LEFT + False + False + 0 + 0.5 + 0 + 0 + + + 0 + 1 + 4 + 5 + 4 + 4 + fill + + + + + + + True + Tableau small: + False + False + GTK_JUSTIFY_LEFT + False + False + 0 + 0.5 + 0 + 0 + + + 0 + 1 + 6 + 7 + 4 + 4 + fill + + + + + + + True + Tableau large: + False + False + GTK_JUSTIFY_LEFT + False + False + 0 + 0.5 + 0 + 0 + + + 0 + 1 + 5 + 6 + 4 + 4 + fill + + + + + + + True + + False + False + GTK_JUSTIFY_LEFT + False + False + 0.5 + 0.5 + 4 + 0 + + + 1 + 2 + 0 + 1 + 4 + 4 + fill + + + + + + + True + + False + False + GTK_JUSTIFY_LEFT + False + False + 0.5 + 0.5 + 4 + 0 + + + 1 + 2 + 1 + 2 + 4 + 4 + fill + + + + + + + True + + False + False + GTK_JUSTIFY_LEFT + False + False + 0.5 + 0.5 + 4 + 0 + + + 1 + 2 + 2 + 3 + 4 + 4 + fill + + + + + + + True + + False + False + GTK_JUSTIFY_LEFT + False + False + 0.5 + 0.5 + 4 + 0 + + + 1 + 2 + 3 + 4 + 4 + 4 + fill + + + + + + + True + + False + False + GTK_JUSTIFY_LEFT + False + False + 0.5 + 0.5 + 4 + 0 + + + 1 + 2 + 4 + 5 + 4 + 4 + fill + + + + + + + True + + False + False + GTK_JUSTIFY_LEFT + False + False + 0.5 + 0.5 + 4 + 0 + + + 1 + 2 + 5 + 6 + 4 + 4 + fill + + + + + + + True + + False + False + GTK_JUSTIFY_LEFT + False + False + 0.5 + 0.5 + 4 + 0 + + + 1 + 2 + 6 + 7 + 4 + 4 + fill + + + + + + + True + True + GTK_RELIEF_NORMAL + True + + + + True + 0.5 + 0.5 + 0 + 0 + 0 + 0 + 0 + 0 + + + + True + False + 2 + + + + True + gtk-select-font + 4 + 0.5 + 0.5 + 0 + 0 + + + 0 + False + False + + + + + + True + Change... + True + False + GTK_JUSTIFY_LEFT + False + False + 0.5 + 0.5 + 0 + 0 + + + 0 + False + False + + + + + + + + + 2 + 3 + 0 + 1 + fill + + + + + + + True + True + GTK_RELIEF_NORMAL + True + + + + True + 0.5 + 0.5 + 0 + 0 + 0 + 0 + 0 + 0 + + + + True + False + 2 + + + + True + gtk-select-font + 4 + 0.5 + 0.5 + 0 + 0 + + + 0 + False + False + + + + + + True + Change... + True + False + GTK_JUSTIFY_LEFT + False + False + 0.5 + 0.5 + 0 + 0 + + + 0 + False + False + + + + + + + + + 2 + 3 + 1 + 2 + fill + + + + + + + True + True + GTK_RELIEF_NORMAL + True + + + + True + 0.5 + 0.5 + 0 + 0 + 0 + 0 + 0 + 0 + + + + True + False + 2 + + + + True + gtk-select-font + 4 + 0.5 + 0.5 + 0 + 0 + + + 0 + False + False + + + + + + True + Change... + True + False + GTK_JUSTIFY_LEFT + False + False + 0.5 + 0.5 + 0 + 0 + + + 0 + False + False + + + + + + + + + 2 + 3 + 2 + 3 + fill + + + + + + + True + True + GTK_RELIEF_NORMAL + True + + + + True + 0.5 + 0.5 + 0 + 0 + 0 + 0 + 0 + 0 + + + + True + False + 2 + + + + True + gtk-select-font + 4 + 0.5 + 0.5 + 0 + 0 + + + 0 + False + False + + + + + + True + Change... + True + False + GTK_JUSTIFY_LEFT + False + False + 0.5 + 0.5 + 0 + 0 + + + 0 + False + False + + + + + + + + + 2 + 3 + 3 + 4 + fill + + + + + + + True + True + GTK_RELIEF_NORMAL + True + + + + True + 0.5 + 0.5 + 0 + 0 + 0 + 0 + 0 + 0 + + + + True + False + 2 + + + + True + gtk-select-font + 4 + 0.5 + 0.5 + 0 + 0 + + + 0 + False + False + + + + + + True + Change... + True + False + GTK_JUSTIFY_LEFT + False + False + 0.5 + 0.5 + 0 + 0 + + + 0 + False + False + + + + + + + + + 2 + 3 + 4 + 5 + fill + + + + + + + True + True + GTK_RELIEF_NORMAL + True + + + + True + 0.5 + 0.5 + 0 + 0 + 0 + 0 + 0 + 0 + + + + True + False + 2 + + + + True + gtk-select-font + 4 + 0.5 + 0.5 + 0 + 0 + + + 0 + False + False + + + + + + True + Change... + True + False + GTK_JUSTIFY_LEFT + False + False + 0.5 + 0.5 + 0 + 0 + + + 0 + False + False + + + + + + + + + 2 + 3 + 5 + 6 + fill + + + + + + + True + True + GTK_RELIEF_NORMAL + True + + + + True + 0.5 + 0.5 + 0 + 0 + 0 + 0 + 0 + 0 + + + + True + False + 2 + + + + True + gtk-select-font + 4 + 0.5 + 0.5 + 0 + 0 + + + 0 + False + False + + + + + + True + Change... + True + False + GTK_JUSTIFY_LEFT + False + False + 0.5 + 0.5 + 0 + 0 + + + 0 + False + False + + + + + + + + + 2 + 3 + 6 + 7 + fill + + + 0 diff --git a/data/pysolfc.gladep b/data/pysolfc.gladep new file mode 100644 index 00000000..70c22541 --- /dev/null +++ b/data/pysolfc.gladep @@ -0,0 +1,10 @@ + + + + + PySolFC + pysol + FALSE + TRUE + glade-translations + diff --git a/po/games.pot b/po/games.pot index d8839805..cbc25b17 100644 --- a/po/games.pot +++ b/po/games.pot @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: PySol 0.0.1\n" -"POT-Creation-Date: Fri Aug 11 02:15:03 2006\n" +"POT-Creation-Date: Tue Aug 22 21:32:47 2006\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -48,6 +48,9 @@ msgstr "" msgid "Abacus" msgstr "" +msgid "Accordion" +msgstr "" + msgid "Aces High" msgstr "" @@ -123,6 +126,9 @@ msgstr "" msgid "Another Round" msgstr "" +msgid "Apophis" +msgstr "" + msgid "Appachan's Waterfall" msgstr "" @@ -204,6 +210,9 @@ msgstr "" msgid "Balarama" msgstr "" +msgid "Baroness" +msgstr "" + msgid "Bastille Day" msgstr "" @@ -462,6 +471,9 @@ msgstr "" msgid "Castle of Indolence" msgstr "" +msgid "Castles End" +msgstr "" + msgid "Castles in Spain" msgstr "" @@ -495,6 +507,9 @@ msgstr "" msgid "Chelicera" msgstr "" +msgid "Cheops" +msgstr "" + msgid "Chequers" msgstr "" @@ -570,6 +585,9 @@ msgstr "" msgid "Corkscrew" msgstr "" +msgid "Corner Card" +msgstr "" + msgid "Corner Suite" msgstr "" @@ -801,6 +819,9 @@ msgstr "" msgid "Doublets" msgstr "" +msgid "Doublets II" +msgstr "" + msgid "Dover" msgstr "" @@ -870,6 +891,9 @@ msgstr "" msgid "Eight Times Eight" msgstr "" +msgid "Eight by Eight" +msgstr "" + msgid "Elba" msgstr "" @@ -984,6 +1008,9 @@ msgstr "" msgid "Five Aces" msgstr "" +msgid "Five Piles" +msgstr "" + msgid "Five Pyramids" msgstr "" @@ -1335,6 +1362,9 @@ msgstr "" msgid "Idle Aces" msgstr "" +msgid "Idle Year" +msgstr "" + msgid "IloveU" msgstr "" @@ -1557,6 +1587,9 @@ msgstr "" msgid "Labyrinth" msgstr "" +msgid "Ladies Battle" +msgstr "" + msgid "Lady Betty" msgstr "" @@ -2277,6 +2310,9 @@ msgstr "" msgid "Mesh" msgstr "" +msgid "Methuselah" +msgstr "" + msgid "Midnight Oil" msgstr "" @@ -2601,6 +2637,9 @@ msgstr "" msgid "Phantom Blockade" msgstr "" +msgid "Pharaohs" +msgstr "" + msgid "Phoenix" msgstr "" @@ -2934,6 +2973,9 @@ msgstr "" msgid "Senate +" msgstr "" +msgid "Senior Wrangler" +msgstr "" + msgid "Serpent" msgstr "" @@ -3204,6 +3246,9 @@ msgstr "" msgid "Streets and Alleys" msgstr "" +msgid "Striptease" +msgstr "" + msgid "Stronghold" msgstr "" @@ -3363,12 +3408,18 @@ msgstr "" msgid "Tomb" msgstr "" +msgid "Toni" +msgstr "" + msgid "Totally Random-Made" msgstr "" msgid "Tournament" msgstr "" +msgid "Tower of Babel" +msgstr "" + msgid "Tower of Hanoy" msgstr "" @@ -3483,6 +3534,9 @@ msgstr "" msgid "Vamana" msgstr "" +msgid "Vanishing Cross" +msgstr "" + msgid "Varaha" msgstr "" diff --git a/po/pysol.pot b/po/pysol.pot index ce48a38a..d04f0a27 100644 --- a/po/pysol.pot +++ b/po/pysol.pot @@ -1,11 +1,20 @@ +# #-#-#-#-# pysol-1.pot (PACKAGE VERSION) #-#-#-#-# # SOME DESCRIPTIVE TITLE. # Copyright (C) YEAR ORGANIZATION # FIRST AUTHOR , YEAR. # +# #-#-#-#-# pysol-2.pot (PACKAGE VERSION) #-#-#-#-# +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# FIRST AUTHOR , YEAR. +# +#, fuzzy msgid "" msgstr "" +"#-#-#-#-# pysol-1.pot (PACKAGE VERSION) #-#-#-#-#\n" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: Fri Aug 11 02:14:56 2006\n" +"POT-Creation-Date: Tue Aug 22 21:33:40 2006\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -13,48 +22,55 @@ msgstr "" "Content-Type: text/plain; charset=CHARSET\n" "Content-Transfer-Encoding: ENCODING\n" "Generated-By: pygettext.py 1.5\n" +"#-#-#-#-# pysol-2.pot (PACKAGE VERSION) #-#-#-#-#\n" +"Project-Id-Version: PACKAGE VERSION\n" +"POT-Creation-Date: 2006-08-22 21:33+0400\n" +"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" +"Last-Translator: FULL NAME \n" +"Language-Team: LANGUAGE \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=CHARSET\n" +"Content-Transfer-Encoding: 8bit\n" - -#: pysollib/actions.py:360 pysollib/tk/toolbar.py:197 +#: pysollib/actions.py:358 pysollib/tk/toolbar.py:197 msgid "New game" msgstr "" -#: pysollib/actions.py:373 pysollib/tk/menubar.py:699 -#: pysollib/tk/menubar.py:713 +#: pysollib/actions.py:371 pysollib/tk/menubar.py:704 +#: pysollib/tk/menubar.py:718 msgid "Select game" msgstr "" -#: pysollib/actions.py:396 +#: pysollib/actions.py:388 msgid "Invalid game number" msgstr "" -#: pysollib/actions.py:397 -msgid "" -"Invalid game number\n" +#: pysollib/actions.py:389 +msgid "Invalid game number\n" msgstr "" -#: pysollib/actions.py:414 +#: pysollib/actions.py:406 msgid "Select next game number" msgstr "" -#: pysollib/actions.py:423 pysollib/actions.py:433 +#: pysollib/actions.py:415 pysollib/actions.py:425 msgid "Select new game number" msgstr "" -#: pysollib/actions.py:424 +#: pysollib/actions.py:416 msgid "" "\n" "\n" "Enter new game number" msgstr "" -#: pysollib/actions.py:425 +#: pysollib/actions.py:417 msgid "&Next number" msgstr "" -#: pysollib/actions.py:425 pysollib/app.py:1143 pysollib/app.py:1155 -#: pysollib/game.py:904 pysollib/game.py:1828 pysollib/main.py:439 -#: pysollib/main.py:447 pysollib/tk/colorsdialog.py:132 +#: pysollib/actions.py:417 pysollib/app.py:1150 pysollib/app.py:1162 +#: pysollib/game.py:925 pysollib/game.py:1861 pysollib/main.py:439 +#: pysollib/main.py:447 pysollib/tk/colorsdialog.py:122 #: pysollib/tk/edittextdialog.py:82 pysollib/tk/fontsdialog.py:143 #: pysollib/tk/fontsdialog.py:205 pysollib/tk/gameinfodialog.py:155 #: pysollib/tk/playeroptionsdialog.py:85 @@ -70,12 +86,12 @@ msgstr "" msgid "&OK" msgstr "" -#: pysollib/actions.py:425 pysollib/app.py:1155 pysollib/game.py:904 -#: pysollib/game.py:1290 pysollib/game.py:1305 pysollib/game.py:1312 -#: pysollib/game.py:1318 pysollib/tk/colorsdialog.py:132 +#: pysollib/actions.py:417 pysollib/app.py:1162 pysollib/game.py:925 +#: pysollib/game.py:1311 pysollib/game.py:1326 pysollib/game.py:1333 +#: pysollib/game.py:1339 pysollib/tk/colorsdialog.py:122 #: pysollib/tk/edittextdialog.py:82 pysollib/tk/fontsdialog.py:143 -#: pysollib/tk/fontsdialog.py:205 pysollib/tk/menubar.py:894 -#: pysollib/tk/menubar.py:896 pysollib/tk/playeroptionsdialog.py:85 +#: pysollib/tk/fontsdialog.py:205 pysollib/tk/menubar.py:1000 +#: pysollib/tk/menubar.py:1002 pysollib/tk/playeroptionsdialog.py:85 #: pysollib/tk/playeroptionsdialog.py:160 pysollib/tk/selectcardset.py:240 #: pysollib/tk/selectgame.py:266 pysollib/tk/selectgame.py:407 #: pysollib/tk/selecttile.py:158 pysollib/tk/soundoptionsdialog.py:170 @@ -83,128 +99,128 @@ msgstr "" msgid "&Cancel" msgstr "" -#: pysollib/actions.py:441 +#: pysollib/actions.py:433 msgid "Select random game" msgstr "" -#: pysollib/actions.py:477 +#: pysollib/actions.py:469 msgid "Select next game" msgstr "" -#: pysollib/actions.py:510 pysollib/tk/toolbar.py:211 +#: pysollib/actions.py:502 pysollib/tk/toolbar.py:211 msgid "Quit " msgstr "" -#: pysollib/actions.py:560 +#: pysollib/actions.py:552 msgid "Clear bookmarks" msgstr "" -#: pysollib/actions.py:561 +#: pysollib/actions.py:553 msgid "Clear all bookmarks ?" msgstr "" -#: pysollib/actions.py:571 +#: pysollib/actions.py:563 msgid "Restart game" msgstr "" -#: pysollib/actions.py:572 +#: pysollib/actions.py:564 msgid "Restart this game ?" msgstr "" -#: pysollib/actions.py:613 +#: pysollib/actions.py:605 msgid "" "Comments for %s:\n" "\n" msgstr "" -#: pysollib/actions.py:615 +#: pysollib/actions.py:607 msgid "Comments for " msgstr "" -#: pysollib/actions.py:633 pysollib/actions.py:669 +#: pysollib/actions.py:625 pysollib/actions.py:661 msgid "Error while writing to file" msgstr "" -#: pysollib/actions.py:636 pysollib/actions.py:672 +#: pysollib/actions.py:628 pysollib/actions.py:664 msgid " Info" msgstr "" -#: pysollib/actions.py:637 +#: pysollib/actions.py:629 msgid "" "Comments were appended to\n" "\n" msgstr "" -#: pysollib/actions.py:654 +#: pysollib/actions.py:646 msgid "Demo statistics" msgstr "" -#: pysollib/actions.py:657 +#: pysollib/actions.py:649 msgid "Your statistics" msgstr "" -#: pysollib/actions.py:673 +#: pysollib/actions.py:665 msgid "" " were appended to\n" "\n" msgstr "" -#: pysollib/actions.py:687 +#: pysollib/actions.py:679 msgid " Demo" msgstr "" -#: pysollib/actions.py:687 +#: pysollib/actions.py:679 msgid " Demo " msgstr "" -#: pysollib/actions.py:690 pysollib/actions.py:708 +#: pysollib/actions.py:682 pysollib/actions.py:700 msgid " for " msgstr "" -#: pysollib/actions.py:696 pysollib/actions.py:715 +#: pysollib/actions.py:688 pysollib/actions.py:707 msgid "Statistics for " msgstr "" -#: pysollib/actions.py:699 pysollib/tk/selectgame.py:350 +#: pysollib/actions.py:691 pysollib/tk/selectgame.py:350 #: pysollib/tk/toolbar.py:208 msgid "Statistics" msgstr "" -#: pysollib/actions.py:702 +#: pysollib/actions.py:694 msgid "Full log" msgstr "" -#: pysollib/actions.py:705 +#: pysollib/actions.py:697 msgid "Session log" msgstr "" -#: pysollib/actions.py:711 +#: pysollib/actions.py:703 msgid "Game Info" msgstr "" -#: pysollib/actions.py:720 +#: pysollib/actions.py:712 msgid "Full log for " msgstr "" -#: pysollib/actions.py:725 +#: pysollib/actions.py:717 msgid "Session log for " msgstr "" -#: pysollib/actions.py:730 +#: pysollib/actions.py:722 msgid "Reset all statistics" msgstr "" -#: pysollib/actions.py:731 +#: pysollib/actions.py:723 msgid "" "Reset ALL statistics and logs for player\n" "%s ?" msgstr "" -#: pysollib/actions.py:737 +#: pysollib/actions.py:729 msgid "Reset game statistics" msgstr "" -#: pysollib/actions.py:738 +#: pysollib/actions.py:730 msgid "" "Reset statistics and logs for player\n" "%s\n" @@ -212,51 +228,51 @@ msgid "" "%s ?" msgstr "" -#: pysollib/actions.py:794 +#: pysollib/actions.py:785 msgid "Play demo" msgstr "" -#: pysollib/actions.py:805 +#: pysollib/actions.py:796 msgid "Set player options" msgstr "" -#: pysollib/actions.py:906 +#: pysollib/actions.py:810 msgid "Sound settings" msgstr "" -#: pysollib/actions.py:927 +#: pysollib/actions.py:819 msgid "Set colors" msgstr "" -#: pysollib/actions.py:946 +#: pysollib/actions.py:839 msgid "Set fonts" msgstr "" -#: pysollib/actions.py:955 +#: pysollib/actions.py:848 msgid "Set timeouts" msgstr "" -#: pysollib/app.py:87 +#: pysollib/app.py:86 msgid "Unknown" msgstr "" -#: pysollib/app.py:1005 +#: pysollib/app.py:1012 msgid "Loading %s %s..." msgstr "" -#: pysollib/app.py:1040 +#: pysollib/app.py:1047 msgid " load error" msgstr "" -#: pysollib/app.py:1041 +#: pysollib/app.py:1048 msgid "Error while loading " msgstr "" -#: pysollib/app.py:1135 +#: pysollib/app.py:1142 msgid "Incompatible " msgstr "" -#: pysollib/app.py:1137 +#: pysollib/app.py:1144 msgid "" "The currently selected %s %s\n" "is not compatible with the game\n" @@ -265,58 +281,57 @@ msgid "" "Please select a %s type %s.\n" msgstr "" -#: pysollib/app.py:1153 +#: pysollib/app.py:1160 msgid "Please select a %s type %s" msgstr "" -#: pysollib/game.py:823 pysollib/game.py:829 -msgid "" -"Player\n" +#: pysollib/game.py:844 pysollib/game.py:850 +msgid "Player\n" msgstr "" -#: pysollib/game.py:900 +#: pysollib/game.py:921 msgid "Discard current game ?" msgstr "" -#: pysollib/game.py:1244 +#: pysollib/game.py:1265 msgid "" "\n" "You have reached\n" "#%d in the %s of playing time" msgstr "" -#: pysollib/game.py:1247 +#: pysollib/game.py:1268 msgid "" "\n" "and #%d in the %s of moves" msgstr "" -#: pysollib/game.py:1249 +#: pysollib/game.py:1270 msgid "" "\n" "You have reached\n" "#%d in the %s of moves" msgstr "" -#: pysollib/game.py:1252 +#: pysollib/game.py:1273 msgid "" "\n" "and #%d in the %s of total moves" msgstr "" -#: pysollib/game.py:1254 +#: pysollib/game.py:1275 msgid "" "\n" "You have reached\n" "#%d in the %s of total moves" msgstr "" -#: pysollib/game.py:1281 pysollib/game.py:1297 +#: pysollib/game.py:1302 pysollib/game.py:1318 #: pysollib/tk/soundoptionsdialog.py:100 msgid "Game won" msgstr "" -#: pysollib/game.py:1282 +#: pysollib/game.py:1303 msgid "" "\n" "Congratulations, this\n" @@ -327,12 +342,12 @@ msgid "" "%s\n" msgstr "" -#: pysollib/game.py:1290 pysollib/game.py:1305 pysollib/game.py:1312 -#: pysollib/game.py:1318 pysollib/tk/menubar.py:257 +#: pysollib/game.py:1311 pysollib/game.py:1326 pysollib/game.py:1333 +#: pysollib/game.py:1339 pysollib/tk/menubar.py:256 msgid "&New game" msgstr "" -#: pysollib/game.py:1298 +#: pysollib/game.py:1319 msgid "" "\n" "Congratulations, you did it !\n" @@ -342,100 +357,100 @@ msgid "" "%s\n" msgstr "" -#: pysollib/game.py:1310 pysollib/game.py:1316 +#: pysollib/game.py:1331 pysollib/game.py:1337 #: pysollib/tk/soundoptionsdialog.py:98 msgid "Game finished" msgstr "" -#: pysollib/game.py:1311 pysollib/game.py:1829 +#: pysollib/game.py:1332 pysollib/game.py:1862 msgid "" "\n" "Game finished\n" msgstr "" -#: pysollib/game.py:1317 +#: pysollib/game.py:1338 msgid "" "\n" "Game finished, but not without my help...\n" msgstr "" -#: pysollib/game.py:1318 +#: pysollib/game.py:1339 msgid "&Restart" msgstr "" -#: pysollib/game.py:1720 +#: pysollib/game.py:1753 msgid "Score %6d" msgstr "" -#: pysollib/game.py:1819 +#: pysollib/game.py:1852 msgid "&Cool" msgstr "" -#: pysollib/game.py:1819 +#: pysollib/game.py:1852 msgid "&Great" msgstr "" -#: pysollib/game.py:1819 +#: pysollib/game.py:1852 msgid "&Wow" msgstr "" -#: pysollib/game.py:1819 +#: pysollib/game.py:1852 msgid "&Yeah" msgstr "" -#: pysollib/game.py:1820 pysollib/game.py:1832 pysollib/game.py:1845 +#: pysollib/game.py:1853 pysollib/game.py:1865 pysollib/game.py:1878 msgid " Autopilot" msgstr "" -#: pysollib/game.py:1821 +#: pysollib/game.py:1854 msgid "" "\n" "Game solved in %d moves.\n" msgstr "" -#: pysollib/game.py:1844 +#: pysollib/game.py:1877 msgid "&Hmm" msgstr "" -#: pysollib/game.py:1844 +#: pysollib/game.py:1877 msgid "&Oh well" msgstr "" -#: pysollib/game.py:1844 +#: pysollib/game.py:1877 msgid "&That's life" msgstr "" -#: pysollib/game.py:1846 +#: pysollib/game.py:1879 msgid "" "\n" "This won't come out...\n" msgstr "" -#: pysollib/game.py:2264 +#: pysollib/game.py:2298 msgid "Set bookmark" msgstr "" -#: pysollib/game.py:2265 +#: pysollib/game.py:2299 msgid "Replace existing bookmark %d ?" msgstr "" -#: pysollib/game.py:2287 +#: pysollib/game.py:2321 msgid "Goto bookmark" msgstr "" -#: pysollib/game.py:2288 +#: pysollib/game.py:2322 msgid "Goto bookmark %d ?" msgstr "" -#: pysollib/game.py:2319 +#: pysollib/game.py:2353 msgid "Open game" msgstr "" -#: pysollib/game.py:2330 pysollib/game.py:2339 pysollib/game.py:2344 +#: pysollib/game.py:2364 pysollib/game.py:2373 pysollib/game.py:2378 msgid "Load game error" msgstr "" -#: pysollib/game.py:2331 +#: pysollib/game.py:2365 msgid "" "Error while loading game.\n" "\n" @@ -443,22 +458,22 @@ msgid "" "but this could also be a bug you might want to report." msgstr "" -#: pysollib/game.py:2340 +#: pysollib/game.py:2374 msgid "Error while loading game" msgstr "" -#: pysollib/game.py:2345 +#: pysollib/game.py:2379 msgid "" "Internal error while loading game.\n" "\n" "Please report this bug." msgstr "" -#: pysollib/game.py:2370 +#: pysollib/game.py:2404 msgid "Save game error" msgstr "" -#: pysollib/game.py:2371 +#: pysollib/game.py:2405 msgid "Error while saving game" msgstr "" @@ -699,12 +714,12 @@ msgid "" msgstr "" #: pysollib/games/canfield.py:528 pysollib/games/special/tarock.py:224 -#: pysollib/stack.py:1304 pysollib/util.py:81 +#: pysollib/stack.py:1326 pysollib/util.py:80 msgid "King" msgstr "" #: pysollib/games/canfield.py:531 pysollib/games/special/tarock.py:224 -#: pysollib/stack.py:1303 pysollib/util.py:81 +#: pysollib/stack.py:1325 pysollib/util.py:80 msgid "Queen" msgstr "" @@ -721,11 +736,11 @@ msgid "X" msgstr "" #: pysollib/games/golf.py:114 pysollib/games/golf.py:300 -#: pysollib/stack.py:1915 +#: pysollib/stack.py:1980 msgid "Tableau. No building." msgstr "" -#: pysollib/games/golf.py:385 pysollib/stack.py:1848 +#: pysollib/games/golf.py:385 pysollib/stack.py:1913 msgid "Foundation. Build up regardless of suit." msgstr "" @@ -733,11 +748,11 @@ msgstr "" msgid "Balance $%d" msgstr "" -#: pysollib/games/klondike.py:419 +#: pysollib/games/klondike.py:439 msgid "Reserve. Only Kings are acceptable." msgstr "" -#: pysollib/games/larasgame.py:163 pysollib/stack.py:1525 +#: pysollib/games/larasgame.py:163 pysollib/stack.py:1542 msgid "Round %d" msgstr "" @@ -840,7 +855,7 @@ msgstr "" #: pysollib/games/special/tarock.py:223 #: pysollib/games/ultra/dashavatara.py:351 #: pysollib/games/ultra/hexadeck.py:273 pysollib/games/ultra/mughal.py:254 -#: pysollib/stack.py:1305 pysollib/util.py:80 +#: pysollib/stack.py:1327 pysollib/util.py:79 msgid "Ace" msgstr "" @@ -860,7 +875,7 @@ msgstr "" msgid "\tThis game: " msgstr "" -#: pysollib/games/tournament.py:245 +#: pysollib/games/tournament.py:226 msgid "Reserve. Build down by suit." msgstr "" @@ -1111,15 +1126,21 @@ msgid "Tan" msgstr "" #: pysollib/games/yukon.py:139 -msgid "Tableau. Build down in any suit but the same, can move any face-up cards regardless of sequence." +msgid "" +"Tableau. Build down in any suit but the same, can move any face-up cards " +"regardless of sequence." msgstr "" #: pysollib/games/yukon.py:198 -msgid "Tableau. Build up or down by suit, can move any face-up cards regardless of sequence." +msgid "" +"Tableau. Build up or down by suit, can move any face-up cards regardless of " +"sequence." msgstr "" #: pysollib/games/yukon.py:215 -msgid "Tableau. Build up or down by alternate color, can move any face-up cards regardless of sequence." +msgid "" +"Tableau. Build up or down by alternate color, can move any face-up cards " +"regardless of sequence." msgstr "" #: pysollib/games/yukon.py:317 @@ -1131,42 +1152,42 @@ msgid "" msgstr "" #: pysollib/games/yukon.py:639 -msgid "Tableau. Build down regardless of suit, can move any face-up cards regardless of sequence." +msgid "" +"Tableau. Build down regardless of suit, can move any face-up cards " +"regardless of sequence." msgstr "" -#: pysollib/help.py:64 -msgid "" -"A Python Solitaire Game Collection\n" +#: pysollib/help.py:63 +msgid "A Python Solitaire Game Collection\n" +msgstr "" + +#: pysollib/help.py:65 +msgid "A World Domination Project\n" msgstr "" #: pysollib/help.py:66 -msgid "" -"A World Domination Project\n" -msgstr "" - -#: pysollib/help.py:67 msgid "&Credits..." msgstr "" -#: pysollib/help.py:67 +#: pysollib/help.py:66 msgid "&Nice" msgstr "" -#: pysollib/help.py:69 +#: pysollib/help.py:68 msgid "&Enjoy" msgstr "" -#: pysollib/help.py:71 +#: pysollib/help.py:70 msgid "" "Version %s\n" "\n" msgstr "" -#: pysollib/help.py:72 +#: pysollib/help.py:71 msgid "About " msgstr "" -#: pysollib/help.py:73 +#: pysollib/help.py:72 msgid "" "PySol Fan Club edition\n" "%s%s\n" @@ -1183,11 +1204,11 @@ msgid "" "%s" msgstr "" -#: pysollib/help.py:102 +#: pysollib/help.py:101 msgid "Credits" msgstr "" -#: pysollib/help.py:103 +#: pysollib/help.py:102 msgid "" " credits go to:\n" "\n" @@ -1202,24 +1223,23 @@ msgid "" "for making this program possible" msgstr "" -#: pysollib/help.py:138 +#: pysollib/help.py:137 msgid " HTML Problem" msgstr "" -#: pysollib/help.py:139 -msgid "" -"Cannot find help document\n" +#: pysollib/help.py:138 +msgid "Cannot find help document\n" msgstr "" -#: pysollib/help.py:152 +#: pysollib/help.py:151 msgid " Help" msgstr "" -#: pysollib/main.py:68 pysollib/main.py:348 +#: pysollib/main.py:66 pysollib/main.py:348 msgid " installation error" msgstr "" -#: pysollib/main.py:69 +#: pysollib/main.py:67 msgid "" "No %ss were found !!!\n" "\n" @@ -1229,17 +1249,17 @@ msgid "" "Please check your %s installation.\n" msgstr "" -#: pysollib/main.py:76 pysollib/main.py:356 pysollib/tk/menubar.py:276 +#: pysollib/main.py:74 pysollib/main.py:356 pysollib/tk/menubar.py:275 msgid "&Quit" msgstr "" -#: pysollib/main.py:98 +#: pysollib/main.py:96 msgid "" "%s: %s\n" "try %s --help for more information" msgstr "" -#: pysollib/main.py:135 +#: pysollib/main.py:133 msgid "" "Usage: %s [OPTIONS] [FILE]\n" " -g --game=GAMENAME start game GAMENAME\n" @@ -1253,13 +1273,13 @@ msgid "" " FILE - file name of a saved game\n" msgstr "" -#: pysollib/main.py:149 +#: pysollib/main.py:147 msgid "" "%s: too many files\n" "try %s --help for more information" msgstr "" -#: pysollib/main.py:153 +#: pysollib/main.py:151 msgid "" "%s: invalid file name\n" "try %s --help for more information" @@ -1298,469 +1318,486 @@ msgstr "" msgid "Welcome to " msgstr "" -#: pysollib/resource.py:243 +#: pysollib/resource.py:242 msgid "French type (52 cards)" msgstr "" -#: pysollib/resource.py:244 +#: pysollib/resource.py:243 msgid "Hanafuda type (48 cards)" msgstr "" -#: pysollib/resource.py:245 +#: pysollib/resource.py:244 msgid "Tarock type (78 cards)" msgstr "" -#: pysollib/resource.py:246 +#: pysollib/resource.py:245 msgid "Mahjongg type (42 tiles)" msgstr "" -#: pysollib/resource.py:247 +#: pysollib/resource.py:246 msgid "Hex A Deck type (68 cards)" msgstr "" -#: pysollib/resource.py:248 +#: pysollib/resource.py:247 msgid "Mughal Ganjifa type (96 cards)" msgstr "" -#: pysollib/resource.py:249 +#: pysollib/resource.py:248 msgid "Navagraha Ganjifa type (108 cards)" msgstr "" -#: pysollib/resource.py:250 +#: pysollib/resource.py:249 msgid "Dashavatara Ganjifa type (120 cards)" msgstr "" -#: pysollib/resource.py:251 +#: pysollib/resource.py:250 msgid "Trumps only type (variable cards)" msgstr "" -#: pysollib/resource.py:255 +#: pysollib/resource.py:254 msgid "French" msgstr "" -#: pysollib/resource.py:256 pysollib/resource.py:280 +#: pysollib/resource.py:255 pysollib/resource.py:279 msgid "Hanafuda" msgstr "" -#: pysollib/resource.py:257 pysollib/resource.py:296 +#: pysollib/resource.py:256 pysollib/resource.py:295 msgid "Tarock" msgstr "" -#: pysollib/resource.py:258 pysollib/resource.py:283 +#: pysollib/resource.py:257 pysollib/resource.py:282 msgid "Mahjongg" msgstr "" -#: pysollib/resource.py:259 pysollib/resource.py:281 +#: pysollib/resource.py:258 pysollib/resource.py:280 msgid "Hex A Deck" msgstr "" -#: pysollib/resource.py:260 +#: pysollib/resource.py:259 msgid "Mughal Ganjifa" msgstr "" -#: pysollib/resource.py:261 +#: pysollib/resource.py:260 msgid "Navagraha Ganjifa" msgstr "" -#: pysollib/resource.py:262 +#: pysollib/resource.py:261 msgid "Dashavatara Ganjifa" msgstr "" -#: pysollib/resource.py:263 +#: pysollib/resource.py:262 msgid "Trumps only" msgstr "" -#: pysollib/resource.py:268 +#: pysollib/resource.py:267 msgid "Adult" msgstr "" -#: pysollib/resource.py:269 +#: pysollib/resource.py:268 msgid "Animals" msgstr "" -#: pysollib/resource.py:270 +#: pysollib/resource.py:269 msgid "Anime" msgstr "" -#: pysollib/resource.py:271 +#: pysollib/resource.py:270 msgid "Art" msgstr "" -#: pysollib/resource.py:272 +#: pysollib/resource.py:271 msgid "Cartoons" msgstr "" -#: pysollib/resource.py:273 +#: pysollib/resource.py:272 msgid "Children" msgstr "" -#: pysollib/resource.py:274 +#: pysollib/resource.py:273 msgid "Classic look" msgstr "" -#: pysollib/resource.py:275 +#: pysollib/resource.py:274 msgid "Collectors" msgstr "" -#: pysollib/resource.py:276 +#: pysollib/resource.py:275 msgid "Computers" msgstr "" -#: pysollib/resource.py:277 +#: pysollib/resource.py:276 msgid "Engines" msgstr "" -#: pysollib/resource.py:278 +#: pysollib/resource.py:277 msgid "Fantasy" msgstr "" -#: pysollib/resource.py:279 +#: pysollib/resource.py:278 msgid "Ganjifa" msgstr "" -#: pysollib/resource.py:282 +#: pysollib/resource.py:281 msgid "Holiday" msgstr "" -#: pysollib/resource.py:284 +#: pysollib/resource.py:283 msgid "Movies" msgstr "" -#: pysollib/resource.py:285 +#: pysollib/resource.py:284 msgid "Matrix" msgstr "" -#: pysollib/resource.py:286 +#: pysollib/resource.py:285 msgid "Music" msgstr "" -#: pysollib/resource.py:287 +#: pysollib/resource.py:286 msgid "Nature" msgstr "" -#: pysollib/resource.py:288 +#: pysollib/resource.py:287 msgid "Operating Systems" msgstr "" -#: pysollib/resource.py:289 +#: pysollib/resource.py:288 msgid "People" msgstr "" -#: pysollib/resource.py:290 +#: pysollib/resource.py:289 msgid "Places" msgstr "" -#: pysollib/resource.py:291 +#: pysollib/resource.py:290 msgid "Plain" msgstr "" -#: pysollib/resource.py:292 +#: pysollib/resource.py:291 msgid "Products" msgstr "" -#: pysollib/resource.py:293 +#: pysollib/resource.py:292 msgid "Round cardsets" msgstr "" -#: pysollib/resource.py:294 +#: pysollib/resource.py:293 msgid "Science Fiction" msgstr "" -#: pysollib/resource.py:295 +#: pysollib/resource.py:294 msgid "Sports" msgstr "" -#: pysollib/resource.py:297 +#: pysollib/resource.py:296 msgid "Vehicels" msgstr "" -#: pysollib/resource.py:298 +#: pysollib/resource.py:297 msgid "Video Games" msgstr "" -#: pysollib/resource.py:303 +#: pysollib/resource.py:302 msgid "Australia" msgstr "" -#: pysollib/resource.py:304 +#: pysollib/resource.py:303 msgid "Austria" msgstr "" -#: pysollib/resource.py:305 +#: pysollib/resource.py:304 msgid "Belgium" msgstr "" -#: pysollib/resource.py:306 +#: pysollib/resource.py:305 msgid "Canada" msgstr "" -#: pysollib/resource.py:307 +#: pysollib/resource.py:306 msgid "China" msgstr "" -#: pysollib/resource.py:308 +#: pysollib/resource.py:307 msgid "Czech Republic" msgstr "" -#: pysollib/resource.py:309 +#: pysollib/resource.py:308 msgid "Denmark" msgstr "" -#: pysollib/resource.py:310 +#: pysollib/resource.py:309 msgid "England" msgstr "" -#: pysollib/resource.py:311 +#: pysollib/resource.py:310 msgid "France" msgstr "" -#: pysollib/resource.py:312 +#: pysollib/resource.py:311 msgid "Germany" msgstr "" -#: pysollib/resource.py:313 +#: pysollib/resource.py:312 msgid "Great Britain" msgstr "" -#: pysollib/resource.py:314 +#: pysollib/resource.py:313 msgid "Hungary" msgstr "" -#: pysollib/resource.py:315 +#: pysollib/resource.py:314 msgid "India" msgstr "" -#: pysollib/resource.py:316 +#: pysollib/resource.py:315 msgid "Italy" msgstr "" -#: pysollib/resource.py:317 +#: pysollib/resource.py:316 msgid "Japan" msgstr "" -#: pysollib/resource.py:318 +#: pysollib/resource.py:317 msgid "Netherlands" msgstr "" -#: pysollib/resource.py:319 +#: pysollib/resource.py:318 msgid "Russia" msgstr "" -#: pysollib/resource.py:320 +#: pysollib/resource.py:319 msgid "Spain" msgstr "" -#: pysollib/resource.py:321 +#: pysollib/resource.py:320 msgid "Sweden" msgstr "" -#: pysollib/resource.py:322 +#: pysollib/resource.py:321 msgid "Switzerland" msgstr "" -#: pysollib/resource.py:323 +#: pysollib/resource.py:322 msgid "USA" msgstr "" -#: pysollib/settings.py:47 +#: pysollib/settings.py:54 msgid "Top 10" msgstr "" -#: pysollib/stack.py:1299 +#: pysollib/stack.py:1321 msgid "Base card - %s." msgstr "" -#: pysollib/stack.py:1300 +#: pysollib/stack.py:1322 msgid "Empty row cannot be filled." msgstr "" -#: pysollib/stack.py:1301 +#: pysollib/stack.py:1323 msgid "any card" msgstr "" -#: pysollib/stack.py:1302 pysollib/util.py:81 +#: pysollib/stack.py:1324 pysollib/util.py:80 msgid "Jack" msgstr "" -#: pysollib/stack.py:1315 +#: pysollib/stack.py:1337 msgid "No cards" msgstr "" -#: pysollib/stack.py:1316 +#: pysollib/stack.py:1338 msgid "1 card" msgstr "" -#: pysollib/stack.py:1317 +#: pysollib/stack.py:1339 msgid " cards" msgstr "" -#: pysollib/stack.py:1534 pysollib/stack.py:1536 pysollib/stack.py:1567 +#: pysollib/stack.py:1551 pysollib/stack.py:1553 pysollib/stack.py:1589 msgid "Redeal" msgstr "" -#: pysollib/stack.py:1536 +#: pysollib/stack.py:1553 msgid "Stop" msgstr "" -#: pysollib/stack.py:1587 +#: pysollib/stack.py:1613 msgid "Variable redeals." msgstr "" -#: pysollib/stack.py:1588 +#: pysollib/stack.py:1614 msgid "Unlimited redeals." msgstr "" -#: pysollib/stack.py:1589 +#: pysollib/stack.py:1615 msgid "No redeals." msgstr "" -#: pysollib/stack.py:1590 +#: pysollib/stack.py:1616 msgid "One redeal." msgstr "" -#: pysollib/stack.py:1591 +#: pysollib/stack.py:1617 msgid " redeals." msgstr "" -#: pysollib/stack.py:1593 +#: pysollib/stack.py:1619 msgid "Talon." msgstr "" -#: pysollib/stack.py:1779 pysollib/stack.py:2229 +#: pysollib/stack.py:1844 pysollib/stack.py:2294 msgid "Reserve. No building." msgstr "" -#: pysollib/stack.py:1816 +#: pysollib/stack.py:1881 msgid "Foundation." msgstr "" -#: pysollib/stack.py:1832 +#: pysollib/stack.py:1897 msgid "Foundation. Build up by suit." msgstr "" -#: pysollib/stack.py:1833 +#: pysollib/stack.py:1898 msgid "Foundation. Build down by suit." msgstr "" -#: pysollib/stack.py:1834 pysollib/stack.py:1850 pysollib/stack.py:1872 +#: pysollib/stack.py:1899 pysollib/stack.py:1915 pysollib/stack.py:1937 msgid "Foundation. Build by same rank." msgstr "" -#: pysollib/stack.py:1849 +#: pysollib/stack.py:1914 msgid "Foundation. Build down regardless of suit." msgstr "" -#: pysollib/stack.py:1870 +#: pysollib/stack.py:1935 msgid "Foundation. Build up by alternate color." msgstr "" -#: pysollib/stack.py:1871 +#: pysollib/stack.py:1936 msgid "Foundation. Build down by alternate color." msgstr "" -#: pysollib/stack.py:1945 +#: pysollib/stack.py:2010 msgid "Tableau. Build up by alternate color." msgstr "" -#: pysollib/stack.py:1946 +#: pysollib/stack.py:2011 msgid "Tableau. Build down by alternate color." msgstr "" -#: pysollib/stack.py:1947 pysollib/stack.py:1957 pysollib/stack.py:1966 -#: pysollib/stack.py:1975 pysollib/stack.py:1985 pysollib/stack.py:2008 -#: pysollib/stack.py:2018 +#: pysollib/stack.py:2012 pysollib/stack.py:2022 pysollib/stack.py:2031 +#: pysollib/stack.py:2040 pysollib/stack.py:2050 pysollib/stack.py:2073 +#: pysollib/stack.py:2083 msgid "Tableau. Build by same rank." msgstr "" -#: pysollib/stack.py:1955 +#: pysollib/stack.py:2020 msgid "Tableau. Build up by color." msgstr "" -#: pysollib/stack.py:1956 +#: pysollib/stack.py:2021 msgid "Tableau. Build down by color." msgstr "" -#: pysollib/stack.py:1964 +#: pysollib/stack.py:2029 msgid "Tableau. Build up by suit." msgstr "" -#: pysollib/stack.py:1965 +#: pysollib/stack.py:2030 msgid "Tableau. Build down by suit." msgstr "" -#: pysollib/stack.py:1973 +#: pysollib/stack.py:2038 msgid "Tableau. Build up regardless of suit." msgstr "" -#: pysollib/stack.py:1974 +#: pysollib/stack.py:2039 msgid "Tableau. Build down regardless of suit." msgstr "" -#: pysollib/stack.py:1983 +#: pysollib/stack.py:2048 msgid "Tableau. Build up in any suit but the same." msgstr "" -#: pysollib/stack.py:1984 +#: pysollib/stack.py:2049 msgid "Tableau. Build down in any suit but the same." msgstr "" -#: pysollib/stack.py:2006 -msgid "Tableau. Build up regardless of suit. Sequences of cards in alternate color can be moved as a unit." +#: pysollib/stack.py:2071 +msgid "" +"Tableau. Build up regardless of suit. Sequences of cards in alternate color " +"can be moved as a unit." msgstr "" -#: pysollib/stack.py:2007 -msgid "Tableau. Build down regardless of suit. Sequences of cards in alternate color can be moved as a unit." +#: pysollib/stack.py:2072 +msgid "" +"Tableau. Build down regardless of suit. Sequences of cards in alternate " +"color can be moved as a unit." msgstr "" -#: pysollib/stack.py:2016 -msgid "Tableau. Build up regardless of suit. Sequences of cards in the same suit can be moved as a unit." +#: pysollib/stack.py:2081 +msgid "" +"Tableau. Build up regardless of suit. Sequences of cards in the same suit " +"can be moved as a unit." msgstr "" -#: pysollib/stack.py:2017 -msgid "Tableau. Build down regardless of suit. Sequences of cards in the same suit can be moved as a unit." +#: pysollib/stack.py:2082 +msgid "" +"Tableau. Build down regardless of suit. Sequences of cards in the same suit " +"can be moved as a unit." msgstr "" -#: pysollib/stack.py:2039 -msgid "Tableau. Build up by alternate color, can move any face-up cards regardless of sequence." +#: pysollib/stack.py:2104 +msgid "" +"Tableau. Build up by alternate color, can move any face-up cards regardless " +"of sequence." msgstr "" -#: pysollib/stack.py:2040 -msgid "Tableau. Build down by alternate color, can move any face-up cards regardless of sequence." +#: pysollib/stack.py:2105 +msgid "" +"Tableau. Build down by alternate color, can move any face-up cards " +"regardless of sequence." msgstr "" -#: pysollib/stack.py:2041 pysollib/stack.py:2054 -msgid "Tableau. Build by same rank, can move any face-up cards regardless of sequence." +#: pysollib/stack.py:2106 pysollib/stack.py:2119 +msgid "" +"Tableau. Build by same rank, can move any face-up cards regardless of " +"sequence." msgstr "" -#: pysollib/stack.py:2052 -msgid "Tableau. Build up by suit, can move any face-up cards regardless of sequence." +#: pysollib/stack.py:2117 +msgid "" +"Tableau. Build up by suit, can move any face-up cards regardless of sequence." msgstr "" -#: pysollib/stack.py:2053 -msgid "Tableau. Build down by suit, can move any face-up cards regardless of sequence." +#: pysollib/stack.py:2118 +msgid "" +"Tableau. Build down by suit, can move any face-up cards regardless of " +"sequence." msgstr "" -#: pysollib/stack.py:2086 +#: pysollib/stack.py:2151 msgid "Tableau. Build up or down by color." msgstr "" -#: pysollib/stack.py:2097 +#: pysollib/stack.py:2162 msgid "Tableau. Build up or down by alternate color." msgstr "" -#: pysollib/stack.py:2108 +#: pysollib/stack.py:2173 msgid "Tableau. Build up or down by suit." msgstr "" -#: pysollib/stack.py:2119 +#: pysollib/stack.py:2184 msgid "Tableau. Build up or down regardless of suit." msgstr "" -#: pysollib/stack.py:2130 +#: pysollib/stack.py:2195 msgid "Waste." msgstr "" -#: pysollib/stack.py:2230 +#: pysollib/stack.py:2295 msgid "Free cell." msgstr "" @@ -1780,7 +1817,7 @@ msgstr "" msgid "Lost" msgstr "" -#: pysollib/stats.py:122 pysollib/tk/statusbar.py:157 +#: pysollib/stats.py:122 pysollib/tk/statusbar.py:156 msgid "Playing time" msgstr "" @@ -1804,7 +1841,7 @@ msgstr "" msgid "Status" msgstr "" -#: pysollib/stats.py:162 pysollib/tk/statusbar.py:159 +#: pysollib/stats.py:162 pysollib/tk/statusbar.py:158 #: pysollib/tk/tkstats.py:735 msgid "Game number" msgstr "" @@ -1833,48 +1870,48 @@ msgstr "" msgid "Perfect" msgstr "" -#: pysollib/tk/colorsdialog.py:73 +#: pysollib/tk/colorsdialog.py:71 msgid "Text foreground:" msgstr "" -#: pysollib/tk/colorsdialog.py:79 pysollib/tk/colorsdialog.py:98 +#: pysollib/tk/colorsdialog.py:76 pysollib/tk/colorsdialog.py:94 #: pysollib/tk/fontsdialog.py:186 msgid "Change..." msgstr "" -#: pysollib/tk/colorsdialog.py:85 pysollib/tk/timeoutsdialog.py:68 +#: pysollib/tk/colorsdialog.py:81 pysollib/tk/timeoutsdialog.py:68 msgid "Highlight piles:" msgstr "" -#: pysollib/tk/colorsdialog.py:86 +#: pysollib/tk/colorsdialog.py:82 msgid "Highlight cards 1:" msgstr "" -#: pysollib/tk/colorsdialog.py:87 +#: pysollib/tk/colorsdialog.py:83 msgid "Highlight cards 2:" msgstr "" -#: pysollib/tk/colorsdialog.py:88 +#: pysollib/tk/colorsdialog.py:84 msgid "Highlight same rank 1:" msgstr "" -#: pysollib/tk/colorsdialog.py:89 +#: pysollib/tk/colorsdialog.py:85 msgid "Highlight same rank 2:" msgstr "" -#: pysollib/tk/colorsdialog.py:90 +#: pysollib/tk/colorsdialog.py:86 msgid "Hint arrow:" msgstr "" -#: pysollib/tk/colorsdialog.py:91 +#: pysollib/tk/colorsdialog.py:87 msgid "Highlight not matching:" msgstr "" -#: pysollib/tk/colorsdialog.py:124 +#: pysollib/tk/colorsdialog.py:114 msgid "Select color" msgstr "" -#: pysollib/tk/findcarddialog.py:52 pysollib/tk/menubar.py:329 +#: pysollib/tk/findcarddialog.py:52 pysollib/tk/menubar.py:328 msgid "Find card" msgstr "" @@ -1922,491 +1959,487 @@ msgstr "" msgid "Select font" msgstr "" -#: pysollib/tk/menubar.py:75 +#: pysollib/tk/menubar.py:74 msgid "Style" msgstr "" -#: pysollib/tk/menubar.py:84 +#: pysollib/tk/menubar.py:83 msgid "Relief" msgstr "" -#: pysollib/tk/menubar.py:85 +#: pysollib/tk/menubar.py:84 msgid "Flat" msgstr "" -#: pysollib/tk/menubar.py:89 +#: pysollib/tk/menubar.py:88 msgid "Raised" msgstr "" -#: pysollib/tk/menubar.py:94 +#: pysollib/tk/menubar.py:93 msgid "Compound" msgstr "" -#: pysollib/tk/menubar.py:100 +#: pysollib/tk/menubar.py:99 msgid "Hide" msgstr "" -#: pysollib/tk/menubar.py:103 +#: pysollib/tk/menubar.py:102 msgid "Top" msgstr "" -#: pysollib/tk/menubar.py:106 +#: pysollib/tk/menubar.py:105 msgid "Bottom" msgstr "" -#: pysollib/tk/menubar.py:109 +#: pysollib/tk/menubar.py:108 msgid "Left" msgstr "" -#: pysollib/tk/menubar.py:112 +#: pysollib/tk/menubar.py:111 msgid "Right" msgstr "" -#: pysollib/tk/menubar.py:116 +#: pysollib/tk/menubar.py:115 msgid "Small icons" msgstr "" -#: pysollib/tk/menubar.py:119 +#: pysollib/tk/menubar.py:118 msgid "Large icons" msgstr "" -#: pysollib/tk/menubar.py:125 +#: pysollib/tk/menubar.py:124 msgid "Customize toolbar" msgstr "" -#: pysollib/tk/menubar.py:256 +#: pysollib/tk/menubar.py:255 msgid "&File" msgstr "" -#: pysollib/tk/menubar.py:258 +#: pysollib/tk/menubar.py:257 msgid "R&ecent games" msgstr "" -#: pysollib/tk/menubar.py:260 +#: pysollib/tk/menubar.py:259 msgid "Select &random game" msgstr "" -#: pysollib/tk/menubar.py:261 +#: pysollib/tk/menubar.py:260 msgid "&All games" msgstr "" -#: pysollib/tk/menubar.py:262 +#: pysollib/tk/menubar.py:261 msgid "Games played and &won" msgstr "" -#: pysollib/tk/menubar.py:263 +#: pysollib/tk/menubar.py:262 msgid "Games played and ¬ won" msgstr "" -#: pysollib/tk/menubar.py:264 +#: pysollib/tk/menubar.py:263 msgid "Games not &played" msgstr "" -#: pysollib/tk/menubar.py:265 +#: pysollib/tk/menubar.py:264 msgid "Select game by nu&mber..." msgstr "" -#: pysollib/tk/menubar.py:267 +#: pysollib/tk/menubar.py:266 msgid "Fa&vorite games" msgstr "" -#: pysollib/tk/menubar.py:268 +#: pysollib/tk/menubar.py:267 msgid "A&dd to favorites" msgstr "" -#: pysollib/tk/menubar.py:269 +#: pysollib/tk/menubar.py:268 msgid "R&emove from favorites" msgstr "" -#: pysollib/tk/menubar.py:271 +#: pysollib/tk/menubar.py:270 msgid "&Open..." msgstr "" -#: pysollib/tk/menubar.py:272 +#: pysollib/tk/menubar.py:271 msgid "&Save" msgstr "" -#: pysollib/tk/menubar.py:273 +#: pysollib/tk/menubar.py:272 msgid "Save &as..." msgstr "" -#: pysollib/tk/menubar.py:275 +#: pysollib/tk/menubar.py:274 msgid "&Hold and quit" msgstr "" -#: pysollib/tk/menubar.py:280 pysollib/tk/selectgame.py:407 +#: pysollib/tk/menubar.py:279 pysollib/tk/selectgame.py:407 msgid "&Select" msgstr "" -#: pysollib/tk/menubar.py:285 +#: pysollib/tk/menubar.py:284 msgid "&Edit" msgstr "" -#: pysollib/tk/menubar.py:286 +#: pysollib/tk/menubar.py:285 msgid "&Undo" msgstr "" -#: pysollib/tk/menubar.py:287 +#: pysollib/tk/menubar.py:286 msgid "&Redo" msgstr "" -#: pysollib/tk/menubar.py:288 +#: pysollib/tk/menubar.py:287 msgid "Redo &all" msgstr "" -#: pysollib/tk/menubar.py:291 +#: pysollib/tk/menubar.py:290 msgid "&Set bookmark" msgstr "" -#: pysollib/tk/menubar.py:293 pysollib/tk/menubar.py:297 +#: pysollib/tk/menubar.py:292 pysollib/tk/menubar.py:296 msgid "Bookmark %d" msgstr "" -#: pysollib/tk/menubar.py:295 +#: pysollib/tk/menubar.py:294 msgid "Go&to bookmark" msgstr "" -#: pysollib/tk/menubar.py:300 +#: pysollib/tk/menubar.py:299 msgid "&Clear bookmarks" msgstr "" -#: pysollib/tk/menubar.py:303 -msgid "Restart &game" +#: pysollib/tk/menubar.py:302 pysollib/tk/toolbar.py:198 +msgid "Restart" msgstr "" -#: pysollib/tk/menubar.py:305 +#: pysollib/tk/menubar.py:304 msgid "&Game" msgstr "" -#: pysollib/tk/menubar.py:306 +#: pysollib/tk/menubar.py:305 msgid "&Deal cards" msgstr "" -#: pysollib/tk/menubar.py:307 +#: pysollib/tk/menubar.py:306 msgid "&Auto drop" msgstr "" -#: pysollib/tk/menubar.py:308 +#: pysollib/tk/menubar.py:307 msgid "&Pause" msgstr "" -#: pysollib/tk/menubar.py:311 +#: pysollib/tk/menubar.py:310 msgid "S&tatus..." msgstr "" -#: pysollib/tk/menubar.py:312 +#: pysollib/tk/menubar.py:311 msgid "&Comments..." msgstr "" -#: pysollib/tk/menubar.py:314 +#: pysollib/tk/menubar.py:313 msgid "&Statistics" msgstr "" -#: pysollib/tk/menubar.py:315 pysollib/tk/menubar.py:323 +#: pysollib/tk/menubar.py:314 pysollib/tk/menubar.py:322 msgid "Current game..." msgstr "" -#: pysollib/tk/menubar.py:316 pysollib/tk/menubar.py:324 +#: pysollib/tk/menubar.py:315 pysollib/tk/menubar.py:323 msgid "All games..." msgstr "" -#: pysollib/tk/menubar.py:318 +#: pysollib/tk/menubar.py:317 msgid "Session log..." msgstr "" -#: pysollib/tk/menubar.py:319 +#: pysollib/tk/menubar.py:318 msgid "Full log..." msgstr "" -#: pysollib/tk/menubar.py:322 +#: pysollib/tk/menubar.py:321 msgid "D&emo statistics" msgstr "" -#: pysollib/tk/menubar.py:326 +#: pysollib/tk/menubar.py:325 msgid "&Assist" msgstr "" -#: pysollib/tk/menubar.py:327 +#: pysollib/tk/menubar.py:326 msgid "&Hint" msgstr "" -#: pysollib/tk/menubar.py:328 +#: pysollib/tk/menubar.py:327 msgid "Highlight p&iles" msgstr "" -#: pysollib/tk/menubar.py:331 +#: pysollib/tk/menubar.py:330 msgid "&Demo" msgstr "" -#: pysollib/tk/menubar.py:332 +#: pysollib/tk/menubar.py:331 msgid "Demo (&all games)" msgstr "" -#: pysollib/tk/menubar.py:334 +#: pysollib/tk/menubar.py:333 msgid "Piles description" msgstr "" -#: pysollib/tk/menubar.py:338 +#: pysollib/tk/menubar.py:337 msgid "&Options" msgstr "" -#: pysollib/tk/menubar.py:339 +#: pysollib/tk/menubar.py:338 msgid "&Player options..." msgstr "" -#: pysollib/tk/menubar.py:340 +#: pysollib/tk/menubar.py:339 msgid "&Automatic play" msgstr "" -#: pysollib/tk/menubar.py:341 +#: pysollib/tk/menubar.py:340 msgid "Auto &face up" msgstr "" -#: pysollib/tk/menubar.py:342 +#: pysollib/tk/menubar.py:341 msgid "A&uto drop" msgstr "" -#: pysollib/tk/menubar.py:343 +#: pysollib/tk/menubar.py:342 msgid "Auto &deal" msgstr "" -#: pysollib/tk/menubar.py:345 +#: pysollib/tk/menubar.py:344 msgid "&Quick play" msgstr "" -#: pysollib/tk/menubar.py:346 +#: pysollib/tk/menubar.py:345 msgid "Assist &level" msgstr "" -#: pysollib/tk/menubar.py:347 +#: pysollib/tk/menubar.py:346 msgid "Enable &undo" msgstr "" -#: pysollib/tk/menubar.py:348 +#: pysollib/tk/menubar.py:347 msgid "Enable &bookmarks" msgstr "" -#: pysollib/tk/menubar.py:349 +#: pysollib/tk/menubar.py:348 msgid "Enable &hint" msgstr "" -#: pysollib/tk/menubar.py:350 +#: pysollib/tk/menubar.py:349 msgid "Enable highlight p&iles" msgstr "" -#: pysollib/tk/menubar.py:351 +#: pysollib/tk/menubar.py:350 msgid "Enable highlight &cards" msgstr "" -#: pysollib/tk/menubar.py:352 +#: pysollib/tk/menubar.py:351 msgid "Enable highlight same &rank" msgstr "" -#: pysollib/tk/menubar.py:353 +#: pysollib/tk/menubar.py:352 msgid "Highlight &no matching" msgstr "" -#: pysollib/tk/menubar.py:355 +#: pysollib/tk/menubar.py:354 msgid "&Show removed tiles (in Mahjongg games)" msgstr "" -#: pysollib/tk/menubar.py:356 +#: pysollib/tk/menubar.py:355 msgid "Show hint &arrow (in Shisen-Sho games)" msgstr "" -#: pysollib/tk/menubar.py:358 +#: pysollib/tk/menubar.py:357 msgid "&Sound..." msgstr "" -#: pysollib/tk/menubar.py:366 +#: pysollib/tk/menubar.py:365 msgid "Cards&et..." msgstr "" -#: pysollib/tk/menubar.py:367 +#: pysollib/tk/menubar.py:366 msgid "Table t&ile..." msgstr "" -#: pysollib/tk/menubar.py:369 +#: pysollib/tk/menubar.py:368 msgid "Card &background" msgstr "" -#: pysollib/tk/menubar.py:370 +#: pysollib/tk/menubar.py:369 msgid "Card &view" msgstr "" -#: pysollib/tk/menubar.py:371 +#: pysollib/tk/menubar.py:370 msgid "Card shado&w" msgstr "" -#: pysollib/tk/menubar.py:372 +#: pysollib/tk/menubar.py:371 msgid "Shade &legal moves" msgstr "" -#: pysollib/tk/menubar.py:373 +#: pysollib/tk/menubar.py:372 msgid "&Negative cards bottom" msgstr "" -#: pysollib/tk/menubar.py:374 +#: pysollib/tk/menubar.py:373 msgid "Shrink face-down cards" msgstr "" -#: pysollib/tk/menubar.py:375 +#: pysollib/tk/menubar.py:374 msgid "Shade &filled stacks" msgstr "" -#: pysollib/tk/menubar.py:376 +#: pysollib/tk/menubar.py:375 msgid "A&nimations" msgstr "" -#: pysollib/tk/menubar.py:377 +#: pysollib/tk/menubar.py:376 msgid "&None" msgstr "" -#: pysollib/tk/menubar.py:378 +#: pysollib/tk/menubar.py:377 msgid "&Timer based" msgstr "" -#: pysollib/tk/menubar.py:379 +#: pysollib/tk/menubar.py:378 msgid "&Fast" msgstr "" -#: pysollib/tk/menubar.py:380 +#: pysollib/tk/menubar.py:379 msgid "&Slow" msgstr "" -#: pysollib/tk/menubar.py:381 +#: pysollib/tk/menubar.py:380 msgid "&Very slow" msgstr "" -#: pysollib/tk/menubar.py:382 +#: pysollib/tk/menubar.py:381 msgid "Stick&y mouse" msgstr "" -#: pysollib/tk/menubar.py:383 +#: pysollib/tk/menubar.py:382 msgid "Use mouse for undo/redo" msgstr "" -#: pysollib/tk/menubar.py:385 +#: pysollib/tk/menubar.py:384 msgid "&Fonts..." msgstr "" -#: pysollib/tk/menubar.py:386 +#: pysollib/tk/menubar.py:385 msgid "&Colors..." msgstr "" -#: pysollib/tk/menubar.py:387 +#: pysollib/tk/menubar.py:386 msgid "Time&outs..." msgstr "" -#: pysollib/tk/menubar.py:389 +#: pysollib/tk/menubar.py:388 msgid "&Toolbar" msgstr "" -#: pysollib/tk/menubar.py:391 +#: pysollib/tk/menubar.py:390 msgid "Stat&usbar" msgstr "" -#: pysollib/tk/menubar.py:392 +#: pysollib/tk/menubar.py:391 msgid "Show &statusbar" msgstr "" -#: pysollib/tk/menubar.py:393 +#: pysollib/tk/menubar.py:392 msgid "Show &number of cards" msgstr "" -#: pysollib/tk/menubar.py:394 +#: pysollib/tk/menubar.py:393 msgid "Show &help bar" msgstr "" -#: pysollib/tk/menubar.py:395 +#: pysollib/tk/menubar.py:394 msgid "Save games &geometry" msgstr "" -#: pysollib/tk/menubar.py:396 +#: pysollib/tk/menubar.py:395 msgid "&Demo logo" msgstr "" -#: pysollib/tk/menubar.py:397 +#: pysollib/tk/menubar.py:396 msgid "Startup splash sc&reen" msgstr "" -#: pysollib/tk/menubar.py:403 +#: pysollib/tk/menubar.py:402 msgid "&Help" msgstr "" -#: pysollib/tk/menubar.py:404 +#: pysollib/tk/menubar.py:403 msgid "&Contents" msgstr "" -#: pysollib/tk/menubar.py:405 +#: pysollib/tk/menubar.py:404 msgid "&How to play" msgstr "" -#: pysollib/tk/menubar.py:406 +#: pysollib/tk/menubar.py:405 msgid "&Rules for this game" msgstr "" -#: pysollib/tk/menubar.py:407 +#: pysollib/tk/menubar.py:406 msgid "&License terms" msgstr "" -#: pysollib/tk/menubar.py:410 +#: pysollib/tk/menubar.py:409 msgid "&About " msgstr "" -#: pysollib/tk/menubar.py:522 +#: pysollib/tk/menubar.py:521 msgid "All &games..." msgstr "" -#: pysollib/tk/menubar.py:524 +#: pysollib/tk/menubar.py:523 msgid "Playable pre&view..." msgstr "" -#: pysollib/tk/menubar.py:573 +#: pysollib/tk/menubar.py:572 msgid "&Mahjongg games" msgstr "" -#: pysollib/tk/menubar.py:611 +#: pysollib/tk/menubar.py:610 msgid "&Popular games" msgstr "" -#: pysollib/tk/menubar.py:619 +#: pysollib/tk/menubar.py:618 msgid "&French games" msgstr "" -#: pysollib/tk/menubar.py:626 +#: pysollib/tk/menubar.py:625 msgid "&Oriental games" msgstr "" -#: pysollib/tk/menubar.py:634 +#: pysollib/tk/menubar.py:633 msgid "&Special games" msgstr "" -#: pysollib/tk/menubar.py:640 -msgid "All games by name" +#: pysollib/tk/menubar.py:639 +msgid "&All games by name" msgstr "" -#: pysollib/tk/menubar.py:894 pysollib/tk/menubar.py:896 +#: pysollib/tk/menubar.py:1000 pysollib/tk/menubar.py:1002 #: pysollib/tk/selectcardset.py:240 msgid "&Load" msgstr "" -#: pysollib/tk/menubar.py:896 +#: pysollib/tk/menubar.py:1002 msgid "&Info..." msgstr "" -#: pysollib/tk/menubar.py:899 +#: pysollib/tk/menubar.py:1005 msgid "Select " msgstr "" -#: pysollib/tk/menubar.py:960 +#: pysollib/tk/menubar.py:1066 msgid "Select table background" msgstr "" -#: pysollib/tk/menubar.py:972 pysollib/tk/selecttile.py:177 -msgid "Select table color" -msgstr "" - #: pysollib/tk/playeroptionsdialog.py:112 msgid "" "\n" @@ -2788,6 +2821,10 @@ msgstr "" msgid "&Solid color..." msgstr "" +#: pysollib/tk/selecttile.py:177 +msgid "Select table color" +msgstr "" + #: pysollib/tk/soundoptionsdialog.py:75 msgid "Are You Sure" msgstr "" @@ -2894,11 +2931,11 @@ msgid "" "the next time you restart " msgstr "" -#: pysollib/tk/statusbar.py:158 +#: pysollib/tk/statusbar.py:157 msgid "Moves/Total moves" msgstr "" -#: pysollib/tk/statusbar.py:160 +#: pysollib/tk/statusbar.py:159 msgid "Games played: won/lost" msgstr "" @@ -2922,35 +2959,35 @@ msgstr "" msgid "Highlight same rank:" msgstr "" -#: pysollib/tk/tkconst.py:104 +#: pysollib/tk/tkconst.py:101 msgid "Icons only" msgstr "" -#: pysollib/tk/tkconst.py:105 +#: pysollib/tk/tkconst.py:102 msgid "Text below icons" msgstr "" -#: pysollib/tk/tkconst.py:106 +#: pysollib/tk/tkconst.py:103 msgid "Text beside icons" msgstr "" -#: pysollib/tk/tkconst.py:107 +#: pysollib/tk/tkconst.py:104 msgid "Text only" msgstr "" -#: pysollib/tk/tkhtml.py:251 +#: pysollib/tk/tkhtml.py:252 msgid "Index" msgstr "" -#: pysollib/tk/tkhtml.py:255 +#: pysollib/tk/tkhtml.py:256 msgid "Back" msgstr "" -#: pysollib/tk/tkhtml.py:259 +#: pysollib/tk/tkhtml.py:260 msgid "Forward" msgstr "" -#: pysollib/tk/tkhtml.py:263 +#: pysollib/tk/tkhtml.py:264 msgid "Close" msgstr "" @@ -2965,8 +3002,7 @@ msgid "" msgstr "" #: pysollib/tk/tkhtml.py:410 pysollib/tk/tkhtml.py:414 -msgid "" -"Unable to service request:\n" +msgid "Unable to service request:\n" msgstr "" #: pysollib/tk/tkstats.py:95 @@ -3007,8 +3043,7 @@ msgid "No entries for player " msgstr "" #: pysollib/tk/tkstats.py:642 -msgid "" -"No log entries for %s\n" +msgid "No log entries for %s\n" msgstr "" #: pysollib/tk/tkstats.py:647 @@ -3016,8 +3051,7 @@ msgid "Session &log..." msgstr "" #: pysollib/tk/tkstats.py:658 -msgid "" -"No current session log entries for %s\n" +msgid "No current session log entries for %s\n" msgstr "" #: pysollib/tk/tkstats.py:663 @@ -3136,10 +3170,6 @@ msgstr "" msgid "New" msgstr "" -#: pysollib/tk/toolbar.py:198 -msgid "Restart" -msgstr "" - #: pysollib/tk/toolbar.py:198 msgid "" "Restart the\n" @@ -3216,31 +3246,58 @@ msgstr "" msgid "Toolbar" msgstr "" -#: pysollib/util.py:76 +#: pysollib/util.py:75 msgid "Club" msgstr "" -#: pysollib/util.py:76 +#: pysollib/util.py:75 msgid "Diamond" msgstr "" -#: pysollib/util.py:76 +#: pysollib/util.py:75 msgid "Heart" msgstr "" -#: pysollib/util.py:76 +#: pysollib/util.py:75 msgid "Spade" msgstr "" -#: pysollib/util.py:77 +#: pysollib/util.py:76 msgid "black" msgstr "" -#: pysollib/util.py:77 +#: pysollib/util.py:76 msgid "red" msgstr "" -#: pysollib/util.py:102 +#: pysollib/util.py:101 msgid "cardset" msgstr "" +#: data/glade-translations:7 +msgid "Game Statistics" +msgstr "" + +#: data/glade-translations:8 data/glade-translations:28 +msgid "Game:" +msgstr "" + +#: data/glade-translations:17 +msgid "Current game" +msgstr "" + +#: data/glade-translations:24 +msgid "Summary" +msgstr "" + +#: data/glade-translations:27 +msgid "Total moves" +msgstr "" + +#: data/glade-translations:30 +msgid "All games" +msgstr "" + +#: data/glade-translations:57 +msgid "Set font" +msgstr "" diff --git a/po/ru_games.po b/po/ru_games.po index 6832b0a2..47e9b83c 100644 --- a/po/ru_games.po +++ b/po/ru_games.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: PySol 0.0.1\n" -"POT-Creation-Date: Fri Aug 11 02:15:03 2006\n" +"POT-Creation-Date: Tue Aug 22 21:32:47 2006\n" "PO-Revision-Date: 2006-08-17 20:14+0400\n" "Last-Translator: Скоморох \n" "Language-Team: Russian \n" @@ -47,6 +47,10 @@ msgstr "8 x 8" msgid "Abacus" msgstr "Абак" +#, fuzzy +msgid "Accordion" +msgstr "Скорпион" + #, fuzzy msgid "Aces High" msgstr "Тузы вверх" @@ -123,6 +127,9 @@ msgstr "Anno Domini" msgid "Another Round" msgstr "Другой Раунд" +msgid "Apophis" +msgstr "" + msgid "Appachan's Waterfall" msgstr "Апачианский водопад" @@ -206,6 +213,10 @@ msgstr "Баланс" msgid "Balarama" msgstr "" +#, fuzzy +msgid "Baroness" +msgstr "Основа" + msgid "Bastille Day" msgstr "День Бастилии" @@ -469,6 +480,10 @@ msgstr "Горный Замок" msgid "Castle of Indolence" msgstr "Замок праздности" +#, fuzzy +msgid "Castles End" +msgstr "Замок" + msgid "Castles in Spain" msgstr "Воздушные замки" @@ -502,6 +517,9 @@ msgstr "Клетчатый" msgid "Chelicera" msgstr "Хелицера" +msgid "Cheops" +msgstr "" + msgid "Chequers" msgstr "Шахматный порядок" @@ -578,6 +596,10 @@ msgstr "Виток" msgid "Corkscrew" msgstr "Штопор" +#, fuzzy +msgid "Corner Card" +msgstr "Углы" + msgid "Corner Suite" msgstr "Угловые масти" @@ -813,6 +835,10 @@ msgstr "Двойная и расчёт" msgid "Doublets" msgstr "Дубликаты" +#, fuzzy +msgid "Doublets II" +msgstr "Дубликаты" + msgid "Dover" msgstr "Довер" @@ -882,6 +908,10 @@ msgstr "Восемь квадратов" msgid "Eight Times Eight" msgstr "Восемь раз по восемь" +#, fuzzy +msgid "Eight by Eight" +msgstr "Восемь раз по восемь" + msgid "Elba" msgstr "Ельба" @@ -1001,6 +1031,10 @@ msgstr "Маджонг Fish face" msgid "Five Aces" msgstr "Пять тузов" +#, fuzzy +msgid "Five Piles" +msgstr "Пять тузов" + msgid "Five Pyramids" msgstr "Пять пирамид" @@ -1359,6 +1393,10 @@ msgstr "Дурацкое удовольствие" msgid "Idle Aces" msgstr "Свободные тузы" +#, fuzzy +msgid "Idle Year" +msgstr "Свободные тузы" + msgid "IloveU" msgstr "IloveU" @@ -1598,6 +1636,10 @@ msgstr "La Parisienne" msgid "Labyrinth" msgstr "Лабиринт" +#, fuzzy +msgid "Ladies Battle" +msgstr "Последняя битва" + msgid "Lady Betty" msgstr "Леди Бетти" @@ -2324,6 +2366,9 @@ msgstr "Орнамент Мерлина" msgid "Mesh" msgstr "Западня" +msgid "Methuselah" +msgstr "" + msgid "Midnight Oil" msgstr "" @@ -2658,6 +2703,10 @@ msgstr "Настойчивость" msgid "Phantom Blockade" msgstr "Призрачная блокада" +#, fuzzy +msgid "Pharaohs" +msgstr "Патриархи" + msgid "Phoenix" msgstr "Феникс" @@ -2994,6 +3043,9 @@ msgstr "Сенат" msgid "Senate +" msgstr "Сенат +" +msgid "Senior Wrangler" +msgstr "" + msgid "Serpent" msgstr "Змея" @@ -3274,6 +3326,10 @@ msgstr "Улицы" msgid "Streets and Alleys" msgstr "Улицы и аллеи" +#, fuzzy +msgid "Striptease" +msgstr "Пласт" + msgid "Stronghold" msgstr "Твердыня" @@ -3438,6 +3494,9 @@ msgstr "Жаба" msgid "Tomb" msgstr "Гробница" +msgid "Toni" +msgstr "" + #, fuzzy msgid "Totally Random-Made" msgstr "Маджонг Totally Random-Made" @@ -3445,6 +3504,10 @@ msgstr "Маджонг Totally Random-Made" msgid "Tournament" msgstr "Турнир" +#, fuzzy +msgid "Tower of Babel" +msgstr "Ханойская башня" + msgid "Tower of Hanoy" msgstr "Ханойская башня" @@ -3561,6 +3624,10 @@ msgstr "" msgid "Vamana" msgstr "" +#, fuzzy +msgid "Vanishing Cross" +msgstr "Маджонг Крест" + #, fuzzy msgid "Varaha" msgstr "Марта" diff --git a/po/ru_pysol.po b/po/ru_pysol.po index c0e251e9..7c1399a3 100644 --- a/po/ru_pysol.po +++ b/po/ru_pysol.po @@ -5,8 +5,8 @@ msgid "" msgstr "" "Project-Id-Version: PySol 0.0.1\n" -"POT-Creation-Date: Fri Aug 11 02:14:56 2006\n" -"PO-Revision-Date: 2006-08-20 17:42+0400\n" +"POT-Creation-Date: Tue Aug 22 21:33:40 2006\n" +"PO-Revision-Date: 2006-08-22 21:34+0400\n" "Last-Translator: Скоморох \n" "Language-Team: Russian \n" "MIME-Version: 1.0\n" @@ -14,32 +14,32 @@ msgstr "" "Content-Transfer-Encoding: utf-8\n" "Generated-By: pygettext.py 1.5\n" -#: pysollib/actions.py:360 pysollib/tk/toolbar.py:197 +#: pysollib/actions.py:358 pysollib/tk/toolbar.py:197 msgid "New game" msgstr "Новая игра" -#: pysollib/actions.py:373 pysollib/tk/menubar.py:699 -#: pysollib/tk/menubar.py:713 +#: pysollib/actions.py:371 pysollib/tk/menubar.py:704 +#: pysollib/tk/menubar.py:718 msgid "Select game" msgstr "Выбрать игру" -#: pysollib/actions.py:396 +#: pysollib/actions.py:388 msgid "Invalid game number" msgstr "Неправильный номер игры" -#: pysollib/actions.py:397 +#: pysollib/actions.py:389 msgid "Invalid game number\n" msgstr "Неправильный номер игры\n" -#: pysollib/actions.py:414 +#: pysollib/actions.py:406 msgid "Select next game number" msgstr "Выберите номер следующей игры" -#: pysollib/actions.py:423 pysollib/actions.py:433 +#: pysollib/actions.py:415 pysollib/actions.py:425 msgid "Select new game number" msgstr "Выберите номер новой игры" -#: pysollib/actions.py:424 +#: pysollib/actions.py:416 msgid "" "\n" "\n" @@ -49,13 +49,13 @@ msgstr "" "\n" "Введите номер новой игры" -#: pysollib/actions.py:425 +#: pysollib/actions.py:417 msgid "&Next number" msgstr "&Следующий номер" -#: pysollib/actions.py:425 pysollib/app.py:1143 pysollib/app.py:1155 -#: pysollib/game.py:904 pysollib/game.py:1828 pysollib/main.py:439 -#: pysollib/main.py:447 pysollib/tk/colorsdialog.py:132 +#: pysollib/actions.py:417 pysollib/app.py:1150 pysollib/app.py:1162 +#: pysollib/game.py:925 pysollib/game.py:1861 pysollib/main.py:439 +#: pysollib/main.py:447 pysollib/tk/colorsdialog.py:122 #: pysollib/tk/edittextdialog.py:82 pysollib/tk/fontsdialog.py:143 #: pysollib/tk/fontsdialog.py:205 pysollib/tk/gameinfodialog.py:155 #: pysollib/tk/playeroptionsdialog.py:85 @@ -71,12 +71,12 @@ msgstr "&Следующий номер" msgid "&OK" msgstr "&ОК" -#: pysollib/actions.py:425 pysollib/app.py:1155 pysollib/game.py:904 -#: pysollib/game.py:1290 pysollib/game.py:1305 pysollib/game.py:1312 -#: pysollib/game.py:1318 pysollib/tk/colorsdialog.py:132 +#: pysollib/actions.py:417 pysollib/app.py:1162 pysollib/game.py:925 +#: pysollib/game.py:1311 pysollib/game.py:1326 pysollib/game.py:1333 +#: pysollib/game.py:1339 pysollib/tk/colorsdialog.py:122 #: pysollib/tk/edittextdialog.py:82 pysollib/tk/fontsdialog.py:143 -#: pysollib/tk/fontsdialog.py:205 pysollib/tk/menubar.py:894 -#: pysollib/tk/menubar.py:896 pysollib/tk/playeroptionsdialog.py:85 +#: pysollib/tk/fontsdialog.py:205 pysollib/tk/menubar.py:1000 +#: pysollib/tk/menubar.py:1002 pysollib/tk/playeroptionsdialog.py:85 #: pysollib/tk/playeroptionsdialog.py:160 pysollib/tk/selectcardset.py:240 #: pysollib/tk/selectgame.py:266 pysollib/tk/selectgame.py:407 #: pysollib/tk/selecttile.py:158 pysollib/tk/soundoptionsdialog.py:170 @@ -84,35 +84,35 @@ msgstr "&ОК" msgid "&Cancel" msgstr "От&мена" -#: pysollib/actions.py:441 +#: pysollib/actions.py:433 msgid "Select random game" msgstr "Выбор случайной игры" -#: pysollib/actions.py:477 +#: pysollib/actions.py:469 msgid "Select next game" msgstr "Выбрать следующую игру" -#: pysollib/actions.py:510 pysollib/tk/toolbar.py:211 +#: pysollib/actions.py:502 pysollib/tk/toolbar.py:211 msgid "Quit " msgstr "Выйти из " -#: pysollib/actions.py:560 +#: pysollib/actions.py:552 msgid "Clear bookmarks" msgstr "Удалить закладки" -#: pysollib/actions.py:561 +#: pysollib/actions.py:553 msgid "Clear all bookmarks ?" msgstr "Удалить все закладки?" -#: pysollib/actions.py:571 +#: pysollib/actions.py:563 msgid "Restart game" msgstr "Начать игру с начала" -#: pysollib/actions.py:572 +#: pysollib/actions.py:564 msgid "Restart this game ?" msgstr "Начать игру с начала?" -#: pysollib/actions.py:613 +#: pysollib/actions.py:605 msgid "" "Comments for %s:\n" "\n" @@ -120,19 +120,19 @@ msgstr "" "Комментарий для %s:\n" "\n" -#: pysollib/actions.py:615 +#: pysollib/actions.py:607 msgid "Comments for " msgstr "Комментарий для " -#: pysollib/actions.py:633 pysollib/actions.py:669 +#: pysollib/actions.py:625 pysollib/actions.py:661 msgid "Error while writing to file" msgstr "Ошибка при записи в файл" -#: pysollib/actions.py:636 pysollib/actions.py:672 +#: pysollib/actions.py:628 pysollib/actions.py:664 msgid " Info" msgstr " Информация" -#: pysollib/actions.py:637 +#: pysollib/actions.py:629 msgid "" "Comments were appended to\n" "\n" @@ -140,15 +140,15 @@ msgstr "" "Комментарий добавлен в файл\n" "\n" -#: pysollib/actions.py:654 +#: pysollib/actions.py:646 msgid "Demo statistics" msgstr "Статистика демо" -#: pysollib/actions.py:657 +#: pysollib/actions.py:649 msgid "Your statistics" msgstr "Ваша статистика" -#: pysollib/actions.py:673 +#: pysollib/actions.py:665 msgid "" " were appended to\n" "\n" @@ -156,52 +156,52 @@ msgstr "" " добавлена в файл\n" "\n" -#: pysollib/actions.py:687 +#: pysollib/actions.py:679 msgid " Demo" msgstr " Демо" -#: pysollib/actions.py:687 +#: pysollib/actions.py:679 msgid " Demo " msgstr " Демо " -#: pysollib/actions.py:690 pysollib/actions.py:708 +#: pysollib/actions.py:682 pysollib/actions.py:700 msgid " for " msgstr " для " -#: pysollib/actions.py:696 pysollib/actions.py:715 +#: pysollib/actions.py:688 pysollib/actions.py:707 msgid "Statistics for " msgstr "Статистика игры " -#: pysollib/actions.py:699 pysollib/tk/selectgame.py:350 +#: pysollib/actions.py:691 pysollib/tk/selectgame.py:350 #: pysollib/tk/toolbar.py:208 msgid "Statistics" msgstr "Статистика" -#: pysollib/actions.py:702 +#: pysollib/actions.py:694 msgid "Full log" msgstr "Полный лог" -#: pysollib/actions.py:705 +#: pysollib/actions.py:697 msgid "Session log" msgstr "Лог сессии" -#: pysollib/actions.py:711 +#: pysollib/actions.py:703 msgid "Game Info" msgstr "Информация об игре" -#: pysollib/actions.py:720 +#: pysollib/actions.py:712 msgid "Full log for " msgstr "Полный лог для " -#: pysollib/actions.py:725 +#: pysollib/actions.py:717 msgid "Session log for " msgstr "Лог сессии для " -#: pysollib/actions.py:730 +#: pysollib/actions.py:722 msgid "Reset all statistics" msgstr "Очистить всю статистику" -#: pysollib/actions.py:731 +#: pysollib/actions.py:723 msgid "" "Reset ALL statistics and logs for player\n" "%s ?" @@ -209,11 +209,11 @@ msgstr "" "Очистить всю статистику и лог для игрока\n" "%s?" -#: pysollib/actions.py:737 +#: pysollib/actions.py:729 msgid "Reset game statistics" msgstr "Очистить статистику игры" -#: pysollib/actions.py:738 +#: pysollib/actions.py:730 msgid "" "Reset statistics and logs for player\n" "%s\n" @@ -225,51 +225,51 @@ msgstr "" "и игры\n" "%s?" -#: pysollib/actions.py:794 +#: pysollib/actions.py:785 msgid "Play demo" msgstr "Показать демо" -#: pysollib/actions.py:805 +#: pysollib/actions.py:796 msgid "Set player options" msgstr "Установить настройки игрока" -#: pysollib/actions.py:906 +#: pysollib/actions.py:810 msgid "Sound settings" msgstr "Настройка звука" -#: pysollib/actions.py:927 +#: pysollib/actions.py:819 msgid "Set colors" msgstr "Настроить цвета" -#: pysollib/actions.py:946 +#: pysollib/actions.py:839 msgid "Set fonts" msgstr "Настроить шрифт" -#: pysollib/actions.py:955 +#: pysollib/actions.py:848 msgid "Set timeouts" msgstr "Настроить таймауты" -#: pysollib/app.py:87 +#: pysollib/app.py:86 msgid "Unknown" msgstr "Неизвестный" -#: pysollib/app.py:1005 +#: pysollib/app.py:1012 msgid "Loading %s %s..." msgstr "Загружается %s %s..." -#: pysollib/app.py:1040 +#: pysollib/app.py:1047 msgid " load error" msgstr " ошибка при загрузке" -#: pysollib/app.py:1041 +#: pysollib/app.py:1048 msgid "Error while loading " msgstr "Ошибка при загрузке" -#: pysollib/app.py:1135 +#: pysollib/app.py:1142 msgid "Incompatible " msgstr "Несовместимый " -#: pysollib/app.py:1137 +#: pysollib/app.py:1144 msgid "" "The currently selected %s %s\n" "is not compatible with the game\n" @@ -283,19 +283,19 @@ msgstr "" "\n" "Необходимо выбрать %s типа %s.\n" -#: pysollib/app.py:1153 +#: pysollib/app.py:1160 msgid "Please select a %s type %s" msgstr "Выберите %s типа %s" -#: pysollib/game.py:823 pysollib/game.py:829 +#: pysollib/game.py:844 pysollib/game.py:850 msgid "Player\n" msgstr "Игрок\n" -#: pysollib/game.py:900 +#: pysollib/game.py:921 msgid "Discard current game ?" msgstr "Завершить текущую игру?" -#: pysollib/game.py:1244 +#: pysollib/game.py:1265 msgid "" "\n" "You have reached\n" @@ -305,7 +305,7 @@ msgstr "" "Вы достигли\n" "#%d в %s игрового времени" -#: pysollib/game.py:1247 +#: pysollib/game.py:1268 msgid "" "\n" "and #%d in the %s of moves" @@ -313,7 +313,7 @@ msgstr "" "\n" "и #%d в %s количества ходов" -#: pysollib/game.py:1249 +#: pysollib/game.py:1270 msgid "" "\n" "You have reached\n" @@ -323,7 +323,7 @@ msgstr "" "Вы достигли\n" "#%d в %s количества ходов" -#: pysollib/game.py:1252 +#: pysollib/game.py:1273 msgid "" "\n" "and #%d in the %s of total moves" @@ -331,7 +331,7 @@ msgstr "" "\n" "и #%d в %s общего количества ходов" -#: pysollib/game.py:1254 +#: pysollib/game.py:1275 msgid "" "\n" "You have reached\n" @@ -341,12 +341,12 @@ msgstr "" "Вы достигли\n" "#%d в %s общего количества ходов" -#: pysollib/game.py:1281 pysollib/game.py:1297 +#: pysollib/game.py:1302 pysollib/game.py:1318 #: pysollib/tk/soundoptionsdialog.py:100 msgid "Game won" msgstr "Игра выиграна" -#: pysollib/game.py:1282 +#: pysollib/game.py:1303 msgid "" "\n" "Congratulations, this\n" @@ -365,12 +365,12 @@ msgstr "" "Количество ходов: %s\n" "%s\n" -#: pysollib/game.py:1290 pysollib/game.py:1305 pysollib/game.py:1312 -#: pysollib/game.py:1318 pysollib/tk/menubar.py:257 +#: pysollib/game.py:1311 pysollib/game.py:1326 pysollib/game.py:1333 +#: pysollib/game.py:1339 pysollib/tk/menubar.py:256 msgid "&New game" msgstr "&Новая игра" -#: pysollib/game.py:1298 +#: pysollib/game.py:1319 msgid "" "\n" "Congratulations, you did it !\n" @@ -387,12 +387,12 @@ msgstr "" "Количество ходов: %s\n" "%s\n" -#: pysollib/game.py:1310 pysollib/game.py:1316 +#: pysollib/game.py:1331 pysollib/game.py:1337 #: pysollib/tk/soundoptionsdialog.py:98 msgid "Game finished" msgstr "Игра закончена" -#: pysollib/game.py:1311 pysollib/game.py:1829 +#: pysollib/game.py:1332 pysollib/game.py:1862 msgid "" "\n" "Game finished\n" @@ -400,7 +400,7 @@ msgstr "" "\n" "Игра закончена\n" -#: pysollib/game.py:1317 +#: pysollib/game.py:1338 msgid "" "\n" "Game finished, but not without my help...\n" @@ -408,35 +408,35 @@ msgstr "" "\n" "Игра закончена, но не без моей помощи...\n" -#: pysollib/game.py:1318 +#: pysollib/game.py:1339 msgid "&Restart" msgstr "&Начало" -#: pysollib/game.py:1720 +#: pysollib/game.py:1753 msgid "Score %6d" msgstr "Счет %6d" -#: pysollib/game.py:1819 +#: pysollib/game.py:1852 msgid "&Cool" msgstr "&Отлично" -#: pysollib/game.py:1819 +#: pysollib/game.py:1852 msgid "&Great" msgstr "&Эдорово" -#: pysollib/game.py:1819 +#: pysollib/game.py:1852 msgid "&Wow" msgstr "&Ура" -#: pysollib/game.py:1819 +#: pysollib/game.py:1852 msgid "&Yeah" msgstr "&Ага" -#: pysollib/game.py:1820 pysollib/game.py:1832 pysollib/game.py:1845 +#: pysollib/game.py:1853 pysollib/game.py:1865 pysollib/game.py:1878 msgid " Autopilot" msgstr " Автопилот" -#: pysollib/game.py:1821 +#: pysollib/game.py:1854 msgid "" "\n" "Game solved in %d moves.\n" @@ -444,19 +444,19 @@ msgstr "" "\n" "Игра решена за %d ходов\n" -#: pysollib/game.py:1844 +#: pysollib/game.py:1877 msgid "&Hmm" msgstr "&Хмм" -#: pysollib/game.py:1844 +#: pysollib/game.py:1877 msgid "&Oh well" msgstr "&Ох" -#: pysollib/game.py:1844 +#: pysollib/game.py:1877 msgid "&That's life" msgstr "&Такова жизнь" -#: pysollib/game.py:1846 +#: pysollib/game.py:1879 msgid "" "\n" "This won't come out...\n" @@ -464,31 +464,31 @@ msgstr "" "\n" "Не удалось...\n" -#: pysollib/game.py:2264 +#: pysollib/game.py:2298 msgid "Set bookmark" msgstr "Установить закладку" -#: pysollib/game.py:2265 +#: pysollib/game.py:2299 msgid "Replace existing bookmark %d ?" msgstr "Заменить существующую закладку %d ?" -#: pysollib/game.py:2287 +#: pysollib/game.py:2321 msgid "Goto bookmark" msgstr "Перейти к закладке" -#: pysollib/game.py:2288 +#: pysollib/game.py:2322 msgid "Goto bookmark %d ?" msgstr "Перейти к закладке %d ?" -#: pysollib/game.py:2319 +#: pysollib/game.py:2353 msgid "Open game" msgstr "Открыть игру" -#: pysollib/game.py:2330 pysollib/game.py:2339 pysollib/game.py:2344 +#: pysollib/game.py:2364 pysollib/game.py:2373 pysollib/game.py:2378 msgid "Load game error" msgstr "Ошибка при загрузке игры" -#: pysollib/game.py:2331 +#: pysollib/game.py:2365 msgid "" "Error while loading game.\n" "\n" @@ -500,11 +500,11 @@ msgstr "" "Возможно повреждён файл,\n" "или ошибка в программе." -#: pysollib/game.py:2340 +#: pysollib/game.py:2374 msgid "Error while loading game" msgstr "Ошибка при загрузке игры" -#: pysollib/game.py:2345 +#: pysollib/game.py:2379 msgid "" "Internal error while loading game.\n" "\n" @@ -514,11 +514,11 @@ msgstr "" "\n" "Пожалуйста сообщите об этой ошибке." -#: pysollib/game.py:2370 +#: pysollib/game.py:2404 msgid "Save game error" msgstr "Ошибка при сохранении игры" -#: pysollib/game.py:2371 +#: pysollib/game.py:2405 msgid "Error while saving game" msgstr "Ошибка при сохранении игры" @@ -763,12 +763,12 @@ msgstr "" "4: 8 Д 3 7 В 2 6 10 Т 5 9 К" #: pysollib/games/canfield.py:528 pysollib/games/special/tarock.py:224 -#: pysollib/stack.py:1304 pysollib/util.py:81 +#: pysollib/stack.py:1326 pysollib/util.py:80 msgid "King" msgstr "Король" #: pysollib/games/canfield.py:531 pysollib/games/special/tarock.py:224 -#: pysollib/stack.py:1303 pysollib/util.py:81 +#: pysollib/stack.py:1325 pysollib/util.py:80 msgid "Queen" msgstr "Королева" @@ -786,11 +786,11 @@ msgid "X" msgstr "Х" #: pysollib/games/golf.py:114 pysollib/games/golf.py:300 -#: pysollib/stack.py:1915 +#: pysollib/stack.py:1980 msgid "Tableau. No building." msgstr "Игровой стол. Без выкладывания." -#: pysollib/games/golf.py:385 pysollib/stack.py:1848 +#: pysollib/games/golf.py:385 pysollib/stack.py:1913 msgid "Foundation. Build up regardless of suit." msgstr "Базовая ячейка. Складывать по возрастанию не считаясь с мастью." @@ -798,11 +798,11 @@ msgstr "Базовая ячейка. Складывать по возраста msgid "Balance $%d" msgstr "Баланс $%d" -#: pysollib/games/klondike.py:419 +#: pysollib/games/klondike.py:439 msgid "Reserve. Only Kings are acceptable." msgstr "Резерв. Только для королей." -#: pysollib/games/larasgame.py:163 pysollib/stack.py:1525 +#: pysollib/games/larasgame.py:163 pysollib/stack.py:1542 msgid "Round %d" msgstr "Раунд %d" @@ -931,7 +931,7 @@ msgstr "Жезлы" #: pysollib/games/special/tarock.py:223 #: pysollib/games/ultra/dashavatara.py:351 #: pysollib/games/ultra/hexadeck.py:273 pysollib/games/ultra/mughal.py:254 -#: pysollib/stack.py:1305 pysollib/util.py:80 +#: pysollib/stack.py:1327 pysollib/util.py:79 msgid "Ace" msgstr "Туз" @@ -951,7 +951,7 @@ msgstr "Очков: Текущая раздача: " msgid "\tThis game: " msgstr " Эта игра: " -#: pysollib/games/tournament.py:245 +#: pysollib/games/tournament.py:226 msgid "Reserve. Build down by suit." msgstr "Резерв. Складывать по убыванию в соответствии с мастью." @@ -1245,27 +1245,27 @@ msgstr "" "Игровой стол. Складывать по убыванию не считаясь с мастью, можно перемещать " "любую серию открытых карт." -#: pysollib/help.py:64 +#: pysollib/help.py:63 msgid "A Python Solitaire Game Collection\n" msgstr "Коллекция питоновских пасьянсев\n" -#: pysollib/help.py:66 +#: pysollib/help.py:65 msgid "A World Domination Project\n" msgstr "Всемирный непревзойденный проект\n" -#: pysollib/help.py:67 +#: pysollib/help.py:66 msgid "&Credits..." msgstr "&Благодарности..." -#: pysollib/help.py:67 +#: pysollib/help.py:66 msgid "&Nice" msgstr "&Отлично" -#: pysollib/help.py:69 +#: pysollib/help.py:68 msgid "&Enjoy" msgstr "&Наслаждайтесь" -#: pysollib/help.py:71 +#: pysollib/help.py:70 msgid "" "Version %s\n" "\n" @@ -1273,11 +1273,11 @@ msgstr "" "Версия %s\n" "\n" -#: pysollib/help.py:72 +#: pysollib/help.py:71 msgid "About " msgstr "О программе " -#: pysollib/help.py:73 +#: pysollib/help.py:72 msgid "" "PySol Fan Club edition\n" "%s%s\n" @@ -1308,11 +1308,11 @@ msgstr "" "об этом приложении посетите сайт\n" "%s" -#: pysollib/help.py:102 +#: pysollib/help.py:101 msgid "Credits" msgstr "Благодарности" -#: pysollib/help.py:103 +#: pysollib/help.py:102 msgid "" " credits go to:\n" "\n" @@ -1327,23 +1327,23 @@ msgid "" "for making this program possible" msgstr "" -#: pysollib/help.py:138 +#: pysollib/help.py:137 msgid " HTML Problem" msgstr " проблема с HTML" -#: pysollib/help.py:139 +#: pysollib/help.py:138 msgid "Cannot find help document\n" msgstr "Не найден файл помощи\n" -#: pysollib/help.py:152 +#: pysollib/help.py:151 msgid " Help" msgstr " Помощь" -#: pysollib/main.py:68 pysollib/main.py:348 +#: pysollib/main.py:66 pysollib/main.py:348 msgid " installation error" msgstr " проблема с установкой" -#: pysollib/main.py:69 +#: pysollib/main.py:67 msgid "" "No %ss were found !!!\n" "\n" @@ -1353,11 +1353,11 @@ msgid "" "Please check your %s installation.\n" msgstr "" -#: pysollib/main.py:76 pysollib/main.py:356 pysollib/tk/menubar.py:276 +#: pysollib/main.py:74 pysollib/main.py:356 pysollib/tk/menubar.py:275 msgid "&Quit" msgstr "В&ыход" -#: pysollib/main.py:98 +#: pysollib/main.py:96 msgid "" "%s: %s\n" "try %s --help for more information" @@ -1365,7 +1365,7 @@ msgstr "" "%s: %s\n" "попробуйте %s --help для получения более подробной информаци" -#: pysollib/main.py:135 +#: pysollib/main.py:133 msgid "" "Usage: %s [OPTIONS] [FILE]\n" " -g --game=GAMENAME start game GAMENAME\n" @@ -1389,7 +1389,7 @@ msgstr "" "\n" " FILE - имя файла сохраненной игры\n" -#: pysollib/main.py:149 +#: pysollib/main.py:147 msgid "" "%s: too many files\n" "try %s --help for more information" @@ -1397,7 +1397,7 @@ msgstr "" "\"%s: слишком много файлов\n" "попробуйте %s --help для получения более подробной информаци" -#: pysollib/main.py:153 +#: pysollib/main.py:151 msgid "" "%s: invalid file name\n" "try %s --help for more information" @@ -1441,414 +1441,414 @@ msgstr "" msgid "Welcome to " msgstr "Добро пожаловать в " -#: pysollib/resource.py:243 +#: pysollib/resource.py:242 msgid "French type (52 cards)" msgstr "Классические (52 карты)" -#: pysollib/resource.py:244 +#: pysollib/resource.py:243 msgid "Hanafuda type (48 cards)" msgstr "Ханафуда (48 карт)" -#: pysollib/resource.py:245 +#: pysollib/resource.py:244 msgid "Tarock type (78 cards)" msgstr "Таро (78 карт)" -#: pysollib/resource.py:246 +#: pysollib/resource.py:245 msgid "Mahjongg type (42 tiles)" msgstr "Маджонг (42 фишки)" -#: pysollib/resource.py:247 +#: pysollib/resource.py:246 msgid "Hex A Deck type (68 cards)" msgstr "Hex A Deck (68 карт)" -#: pysollib/resource.py:248 +#: pysollib/resource.py:247 msgid "Mughal Ganjifa type (96 cards)" msgstr "Мугал Ганджифа (96 карт)" -#: pysollib/resource.py:249 +#: pysollib/resource.py:248 msgid "Navagraha Ganjifa type (108 cards)" msgstr "Наваграха Ганджифа (108 карт)" -#: pysollib/resource.py:250 +#: pysollib/resource.py:249 msgid "Dashavatara Ganjifa type (120 cards)" msgstr "Дашаватара Ганджифа (120 карт)" -#: pysollib/resource.py:251 +#: pysollib/resource.py:250 msgid "Trumps only type (variable cards)" msgstr "Без мастей (переменное количество карт)" -#: pysollib/resource.py:255 +#: pysollib/resource.py:254 msgid "French" msgstr "Классические" -#: pysollib/resource.py:256 pysollib/resource.py:280 +#: pysollib/resource.py:255 pysollib/resource.py:279 msgid "Hanafuda" msgstr "Ханафуда" -#: pysollib/resource.py:257 pysollib/resource.py:296 +#: pysollib/resource.py:256 pysollib/resource.py:295 msgid "Tarock" msgstr "Таро" -#: pysollib/resource.py:258 pysollib/resource.py:283 +#: pysollib/resource.py:257 pysollib/resource.py:282 msgid "Mahjongg" msgstr "Маджонг" -#: pysollib/resource.py:259 pysollib/resource.py:281 +#: pysollib/resource.py:258 pysollib/resource.py:280 msgid "Hex A Deck" msgstr "Hex A Deck" -#: pysollib/resource.py:260 +#: pysollib/resource.py:259 msgid "Mughal Ganjifa" msgstr "Мугал Ганджифа" -#: pysollib/resource.py:261 +#: pysollib/resource.py:260 msgid "Navagraha Ganjifa" msgstr "Наваграха Ганджифа" -#: pysollib/resource.py:262 +#: pysollib/resource.py:261 msgid "Dashavatara Ganjifa" msgstr "Дашаватара Ганджифа" -#: pysollib/resource.py:263 +#: pysollib/resource.py:262 #, fuzzy msgid "Trumps only" msgstr "Козырь" -#: pysollib/resource.py:268 +#: pysollib/resource.py:267 msgid "Adult" msgstr "Для взрослых" -#: pysollib/resource.py:269 +#: pysollib/resource.py:268 msgid "Animals" msgstr "Животные" -#: pysollib/resource.py:270 +#: pysollib/resource.py:269 msgid "Anime" msgstr "Мультфильмы" -#: pysollib/resource.py:271 +#: pysollib/resource.py:270 msgid "Art" msgstr "Искусство" -#: pysollib/resource.py:272 +#: pysollib/resource.py:271 msgid "Cartoons" msgstr "Комиксы" -#: pysollib/resource.py:273 +#: pysollib/resource.py:272 msgid "Children" msgstr "Дети" -#: pysollib/resource.py:274 +#: pysollib/resource.py:273 msgid "Classic look" msgstr "Классический вид" -#: pysollib/resource.py:275 +#: pysollib/resource.py:274 msgid "Collectors" msgstr "Коллекционные" -#: pysollib/resource.py:276 +#: pysollib/resource.py:275 msgid "Computers" msgstr "Компьютеры" -#: pysollib/resource.py:277 +#: pysollib/resource.py:276 msgid "Engines" msgstr "Машины" -#: pysollib/resource.py:278 +#: pysollib/resource.py:277 msgid "Fantasy" msgstr "Фентези" -#: pysollib/resource.py:279 +#: pysollib/resource.py:278 msgid "Ganjifa" msgstr "Ганджифа" -#: pysollib/resource.py:282 +#: pysollib/resource.py:281 msgid "Holiday" msgstr "Праздники" -#: pysollib/resource.py:284 +#: pysollib/resource.py:283 msgid "Movies" msgstr "Фильмы" -#: pysollib/resource.py:285 +#: pysollib/resource.py:284 msgid "Matrix" msgstr "Мозаика" -#: pysollib/resource.py:286 +#: pysollib/resource.py:285 msgid "Music" msgstr "Музыка" -#: pysollib/resource.py:287 +#: pysollib/resource.py:286 msgid "Nature" msgstr "Природа" -#: pysollib/resource.py:288 +#: pysollib/resource.py:287 msgid "Operating Systems" msgstr "Операционные системы" -#: pysollib/resource.py:289 +#: pysollib/resource.py:288 msgid "People" msgstr "Люди" -#: pysollib/resource.py:290 +#: pysollib/resource.py:289 msgid "Places" msgstr "Дома" -#: pysollib/resource.py:291 +#: pysollib/resource.py:290 msgid "Plain" msgstr "Простые" -#: pysollib/resource.py:292 +#: pysollib/resource.py:291 msgid "Products" msgstr "Продукты" -#: pysollib/resource.py:293 +#: pysollib/resource.py:292 msgid "Round cardsets" msgstr "Закруглённые" -#: pysollib/resource.py:294 +#: pysollib/resource.py:293 msgid "Science Fiction" msgstr "Научная фантастика" -#: pysollib/resource.py:295 +#: pysollib/resource.py:294 msgid "Sports" msgstr "Спорт" -#: pysollib/resource.py:297 +#: pysollib/resource.py:296 msgid "Vehicels" msgstr "Транспортные средства" -#: pysollib/resource.py:298 +#: pysollib/resource.py:297 msgid "Video Games" msgstr "Видеоигры" -#: pysollib/resource.py:303 +#: pysollib/resource.py:302 msgid "Australia" msgstr "Австралия" -#: pysollib/resource.py:304 +#: pysollib/resource.py:303 msgid "Austria" msgstr "Австрия" -#: pysollib/resource.py:305 +#: pysollib/resource.py:304 msgid "Belgium" msgstr "Бельгия" -#: pysollib/resource.py:306 +#: pysollib/resource.py:305 msgid "Canada" msgstr "Канада" -#: pysollib/resource.py:307 +#: pysollib/resource.py:306 msgid "China" msgstr "Китай" -#: pysollib/resource.py:308 +#: pysollib/resource.py:307 msgid "Czech Republic" msgstr "Чехия" -#: pysollib/resource.py:309 +#: pysollib/resource.py:308 msgid "Denmark" msgstr "Дания" -#: pysollib/resource.py:310 +#: pysollib/resource.py:309 msgid "England" msgstr "Англия" -#: pysollib/resource.py:311 +#: pysollib/resource.py:310 msgid "France" msgstr "Франция" -#: pysollib/resource.py:312 +#: pysollib/resource.py:311 msgid "Germany" msgstr "Германия" -#: pysollib/resource.py:313 +#: pysollib/resource.py:312 msgid "Great Britain" msgstr "Великобритания" -#: pysollib/resource.py:314 +#: pysollib/resource.py:313 msgid "Hungary" msgstr "Венгрия" -#: pysollib/resource.py:315 +#: pysollib/resource.py:314 msgid "India" msgstr "Индия" -#: pysollib/resource.py:316 +#: pysollib/resource.py:315 msgid "Italy" msgstr "Италия" -#: pysollib/resource.py:317 +#: pysollib/resource.py:316 msgid "Japan" msgstr "Япония" -#: pysollib/resource.py:318 +#: pysollib/resource.py:317 msgid "Netherlands" msgstr "Голландия" -#: pysollib/resource.py:319 +#: pysollib/resource.py:318 msgid "Russia" msgstr "Россия" -#: pysollib/resource.py:320 +#: pysollib/resource.py:319 msgid "Spain" msgstr "Испания" -#: pysollib/resource.py:321 +#: pysollib/resource.py:320 msgid "Sweden" msgstr "Швеция" -#: pysollib/resource.py:322 +#: pysollib/resource.py:321 msgid "Switzerland" msgstr "Швейцария" -#: pysollib/resource.py:323 +#: pysollib/resource.py:322 msgid "USA" msgstr "США" -#: pysollib/settings.py:47 +#: pysollib/settings.py:54 msgid "Top 10" msgstr "Top 10" -#: pysollib/stack.py:1299 +#: pysollib/stack.py:1321 msgid "Base card - %s." msgstr "Базовая карта - %s." -#: pysollib/stack.py:1300 +#: pysollib/stack.py:1322 msgid "Empty row cannot be filled." msgstr "Пустой ряд не заполняется." -#: pysollib/stack.py:1301 +#: pysollib/stack.py:1323 msgid "any card" msgstr "любая карта" -#: pysollib/stack.py:1302 pysollib/util.py:81 +#: pysollib/stack.py:1324 pysollib/util.py:80 msgid "Jack" msgstr "Валет" -#: pysollib/stack.py:1315 +#: pysollib/stack.py:1337 msgid "No cards" msgstr "Нет карт" -#: pysollib/stack.py:1316 +#: pysollib/stack.py:1338 msgid "1 card" msgstr "1 карта" -#: pysollib/stack.py:1317 +#: pysollib/stack.py:1339 msgid " cards" msgstr " карт" -#: pysollib/stack.py:1534 pysollib/stack.py:1536 pysollib/stack.py:1567 +#: pysollib/stack.py:1551 pysollib/stack.py:1553 pysollib/stack.py:1589 msgid "Redeal" msgstr "Сдать" -#: pysollib/stack.py:1536 +#: pysollib/stack.py:1553 msgid "Stop" msgstr "Стоп" -#: pysollib/stack.py:1587 +#: pysollib/stack.py:1613 msgid "Variable redeals." msgstr "Переменное количество пересдач." -#: pysollib/stack.py:1588 +#: pysollib/stack.py:1614 msgid "Unlimited redeals." msgstr "Неограниченное количество пересдач." -#: pysollib/stack.py:1589 +#: pysollib/stack.py:1615 msgid "No redeals." msgstr "Без пересдачи." -#: pysollib/stack.py:1590 +#: pysollib/stack.py:1616 msgid "One redeal." msgstr "1 пересдача." -#: pysollib/stack.py:1591 +#: pysollib/stack.py:1617 msgid " redeals." msgstr " пересдачи." -#: pysollib/stack.py:1593 +#: pysollib/stack.py:1619 msgid "Talon." msgstr "Колода." -#: pysollib/stack.py:1779 pysollib/stack.py:2229 +#: pysollib/stack.py:1844 pysollib/stack.py:2294 msgid "Reserve. No building." msgstr "Резерв. Без выкладывания." -#: pysollib/stack.py:1816 +#: pysollib/stack.py:1881 msgid "Foundation." msgstr "Базовая ячейка" -#: pysollib/stack.py:1832 +#: pysollib/stack.py:1897 msgid "Foundation. Build up by suit." msgstr "Базовая ячейка. Складывать по возрастанию в соответствии с мастью." -#: pysollib/stack.py:1833 +#: pysollib/stack.py:1898 msgid "Foundation. Build down by suit." msgstr "Базовая ячейка. Складывать по убыванию в соответствии с мастью." -#: pysollib/stack.py:1834 pysollib/stack.py:1850 pysollib/stack.py:1872 +#: pysollib/stack.py:1899 pysollib/stack.py:1915 pysollib/stack.py:1937 msgid "Foundation. Build by same rank." msgstr "Базовая ячейка. Складывать в соответствии с достоинством." -#: pysollib/stack.py:1849 +#: pysollib/stack.py:1914 msgid "Foundation. Build down regardless of suit." msgstr "Базовая ячейка. Складывать не считаясь с мастью." -#: pysollib/stack.py:1870 +#: pysollib/stack.py:1935 msgid "Foundation. Build up by alternate color." msgstr "Базовая ячейка. Складывать по возрастанию чередуя цвет." -#: pysollib/stack.py:1871 +#: pysollib/stack.py:1936 msgid "Foundation. Build down by alternate color." msgstr "Базовая ячейка. Складывать по убыванию чередуя цвет." -#: pysollib/stack.py:1945 +#: pysollib/stack.py:2010 msgid "Tableau. Build up by alternate color." msgstr "Игровой стол. Складывать по возрастанию чередуя цвет." -#: pysollib/stack.py:1946 +#: pysollib/stack.py:2011 msgid "Tableau. Build down by alternate color." msgstr "Игровой стол. Складывать по убыванию чередуя цвет." -#: pysollib/stack.py:1947 pysollib/stack.py:1957 pysollib/stack.py:1966 -#: pysollib/stack.py:1975 pysollib/stack.py:1985 pysollib/stack.py:2008 -#: pysollib/stack.py:2018 +#: pysollib/stack.py:2012 pysollib/stack.py:2022 pysollib/stack.py:2031 +#: pysollib/stack.py:2040 pysollib/stack.py:2050 pysollib/stack.py:2073 +#: pysollib/stack.py:2083 msgid "Tableau. Build by same rank." msgstr "Игровой стол. Складывать в соответствии с достоинством." -#: pysollib/stack.py:1955 +#: pysollib/stack.py:2020 msgid "Tableau. Build up by color." msgstr "Игровой стол. Складывать по возрастанию в соответствии с цветом." -#: pysollib/stack.py:1956 +#: pysollib/stack.py:2021 msgid "Tableau. Build down by color." msgstr "Игровой стол. Складывать по убыванию в соответствии с цветом." -#: pysollib/stack.py:1964 +#: pysollib/stack.py:2029 msgid "Tableau. Build up by suit." msgstr "Игровой стол. Складывать по возрастанию в соответствии с мастью." -#: pysollib/stack.py:1965 +#: pysollib/stack.py:2030 msgid "Tableau. Build down by suit." msgstr "Игровой стол. Складывать по убыванию в соответствии с мастью." -#: pysollib/stack.py:1973 +#: pysollib/stack.py:2038 msgid "Tableau. Build up regardless of suit." msgstr "Игровой стол. Складывать по возрастанию не считаясь с мастью." -#: pysollib/stack.py:1974 +#: pysollib/stack.py:2039 msgid "Tableau. Build down regardless of suit." msgstr "Игровой стол. Складывать по убыванию не считаясь с мастью." -#: pysollib/stack.py:1983 +#: pysollib/stack.py:2048 msgid "Tableau. Build up in any suit but the same." msgstr "Игровой стол. Складывать по возрастанию в любую масть кроме такой же." -#: pysollib/stack.py:1984 +#: pysollib/stack.py:2049 msgid "Tableau. Build down in any suit but the same." msgstr "Игровой стол. Складывать по убыванию в любую масть кроме такой же." -#: pysollib/stack.py:2006 +#: pysollib/stack.py:2071 msgid "" "Tableau. Build up regardless of suit. Sequences of cards in alternate color " "can be moved as a unit." @@ -1856,7 +1856,7 @@ msgstr "" "Игровой стол. Складывать по возрастанию не считаясь с мастью. Можно " "перемещать серии карт чередующихся цветом." -#: pysollib/stack.py:2007 +#: pysollib/stack.py:2072 msgid "" "Tableau. Build down regardless of suit. Sequences of cards in alternate " "color can be moved as a unit." @@ -1864,7 +1864,7 @@ msgstr "" "Игровой стол. Складывать по убыванию не считаясь с мастью. Можно перемещать " "серии карт чередующихся цветом." -#: pysollib/stack.py:2016 +#: pysollib/stack.py:2081 msgid "" "Tableau. Build up regardless of suit. Sequences of cards in the same suit " "can be moved as a unit." @@ -1872,7 +1872,7 @@ msgstr "" "Игровой стол. Складывать по возрастанию не считаясь с мастью. Можно " "перемещать серии карт одинаковой масти." -#: pysollib/stack.py:2017 +#: pysollib/stack.py:2082 msgid "" "Tableau. Build down regardless of suit. Sequences of cards in the same suit " "can be moved as a unit." @@ -1880,7 +1880,7 @@ msgstr "" "Игровой стол. Складывать по убыванию не считаясь с мастью. Можно перемещать " "серии карт одинаковой масти." -#: pysollib/stack.py:2039 +#: pysollib/stack.py:2104 msgid "" "Tableau. Build up by alternate color, can move any face-up cards regardless " "of sequence." @@ -1888,7 +1888,7 @@ msgstr "" "Игровой стол. Складывать по возрастанию чередуя цвет, можно перемещать любую " "серию открытых карт." -#: pysollib/stack.py:2040 +#: pysollib/stack.py:2105 msgid "" "Tableau. Build down by alternate color, can move any face-up cards " "regardless of sequence." @@ -1896,7 +1896,7 @@ msgstr "" "Игровой стол. Складывать по убыванию чередуя цвет, можно перемещать любую " "серию открытых карт." -#: pysollib/stack.py:2041 pysollib/stack.py:2054 +#: pysollib/stack.py:2106 pysollib/stack.py:2119 msgid "" "Tableau. Build by same rank, can move any face-up cards regardless of " "sequence." @@ -1904,14 +1904,14 @@ msgstr "" "Игровой стол. Складывать в соответствии с достоинством, можно перемещать " "любую серию открытых карт." -#: pysollib/stack.py:2052 +#: pysollib/stack.py:2117 msgid "" "Tableau. Build up by suit, can move any face-up cards regardless of sequence." msgstr "" "Игровой стол. Складывать по возрастанию в соответствии с мастью, можно " "перемещать любую серию открытых карт." -#: pysollib/stack.py:2053 +#: pysollib/stack.py:2118 msgid "" "Tableau. Build down by suit, can move any face-up cards regardless of " "sequence." @@ -1919,30 +1919,30 @@ msgstr "" "Игровой стол. Складывать по убыванию в соответствии с мастью, можно " "перемещать любую серию открытых карт." -#: pysollib/stack.py:2086 +#: pysollib/stack.py:2151 msgid "Tableau. Build up or down by color." msgstr "" "Игровой стол. Складывать по возрастанию или убыванию в соответствии с цветом." -#: pysollib/stack.py:2097 +#: pysollib/stack.py:2162 msgid "Tableau. Build up or down by alternate color." msgstr "Игровой стол. Складывать по возрастанию или убыванию чередуя цвет." -#: pysollib/stack.py:2108 +#: pysollib/stack.py:2173 msgid "Tableau. Build up or down by suit." msgstr "" "Игровой стол. Складывать по возрастанию или убыванию в соответствии с мастью." -#: pysollib/stack.py:2119 +#: pysollib/stack.py:2184 msgid "Tableau. Build up or down regardless of suit." msgstr "" "Игровой стол. Складывать по возрастанию или убыванию не считаясь с мастью." -#: pysollib/stack.py:2130 +#: pysollib/stack.py:2195 msgid "Waste." msgstr "Сброс." -#: pysollib/stack.py:2230 +#: pysollib/stack.py:2295 msgid "Free cell." msgstr "Свободная ячейка." @@ -1962,7 +1962,7 @@ msgstr "Выиграл" msgid "Lost" msgstr "Проиграл" -#: pysollib/stats.py:122 pysollib/tk/statusbar.py:157 +#: pysollib/stats.py:122 pysollib/tk/statusbar.py:156 msgid "Playing time" msgstr "Время игры" @@ -1986,7 +1986,7 @@ msgstr "Игра" msgid "Status" msgstr "Статус" -#: pysollib/stats.py:162 pysollib/tk/statusbar.py:159 +#: pysollib/stats.py:162 pysollib/tk/statusbar.py:158 #: pysollib/tk/tkstats.py:735 msgid "Game number" msgstr "Номер игры" @@ -2015,48 +2015,48 @@ msgstr "Не выиграл" msgid "Perfect" msgstr "Великолепная" -#: pysollib/tk/colorsdialog.py:73 +#: pysollib/tk/colorsdialog.py:71 msgid "Text foreground:" msgstr "Цвет текста:" -#: pysollib/tk/colorsdialog.py:79 pysollib/tk/colorsdialog.py:98 +#: pysollib/tk/colorsdialog.py:76 pysollib/tk/colorsdialog.py:94 #: pysollib/tk/fontsdialog.py:186 msgid "Change..." msgstr "Изменить..." -#: pysollib/tk/colorsdialog.py:85 pysollib/tk/timeoutsdialog.py:68 +#: pysollib/tk/colorsdialog.py:81 pysollib/tk/timeoutsdialog.py:68 msgid "Highlight piles:" msgstr "Подсветка групп:" -#: pysollib/tk/colorsdialog.py:86 +#: pysollib/tk/colorsdialog.py:82 msgid "Highlight cards 1:" msgstr "Подсветка карт 1:" -#: pysollib/tk/colorsdialog.py:87 +#: pysollib/tk/colorsdialog.py:83 msgid "Highlight cards 2:" msgstr "Подсветка карт 2:" -#: pysollib/tk/colorsdialog.py:88 +#: pysollib/tk/colorsdialog.py:84 msgid "Highlight same rank 1:" msgstr "Подсветка карт одного достоинства 1:" -#: pysollib/tk/colorsdialog.py:89 +#: pysollib/tk/colorsdialog.py:85 msgid "Highlight same rank 2:" msgstr "Подсветка карт одного достоинства 2:" -#: pysollib/tk/colorsdialog.py:90 +#: pysollib/tk/colorsdialog.py:86 msgid "Hint arrow:" msgstr "Стрелка подсказки:" -#: pysollib/tk/colorsdialog.py:91 +#: pysollib/tk/colorsdialog.py:87 msgid "Highlight not matching:" msgstr "Подсветка отсутствия совпадения:" -#: pysollib/tk/colorsdialog.py:124 +#: pysollib/tk/colorsdialog.py:114 msgid "Select color" msgstr "Выбрать цвет" -#: pysollib/tk/findcarddialog.py:52 pysollib/tk/menubar.py:329 +#: pysollib/tk/findcarddialog.py:52 pysollib/tk/menubar.py:328 msgid "Find card" msgstr "Найти карту" @@ -2104,491 +2104,487 @@ msgstr "Игровой стол маленький: " msgid "Select font" msgstr "Выбрать шрифт" -#: pysollib/tk/menubar.py:75 +#: pysollib/tk/menubar.py:74 msgid "Style" msgstr "Стиль" -#: pysollib/tk/menubar.py:84 +#: pysollib/tk/menubar.py:83 msgid "Relief" msgstr "Рельеф" -#: pysollib/tk/menubar.py:85 +#: pysollib/tk/menubar.py:84 msgid "Flat" msgstr "Плоский" -#: pysollib/tk/menubar.py:89 +#: pysollib/tk/menubar.py:88 msgid "Raised" msgstr "Выпуклый" -#: pysollib/tk/menubar.py:94 +#: pysollib/tk/menubar.py:93 msgid "Compound" msgstr "Компоновка" -#: pysollib/tk/menubar.py:100 +#: pysollib/tk/menubar.py:99 msgid "Hide" msgstr "Спрятать" -#: pysollib/tk/menubar.py:103 +#: pysollib/tk/menubar.py:102 msgid "Top" msgstr "Сверху" -#: pysollib/tk/menubar.py:106 +#: pysollib/tk/menubar.py:105 msgid "Bottom" msgstr "Внизу" -#: pysollib/tk/menubar.py:109 +#: pysollib/tk/menubar.py:108 msgid "Left" msgstr "Слева" -#: pysollib/tk/menubar.py:112 +#: pysollib/tk/menubar.py:111 msgid "Right" msgstr "Справа" -#: pysollib/tk/menubar.py:116 +#: pysollib/tk/menubar.py:115 msgid "Small icons" msgstr "Маленькие пиктограммы" -#: pysollib/tk/menubar.py:119 +#: pysollib/tk/menubar.py:118 msgid "Large icons" msgstr "Большие пиктограммы" -#: pysollib/tk/menubar.py:125 +#: pysollib/tk/menubar.py:124 msgid "Customize toolbar" msgstr "Настроить панель инструментов" -#: pysollib/tk/menubar.py:256 +#: pysollib/tk/menubar.py:255 msgid "&File" msgstr "&Файл" -#: pysollib/tk/menubar.py:258 +#: pysollib/tk/menubar.py:257 msgid "R&ecent games" msgstr "Выбрать н&едавнюю игру" -#: pysollib/tk/menubar.py:260 +#: pysollib/tk/menubar.py:259 msgid "Select &random game" msgstr "С&лучайная игра" -#: pysollib/tk/menubar.py:261 +#: pysollib/tk/menubar.py:260 msgid "&All games" msgstr "&Все игры" -#: pysollib/tk/menubar.py:262 +#: pysollib/tk/menubar.py:261 msgid "Games played and &won" msgstr "&Выигранные игры" -#: pysollib/tk/menubar.py:263 +#: pysollib/tk/menubar.py:262 msgid "Games played and ¬ won" msgstr "&Невыигранные игры" -#: pysollib/tk/menubar.py:264 +#: pysollib/tk/menubar.py:263 msgid "Games not &played" msgstr "Не&сыгранные игры" -#: pysollib/tk/menubar.py:265 +#: pysollib/tk/menubar.py:264 msgid "Select game by nu&mber..." msgstr "Выбрать игру по &номеру..." -#: pysollib/tk/menubar.py:267 +#: pysollib/tk/menubar.py:266 msgid "Fa&vorite games" msgstr "&Избранные игры" -#: pysollib/tk/menubar.py:268 +#: pysollib/tk/menubar.py:267 msgid "A&dd to favorites" msgstr "&Добавить в избранное" -#: pysollib/tk/menubar.py:269 +#: pysollib/tk/menubar.py:268 msgid "R&emove from favorites" msgstr "&Удалить из избранных" -#: pysollib/tk/menubar.py:271 +#: pysollib/tk/menubar.py:270 msgid "&Open..." msgstr "&Открыть..." -#: pysollib/tk/menubar.py:272 +#: pysollib/tk/menubar.py:271 msgid "&Save" msgstr "&Сохранить" -#: pysollib/tk/menubar.py:273 +#: pysollib/tk/menubar.py:272 msgid "Save &as..." msgstr "Сохранить &как..." -#: pysollib/tk/menubar.py:275 +#: pysollib/tk/menubar.py:274 msgid "&Hold and quit" msgstr "Со&храниться и выйти" -#: pysollib/tk/menubar.py:280 pysollib/tk/selectgame.py:407 +#: pysollib/tk/menubar.py:279 pysollib/tk/selectgame.py:407 msgid "&Select" msgstr "&Выбрать" -#: pysollib/tk/menubar.py:285 +#: pysollib/tk/menubar.py:284 msgid "&Edit" msgstr "Р&едактировать" -#: pysollib/tk/menubar.py:286 +#: pysollib/tk/menubar.py:285 msgid "&Undo" msgstr "&Отмена" -#: pysollib/tk/menubar.py:287 +#: pysollib/tk/menubar.py:286 msgid "&Redo" msgstr "&Повтор" -#: pysollib/tk/menubar.py:288 +#: pysollib/tk/menubar.py:287 msgid "Redo &all" msgstr "Вернуть все" -#: pysollib/tk/menubar.py:291 +#: pysollib/tk/menubar.py:290 msgid "&Set bookmark" msgstr "Установить &закладку" -#: pysollib/tk/menubar.py:293 pysollib/tk/menubar.py:297 +#: pysollib/tk/menubar.py:292 pysollib/tk/menubar.py:296 msgid "Bookmark %d" msgstr "Закладка %d" -#: pysollib/tk/menubar.py:295 +#: pysollib/tk/menubar.py:294 msgid "Go&to bookmark" msgstr "&Перейти к закладке" -#: pysollib/tk/menubar.py:300 +#: pysollib/tk/menubar.py:299 msgid "&Clear bookmarks" msgstr "О&чистить закладки" -#: pysollib/tk/menubar.py:303 -msgid "Restart &game" -msgstr "&Начать с начала" +#: pysollib/tk/menubar.py:302 pysollib/tk/toolbar.py:198 +msgid "Restart" +msgstr "Начало" -#: pysollib/tk/menubar.py:305 +#: pysollib/tk/menubar.py:304 msgid "&Game" msgstr "&Игра" -#: pysollib/tk/menubar.py:306 +#: pysollib/tk/menubar.py:305 msgid "&Deal cards" msgstr "&Сдать карты" -#: pysollib/tk/menubar.py:307 +#: pysollib/tk/menubar.py:306 msgid "&Auto drop" msgstr "С&бросить карты" -#: pysollib/tk/menubar.py:308 +#: pysollib/tk/menubar.py:307 msgid "&Pause" msgstr "&Пауза" -#: pysollib/tk/menubar.py:311 +#: pysollib/tk/menubar.py:310 msgid "S&tatus..." msgstr "С&татус" -#: pysollib/tk/menubar.py:312 +#: pysollib/tk/menubar.py:311 msgid "&Comments..." msgstr "&Комментарии..." -#: pysollib/tk/menubar.py:314 +#: pysollib/tk/menubar.py:313 msgid "&Statistics" msgstr "Ст&атистика" -#: pysollib/tk/menubar.py:315 pysollib/tk/menubar.py:323 +#: pysollib/tk/menubar.py:314 pysollib/tk/menubar.py:322 msgid "Current game..." msgstr "Текущая игра..." -#: pysollib/tk/menubar.py:316 pysollib/tk/menubar.py:324 +#: pysollib/tk/menubar.py:315 pysollib/tk/menubar.py:323 msgid "All games..." msgstr "Все игры..." -#: pysollib/tk/menubar.py:318 +#: pysollib/tk/menubar.py:317 msgid "Session log..." msgstr "Лог сессии..." -#: pysollib/tk/menubar.py:319 +#: pysollib/tk/menubar.py:318 msgid "Full log..." msgstr "Полный лог..." -#: pysollib/tk/menubar.py:322 +#: pysollib/tk/menubar.py:321 msgid "D&emo statistics" msgstr "Статистика демо" -#: pysollib/tk/menubar.py:326 +#: pysollib/tk/menubar.py:325 msgid "&Assist" msgstr "&Подсказка" -#: pysollib/tk/menubar.py:327 +#: pysollib/tk/menubar.py:326 msgid "&Hint" msgstr "Подсказать &ход" -#: pysollib/tk/menubar.py:328 +#: pysollib/tk/menubar.py:327 msgid "Highlight p&iles" msgstr "П&оказать группы" -#: pysollib/tk/menubar.py:331 +#: pysollib/tk/menubar.py:330 msgid "&Demo" msgstr "&Демо" -#: pysollib/tk/menubar.py:332 +#: pysollib/tk/menubar.py:331 msgid "Demo (&all games)" msgstr "Демо (&все игры)" -#: pysollib/tk/menubar.py:334 +#: pysollib/tk/menubar.py:333 msgid "Piles description" msgstr "Описания ячеек" -#: pysollib/tk/menubar.py:338 +#: pysollib/tk/menubar.py:337 msgid "&Options" msgstr "&Настройка" -#: pysollib/tk/menubar.py:339 +#: pysollib/tk/menubar.py:338 msgid "&Player options..." msgstr "Настройки &игрока..." -#: pysollib/tk/menubar.py:340 +#: pysollib/tk/menubar.py:339 msgid "&Automatic play" msgstr "Настройки &автоматической игры" -#: pysollib/tk/menubar.py:341 +#: pysollib/tk/menubar.py:340 msgid "Auto &face up" msgstr "Автоматически &переворачивать" -#: pysollib/tk/menubar.py:342 +#: pysollib/tk/menubar.py:341 msgid "A&uto drop" msgstr "А&втоматически сбрасывать карты" -#: pysollib/tk/menubar.py:343 +#: pysollib/tk/menubar.py:342 msgid "Auto &deal" msgstr "Автоматически &сдавать карты" -#: pysollib/tk/menubar.py:345 +#: pysollib/tk/menubar.py:344 msgid "&Quick play" msgstr "&Быстрая игра" -#: pysollib/tk/menubar.py:346 +#: pysollib/tk/menubar.py:345 msgid "Assist &level" msgstr "&Уровень подсказки" -#: pysollib/tk/menubar.py:347 +#: pysollib/tk/menubar.py:346 msgid "Enable &undo" msgstr "Разрешить &возврат хода" -#: pysollib/tk/menubar.py:348 +#: pysollib/tk/menubar.py:347 msgid "Enable &bookmarks" msgstr "Разрешить &закладки" -#: pysollib/tk/menubar.py:349 +#: pysollib/tk/menubar.py:348 msgid "Enable &hint" msgstr "Разрешить &подсказки" -#: pysollib/tk/menubar.py:350 +#: pysollib/tk/menubar.py:349 msgid "Enable highlight p&iles" msgstr "Разрешить показывать к&учи" -#: pysollib/tk/menubar.py:351 +#: pysollib/tk/menubar.py:350 msgid "Enable highlight &cards" msgstr "Разрешить показывать &карты" -#: pysollib/tk/menubar.py:352 +#: pysollib/tk/menubar.py:351 msgid "Enable highlight same &rank" msgstr "Разрешить показывать карты &одного достоинства" -#: pysollib/tk/menubar.py:353 +#: pysollib/tk/menubar.py:352 msgid "Highlight &no matching" msgstr "Подсветка отсутствия &совпадения" -#: pysollib/tk/menubar.py:355 +#: pysollib/tk/menubar.py:354 msgid "&Show removed tiles (in Mahjongg games)" msgstr "Показывать удаленные (в Маджонг)" -#: pysollib/tk/menubar.py:356 +#: pysollib/tk/menubar.py:355 msgid "Show hint &arrow (in Shisen-Sho games)" msgstr "Показывать стрелку (в Шисен-Сё)" -#: pysollib/tk/menubar.py:358 +#: pysollib/tk/menubar.py:357 msgid "&Sound..." msgstr "&Звук..." -#: pysollib/tk/menubar.py:366 +#: pysollib/tk/menubar.py:365 msgid "Cards&et..." msgstr "Коло&да..." -#: pysollib/tk/menubar.py:367 +#: pysollib/tk/menubar.py:366 msgid "Table t&ile..." msgstr "Игровой &стол..." -#: pysollib/tk/menubar.py:369 +#: pysollib/tk/menubar.py:368 msgid "Card &background" msgstr "&Рубашка карты" -#: pysollib/tk/menubar.py:370 +#: pysollib/tk/menubar.py:369 msgid "Card &view" msgstr "&Вид карты" -#: pysollib/tk/menubar.py:371 +#: pysollib/tk/menubar.py:370 msgid "Card shado&w" msgstr "Тень карты" -#: pysollib/tk/menubar.py:372 +#: pysollib/tk/menubar.py:371 msgid "Shade &legal moves" msgstr "Подсвечивать &разрешенные ходы" -#: pysollib/tk/menubar.py:373 +#: pysollib/tk/menubar.py:372 msgid "&Negative cards bottom" msgstr "&Негативные контуры карты" -#: pysollib/tk/menubar.py:374 +#: pysollib/tk/menubar.py:373 msgid "Shrink face-down cards" msgstr "Сжимать закрытые карты" -#: pysollib/tk/menubar.py:375 +#: pysollib/tk/menubar.py:374 msgid "Shade &filled stacks" msgstr "Затемнять заполненные ячейки" -#: pysollib/tk/menubar.py:376 +#: pysollib/tk/menubar.py:375 msgid "A&nimations" msgstr "Анимаци&я" -#: pysollib/tk/menubar.py:377 +#: pysollib/tk/menubar.py:376 msgid "&None" msgstr "&Нет" -#: pysollib/tk/menubar.py:378 +#: pysollib/tk/menubar.py:377 msgid "&Timer based" msgstr "Базирующаяся на &таймере" -#: pysollib/tk/menubar.py:379 +#: pysollib/tk/menubar.py:378 msgid "&Fast" msgstr "&Быстрая" -#: pysollib/tk/menubar.py:380 +#: pysollib/tk/menubar.py:379 msgid "&Slow" msgstr "&Медленная" -#: pysollib/tk/menubar.py:381 +#: pysollib/tk/menubar.py:380 msgid "&Very slow" msgstr "&Очень медленная" -#: pysollib/tk/menubar.py:382 +#: pysollib/tk/menubar.py:381 msgid "Stick&y mouse" msgstr "&Липкая мышь" -#: pysollib/tk/menubar.py:383 +#: pysollib/tk/menubar.py:382 msgid "Use mouse for undo/redo" msgstr "Использовать мышь для вперед/назад" -#: pysollib/tk/menubar.py:385 +#: pysollib/tk/menubar.py:384 msgid "&Fonts..." msgstr "&Шрифты..." -#: pysollib/tk/menubar.py:386 +#: pysollib/tk/menubar.py:385 msgid "&Colors..." msgstr "&Цвета..." -#: pysollib/tk/menubar.py:387 +#: pysollib/tk/menubar.py:386 msgid "Time&outs..." msgstr "Тайма&уты..." -#: pysollib/tk/menubar.py:389 +#: pysollib/tk/menubar.py:388 msgid "&Toolbar" msgstr "Панель и&нструментов" -#: pysollib/tk/menubar.py:391 +#: pysollib/tk/menubar.py:390 msgid "Stat&usbar" msgstr "Панель с&остояния" -#: pysollib/tk/menubar.py:392 +#: pysollib/tk/menubar.py:391 msgid "Show &statusbar" msgstr "Показывать панель состояния" -#: pysollib/tk/menubar.py:393 +#: pysollib/tk/menubar.py:392 msgid "Show &number of cards" msgstr "Показывать количество карт" -#: pysollib/tk/menubar.py:394 +#: pysollib/tk/menubar.py:393 msgid "Show &help bar" msgstr "Показывать панель помощи" -#: pysollib/tk/menubar.py:395 +#: pysollib/tk/menubar.py:394 msgid "Save games &geometry" msgstr "Сохранение &геометрии игры" -#: pysollib/tk/menubar.py:396 +#: pysollib/tk/menubar.py:395 msgid "&Demo logo" msgstr "Д&емо лого" -#: pysollib/tk/menubar.py:397 +#: pysollib/tk/menubar.py:396 msgid "Startup splash sc&reen" msgstr "О&кно запуска" -#: pysollib/tk/menubar.py:403 +#: pysollib/tk/menubar.py:402 msgid "&Help" msgstr "&Помощь" -#: pysollib/tk/menubar.py:404 +#: pysollib/tk/menubar.py:403 msgid "&Contents" msgstr "&Содержание" -#: pysollib/tk/menubar.py:405 +#: pysollib/tk/menubar.py:404 msgid "&How to play" msgstr "Как &играть" -#: pysollib/tk/menubar.py:406 +#: pysollib/tk/menubar.py:405 msgid "&Rules for this game" msgstr "&Правила текущей игры" -#: pysollib/tk/menubar.py:407 +#: pysollib/tk/menubar.py:406 msgid "&License terms" msgstr "&Лицензия" -#: pysollib/tk/menubar.py:410 +#: pysollib/tk/menubar.py:409 msgid "&About " msgstr "&О программе " -#: pysollib/tk/menubar.py:522 +#: pysollib/tk/menubar.py:521 msgid "All &games..." msgstr "&Все игры..." -#: pysollib/tk/menubar.py:524 +#: pysollib/tk/menubar.py:523 msgid "Playable pre&view..." msgstr "Играемый &предпросмотр..." -#: pysollib/tk/menubar.py:573 +#: pysollib/tk/menubar.py:572 msgid "&Mahjongg games" msgstr "Игры маджонг" -#: pysollib/tk/menubar.py:611 +#: pysollib/tk/menubar.py:610 msgid "&Popular games" msgstr "&Популярные игры" -#: pysollib/tk/menubar.py:619 +#: pysollib/tk/menubar.py:618 msgid "&French games" msgstr "&Классические игры" -#: pysollib/tk/menubar.py:626 +#: pysollib/tk/menubar.py:625 msgid "&Oriental games" msgstr "&Восточные игры" -#: pysollib/tk/menubar.py:634 +#: pysollib/tk/menubar.py:633 msgid "&Special games" msgstr "&Особые игры" -#: pysollib/tk/menubar.py:640 -msgid "All games by name" -msgstr "Все игры по имени" +#: pysollib/tk/menubar.py:639 +msgid "&All games by name" +msgstr "&Все игры по имени" -#: pysollib/tk/menubar.py:894 pysollib/tk/menubar.py:896 +#: pysollib/tk/menubar.py:1000 pysollib/tk/menubar.py:1002 #: pysollib/tk/selectcardset.py:240 msgid "&Load" msgstr "&Загрузить" -#: pysollib/tk/menubar.py:896 +#: pysollib/tk/menubar.py:1002 msgid "&Info..." msgstr "&Информация..." -#: pysollib/tk/menubar.py:899 +#: pysollib/tk/menubar.py:1005 msgid "Select " msgstr "Выбрать " -#: pysollib/tk/menubar.py:960 +#: pysollib/tk/menubar.py:1066 msgid "Select table background" msgstr "Выбрать фоновое изображение" -#: pysollib/tk/menubar.py:972 pysollib/tk/selecttile.py:177 -msgid "Select table color" -msgstr "Выбрать цвет" - #: pysollib/tk/playeroptionsdialog.py:112 msgid "" "\n" @@ -2972,6 +2968,10 @@ msgstr "Все фоновые изображения" msgid "&Solid color..." msgstr "М&онотонный цвет..." +#: pysollib/tk/selecttile.py:177 +msgid "Select table color" +msgstr "Выбрать цвет" + #: pysollib/tk/soundoptionsdialog.py:75 msgid "Are You Sure" msgstr "Вы уверены" @@ -3080,11 +3080,11 @@ msgstr "" "Изменения установок DirectX вступят в силу\n" "при следующем запуске " -#: pysollib/tk/statusbar.py:158 +#: pysollib/tk/statusbar.py:157 msgid "Moves/Total moves" msgstr "Ходов/Всего ходов" -#: pysollib/tk/statusbar.py:160 +#: pysollib/tk/statusbar.py:159 msgid "Games played: won/lost" msgstr "Игр: выиграно/проиграно" @@ -3108,35 +3108,35 @@ msgstr "Подсветка карты:" msgid "Highlight same rank:" msgstr "Подсветка одинаковых карт:" -#: pysollib/tk/tkconst.py:104 +#: pysollib/tk/tkconst.py:101 msgid "Icons only" msgstr "Только пиктограммы" -#: pysollib/tk/tkconst.py:105 +#: pysollib/tk/tkconst.py:102 msgid "Text below icons" msgstr "Текст под пиктограммами" -#: pysollib/tk/tkconst.py:106 +#: pysollib/tk/tkconst.py:103 msgid "Text beside icons" msgstr "Текст рядом с пиктограммами" -#: pysollib/tk/tkconst.py:107 +#: pysollib/tk/tkconst.py:104 msgid "Text only" msgstr "Только текст" -#: pysollib/tk/tkhtml.py:251 +#: pysollib/tk/tkhtml.py:252 msgid "Index" msgstr "Индекс" -#: pysollib/tk/tkhtml.py:255 +#: pysollib/tk/tkhtml.py:256 msgid "Back" msgstr "Назад" -#: pysollib/tk/tkhtml.py:259 +#: pysollib/tk/tkhtml.py:260 msgid "Forward" msgstr "Вперед" -#: pysollib/tk/tkhtml.py:263 +#: pysollib/tk/tkhtml.py:264 msgid "Close" msgstr "Закрыть" @@ -3333,10 +3333,6 @@ msgstr "TOP для текущей игры отсутствует" msgid "New" msgstr "Новая" -#: pysollib/tk/toolbar.py:198 -msgid "Restart" -msgstr "Начало" - #: pysollib/tk/toolbar.py:198 msgid "" "Restart the\n" @@ -3417,34 +3413,65 @@ msgstr "Установки игрока" msgid "Toolbar" msgstr "Панель инструментов" -#: pysollib/util.py:76 +#: pysollib/util.py:75 msgid "Club" msgstr "Треф" -#: pysollib/util.py:76 +#: pysollib/util.py:75 msgid "Diamond" msgstr "Буби" -#: pysollib/util.py:76 +#: pysollib/util.py:75 msgid "Heart" msgstr "Черви" -#: pysollib/util.py:76 +#: pysollib/util.py:75 msgid "Spade" msgstr "Пики" -#: pysollib/util.py:77 +#: pysollib/util.py:76 msgid "black" msgstr "черный" -#: pysollib/util.py:77 +#: pysollib/util.py:76 msgid "red" msgstr "красный" -#: pysollib/util.py:102 +#: pysollib/util.py:101 msgid "cardset" msgstr "набор карт" +#: data/glade-translations:7 +msgid "Game Statistics" +msgstr "Статистика игры" + +#: data/glade-translations:8 data/glade-translations:28 +msgid "Game:" +msgstr "Игра:" + +#: data/glade-translations:17 +msgid "Current game" +msgstr "Текущая игра" + +#: data/glade-translations:24 +msgid "Summary" +msgstr "Сводка" + +#: data/glade-translations:27 +msgid "Total moves" +msgstr "Всего ходов" + +#: data/glade-translations:30 +msgid "All games" +msgstr "Все игры" + +#: data/glade-translations:57 +msgid "Set font" +msgstr "Настроить шрифт" + +#~ msgid "Restart &game" +#~ msgstr "&Начать с начала" + #~ msgid "Balance $%4d" #~ msgstr "Баланс $%4d" diff --git a/pysollib/actions.py b/pysollib/actions.py index 5a0b06c1..a91fa60d 100644 --- a/pysollib/actions.py +++ b/pysollib/actions.py @@ -1,4 +1,3 @@ -## -*- coding: utf-8 -*- ## vim:ts=4:et:nowrap ## ##---------------------------------------------------------------------------## @@ -42,7 +41,6 @@ import os, re, sys, string, time, types, locale from mfxutil import EnvError, SubclassResponsibility from mfxutil import Struct, destruct, openURL from pysolrandom import constructRandom -from version import VERSION from settings import PACKAGE, PACKAGE_URL from settings import TOP_TITLE from gamedb import GI @@ -68,7 +66,7 @@ from pysoltk import FontsDialog from pysoltk import EditTextDialog from pysoltk import TOOLBAR_BUTTONS from pysoltk import create_find_card_dialog, connect_game_find_card_dialog, destroy_find_card_dialog -from help import helpAbout, helpHTML +from help import help_about, help_html gettext = _ @@ -875,11 +873,11 @@ class PysolMenubarActions: def mHelp(self, *args): if self._cancelDrag(break_pause=False): return - helpHTML(self.app, "index.html", "html") + help_html(self.app, "index.html", "html") def mHelpHowToPlay(self, *args): if self._cancelDrag(break_pause=False): return - helpHTML(self.app, "howtoplay.html", "html") + help_html(self.app, "howtoplay.html", "html") def mHelpRules(self, *args): if self._cancelDrag(break_pause=False): return @@ -887,22 +885,22 @@ class PysolMenubarActions: return dir = os.path.join("html", "rules") ## FIXME: plugins - helpHTML(self.app, self.app.getGameRulesFilename(self.game.id), dir) + help_html(self.app, self.app.getGameRulesFilename(self.game.id), dir) def mHelpLicense(self, *args): if self._cancelDrag(break_pause=False): return - helpHTML(self.app, "license.html", "html") + help_html(self.app, "license.html", "html") def mHelpNews(self, *args): if self._cancelDrag(break_pause=False): return - helpHTML(self.app, "news.html", "html") + help_html(self.app, "news.html", "html") def mHelpWebSite(self, *args): openURL(PACKAGE_URL) def mHelpAbout(self, *args): if self._cancelDrag(break_pause=False): return - helpAbout(self.app) + help_about(self.app) # # misc diff --git a/pysollib/app.py b/pysollib/app.py index 0ebdd5eb..3af70717 100644 --- a/pysollib/app.py +++ b/pysollib/app.py @@ -45,8 +45,7 @@ from mfxutil import getusername, gethomedir, getprefdir, EnvError from mfxutil import latin1_to_ascii from util import Timer from util import CARDSET, IMAGE_EXTENSIONS -from version import VERSION, VERSION_TUPLE -from settings import PACKAGE, PACKAGE_URL +from settings import PACKAGE, PACKAGE_URL, VERSION, VERSION_TUPLE from resource import CSI, CardsetConfig, Cardset, CardsetManager from resource import Tile, TileManager from resource import Sample, SampleManager @@ -67,10 +66,10 @@ from pysoltk import PysolToolbar from pysoltk import PysolStatusbar, HelpStatusbar from pysoltk import SelectCardsetDialogWithPreview from pysoltk import SelectDialogTreeData -from pysoltk import tkHTMLViewer +from pysoltk import HTMLViewer from pysoltk import TOOLBAR_BUTTONS from pysoltk import destroy_find_card_dialog -from help import helpAbout, destroy_help +from help import help_about, destroy_help_html gettext = _ @@ -714,7 +713,7 @@ class Application: self.wm_withdraw() # destroy_find_card_dialog() - destroy_help() + destroy_help_html() # update options self.opt.last_gameid = id # save options @@ -792,7 +791,7 @@ class Application: self.nextgame.bookmark = None # splash screen if self.opt.splashscreen and self.splashscreen > 0: - status = helpAbout(self, timeout=20000, sound=0) + status = help_about(self, timeout=20000, sound=0) if status == 2: # timeout - start a demo if autoplay: self.nextgame.startdemo = 1 @@ -901,7 +900,7 @@ class Application: dir = os.path.join('images', 'htmlviewer') # fn = self.dataloader.findImage('disk', dir) - tkHTMLViewer.symbols_fn['disk'] = fn + HTMLViewer.symbols_fn['disk'] = fn def loadImages4(self): # load all remaining images diff --git a/pysollib/game.py b/pysollib/game.py index 3a1d7508..e3c10b05 100644 --- a/pysollib/game.py +++ b/pysollib/game.py @@ -45,8 +45,7 @@ from mfxutil import UnpicklingError, uclock, usleep from mfxutil import format_time from util import get_version_tuple, Timer from util import ACE, QUEEN, KING -from version import VERSION, VERSION_TUPLE -from settings import PACKAGE, TOOLKIT, TOP_TITLE +from settings import PACKAGE, TOOLKIT, TOP_TITLE, VERSION, VERSION_TUPLE from gamedb import GI from resource import CSI from pysolrandom import PysolRandom, LCRandom31 @@ -63,7 +62,7 @@ from move import ANextRoundMove, ASaveSeedMove, AShuffleStackMove from move import AUpdateStackMove, AFlipAllMove, ASaveStateMove from move import ACloseStackMove, ASingleCardMove from hint import DefaultHint -from help import helpAbout +from help import help_about PLAY_TIME_TIMEOUT = 200 @@ -1891,7 +1890,7 @@ for %d moves. self.app.demo_counter = self.app.demo_counter + 1 if self.app.demo_counter % 3 == 0: if self.top.winfo_ismapped(): - status = helpAbout(self.app, timeout=10000) + status = help_about(self.app, timeout=10000) if self.demo and status == 2: # timeout in dialog - start another demo demo = self.demo diff --git a/pysollib/games/calculation.py b/pysollib/games/calculation.py index 8cfad24d..f4a82c92 100644 --- a/pysollib/games/calculation.py +++ b/pysollib/games/calculation.py @@ -41,7 +41,7 @@ from pysollib.stack import * from pysollib.game import Game from pysollib.layout import Layout from pysollib.hint import AbstractHint, DefaultHint, CautiousDefaultHint -from pysollib.pysoltk import MfxCanvasText, getTextWidth +from pysollib.pysoltk import MfxCanvasText, get_text_width # /*********************************************************************** # // @@ -127,8 +127,8 @@ class Calculation(Game): lines = help.split('\n') lines.sort(lambda a, b: cmp(len(a), len(b))) max_line = lines[-1] - text_width = getTextWidth(max_line, - font=self.app.getFont("canvas_fixed")) + text_width = get_text_width(max_line, + font=self.app.getFont("canvas_fixed")) return help, text_width def createGame(self): diff --git a/pysollib/games/mahjongg/mahjongg.py b/pysollib/games/mahjongg/mahjongg.py index c994ce7d..379be556 100644 --- a/pysollib/games/mahjongg/mahjongg.py +++ b/pysollib/games/mahjongg/mahjongg.py @@ -40,6 +40,7 @@ from pysollib.layout import Layout from pysollib.hint import AbstractHint, DefaultHint, CautiousDefaultHint from pysollib.pysoltk import MfxCanvasText, MfxCanvasImage, bind, \ EVENT_HANDLED, ANCHOR_NW +from pysollib.settings import TOOLKIT def factorial(x): @@ -191,14 +192,20 @@ class Mahjongg_RowStack(OpenStack): def _position(self, card): OpenStack._position(self, card) # - rows = filter(lambda s: s.cards, self.game.s.rows[:self.id]) - if rows: - self.group.tkraise(rows[-1].group) - return - rows = filter(lambda s: s.cards, self.game.s.rows[self.id+1:]) - if rows: - self.group.lower(rows[0].group) - return + if TOOLKIT == 'tk': + rows = filter(lambda s: s.cards, self.game.s.rows[:self.id]) + if rows: + self.group.tkraise(rows[-1].group) + return + rows = filter(lambda s: s.cards, self.game.s.rows[self.id+1:]) + if rows: + self.group.lower(rows[0].group) + return + elif TOOLKIT == 'gtk': + # FIXME (this is very slow) + for s in self.game.s.rows[self.id+1:]: + s.group.tkraise() + # In Mahjongg games type there are a lot of stacks, so we optimize # and don't create bindings that are not used anyway. @@ -259,16 +266,16 @@ class Mahjongg_RowStack(OpenStack): img = drag.shade_img img.dtag(drag.shade_stack.group) img.moveTo(self.x, self.y) + img.addtag(self.group) else: img = game.app.images.getShade() if img is None: return 1 - img = MfxCanvasImage(game.canvas, self.x, self.y, - image=img, anchor=ANCHOR_NW) + img = MfxCanvasImage(game.canvas, self.x, self.y, image=img, + anchor=ANCHOR_NW, group=self.group) drag.shade_img = img # raise/lower the shade image to the correct stacking order img.tkraise(self.cards[-1].item) - img.addtag(self.group) drag.shade_stack = self return 1 @@ -462,8 +469,13 @@ class AbstractMahjonggGame(Game): x = l.XM+i*cardw y = l.YM+fdyy+j*cardh else: - x = -l.XS - y = l.YM+dyy + if TOOLKIT == 'tk': + x = -l.XS + y = l.YM+dyy + elif TOOLKIT == 'gtk': + # FIXME + x = self.width -l.XS + y = self.height - l.YS stack = Mahjongg_Foundation(x, y, self) if show_removed: stack.CARD_XOFFSET = dx diff --git a/pysollib/help.py b/pysollib/help.py index 28dfeca4..5a51aee5 100644 --- a/pysollib/help.py +++ b/pysollib/help.py @@ -41,11 +41,10 @@ import Tkinter # PySol imports from mfxutil import EnvError -from settings import PACKAGE, PACKAGE_URL, TOOLKIT -from version import VERSION, FC_VERSION -from pysoltk import makeHelpToplevel, wm_map, wm_set_icon +from settings import PACKAGE, PACKAGE_URL, TOOLKIT, VERSION, FC_VERSION +from pysoltk import make_help_toplevel, wm_map, wm_set_icon from pysoltk import MfxMessageDialog -from pysoltk import tkHTMLViewer +from pysoltk import HTMLViewer from gamedb import GAME_DB # /*********************************************************************** @@ -58,7 +57,7 @@ class AboutDialog(MfxMessageDialog): return top_frame, bottom_frame -def helpAbout(app, timeout=0, sound=1): +def help_about(app, timeout=0, sound=1): if sound: app.audio.playSample("about") t = _("A Python Solitaire Game Collection\n") @@ -87,18 +86,18 @@ For more information about this application visit strings=strings, default=0, separatorwidth=2) if d.status == 0 and d.button == 1: - helpCredits(app, sound=sound) + help_credits(app, sound=sound) return d.status -def helpCredits(app, timeout=0, sound=1): +def help_credits(app, timeout=0, sound=1): if sound: app.audio.playSample("credits") t = "" - if TOOLKIT == "tk": t = "Tcl/Tk, " - elif TOOLKIT == "gtk": t = "PyGTK, " - elif TOOLKIT == "kde": t = "pyKDE, " - elif TOOLKIT == "wx": t = "wxPython, " + if TOOLKIT == "tk" : t = "Tcl/Tk" + elif TOOLKIT == "gtk": t = "PyGTK" + elif TOOLKIT == "kde": t = "pyKDE" + elif TOOLKIT == "wx" : t = "wxPython" d = MfxMessageDialog(app.top, title=_("Credits"), timeout=timeout, text=PACKAGE+_(''' credits go to: @@ -123,7 +122,7 @@ for making this program possible''') % t, help_html_viewer = None help_html_index = None -def helpHTML(app, document, dir_, top=None): +def help_html(app, document, dir_, top=None): global help_html_viewer, help_html_index if not document: return None @@ -149,7 +148,7 @@ def helpHTML(app, document, dir_, top=None): viewer.display(doc, relpath=0) except: ##traceback.print_exc() - top = makeHelpToplevel(app, title=PACKAGE+_(" Help")) + top = make_help_toplevel(app, title=PACKAGE+_(" Help")) if top.winfo_screenwidth() < 800 or top.winfo_screenheight() < 600: #maximized = 1 top.wm_minsize(300, 150) @@ -160,14 +159,14 @@ def helpHTML(app, document, dir_, top=None): wm_set_icon(top, app.dataloader.findIcon()) except: pass - viewer = tkHTMLViewer(top, app, help_html_index) + viewer = HTMLViewer(top, app, help_html_index) viewer.display(doc) #wm_map(top, maximized=maximized) viewer.parent.tkraise() help_html_viewer = viewer return viewer -def destroy_help(): +def destroy_help_html(): try: help_html_viewer.destroy() except: diff --git a/pysollib/images.py b/pysollib/images.py index 091c0ff7..3a2995a4 100644 --- a/pysollib/images.py +++ b/pysollib/images.py @@ -38,7 +38,6 @@ import os, types # PySol imports -from version import VERSION, VERSION_TUPLE from mfxutil import Pickler, Unpickler, UnpicklingError from mfxutil import Struct, EnvError diff --git a/pysollib/main.py b/pysollib/main.py index 6f1dab6f..a4e1dcb8 100644 --- a/pysollib/main.py +++ b/pysollib/main.py @@ -43,8 +43,7 @@ import gettext # PySol imports from mfxutil import destruct, EnvError from util import CARDSET, DataLoader -from version import VERSION -from settings import PACKAGE, TOOLKIT +from settings import PACKAGE, TOOLKIT, VERSION from resource import Tile from gamedb import GI from app import Application diff --git a/pysollib/pysolgtk/colorsdialog.py b/pysollib/pysolgtk/colorsdialog.py index d7fefbbc..ac8e6818 100644 --- a/pysollib/pysolgtk/colorsdialog.py +++ b/pysollib/pysolgtk/colorsdialog.py @@ -40,15 +40,6 @@ gettext = _ class ColorsDialog: -## self.app.opt.table_text_color = d.table_text_color -## self.app.opt.table_text_color_value = d.table_text_color_value -## ##self.app.opt.table_color = d.table_color -## self.app.opt.highlight_piles_colors = d.highlight_piles_colors -## self.app.opt.highlight_cards_colors = d.highlight_cards_colors -## self.app.opt.highlight_samerank_colors = d.highlight_samerank_colors -## self.app.opt.hintarrow_color = d.hintarrow_color -## self.app.opt.highlight_not_matching_color = d.highlight_not_matching_color - def __init__(self, parent, title, app, **kw): glade_file = app.dataloader.findFile('pysolfc.glade') @@ -65,10 +56,9 @@ class ColorsDialog: 'not_matching', ) for n in keys: - label = self.widgets_tree.get_widget(n+'_label') - self._setColor(label, app.opt.colors[n]) + self._setColor(n, app.opt.colors[n]) button = self.widgets_tree.get_widget(n+'_button') - button.connect('clicked', self._changeColor, n, label) + button.connect('clicked', self._changeColor, n) checkbutton = self.widgets_tree.get_widget('use_default_checkbutton') checkbutton.set_active(not app.opt.use_default_text_color) @@ -78,7 +68,6 @@ class ColorsDialog: self.dialog = dialog dialog.set_title(title) dialog.set_transient_for(parent) - dialog.set_position(gtk.WIN_POS_CENTER_ON_PARENT) self.status = -1 self.button = -1 @@ -95,16 +84,16 @@ class ColorsDialog: dialog.destroy() - def _setColor(self, label, color): - c = gdk.color_parse(color) - al = pango.AttrList() - al.insert(pango.AttrBackground(c.red, c.green, c.blue, 0, 10)) - label.set_attributes(al) + def _setColor(self, name, color): + label = self.widgets_tree.get_widget(name+'_label') + eventbox = self.widgets_tree.get_widget(name+'_eventbox') + eventbox.modify_bg(gtk.STATE_NORMAL, gdk.color_parse(color)) label.set_data('user_data', color) + label.set_text(color) - def _changeColor(self, w, name, label): - print '_changeColor', name + def _changeColor(self, w, name): + label = self.widgets_tree.get_widget(name+'_label') color = label.get_data('user_data') dialog = gtk.ColorSelectionDialog(_('Select color')) dialog.help_button.destroy() @@ -115,7 +104,7 @@ class ColorsDialog: if response == gtk.RESPONSE_OK: c = dialog.colorsel.get_current_color() c = '#%02x%02x%02x' % (c.red/256, c.green/256, c.blue/256) - self._setColor(label, c) + self._setColor(name, c) dialog.destroy() @@ -128,8 +117,17 @@ class ColorsDialog: 'label35', 'label36', 'label37', + 'label46', + 'label47', + 'label48', + 'label49', + 'label50', + 'label51', + 'label52', + 'label53', ): w = self.widgets_tree.get_widget(n) w.set_text(gettext(w.get_text())) - + w = self.widgets_tree.get_widget('use_default_checkbutton') + w.set_label(gettext(w.get_label())) diff --git a/pysollib/pysolgtk/fontsdialog.py b/pysollib/pysolgtk/fontsdialog.py index d99e4853..67211c8a 100644 --- a/pysollib/pysolgtk/fontsdialog.py +++ b/pysollib/pysolgtk/fontsdialog.py @@ -24,26 +24,128 @@ __all__ = ['FontsDialog'] # imports ## import os, sys ## import types -## import Tkinter -## import tkFont import gtk, gobject, pango import gtk.glade # PySol imports -## from pysollib.mfxutil import destruct, kwdefault, KwStruct, Struct + +from tkutil import create_pango_font_desc # Toolkit imports -## from tkconst import EVENT_HANDLED, EVENT_PROPAGATE -## from tkutil import bind +gettext = _ + # /*********************************************************************** # // # ************************************************************************/ class FontsDialog: + def __init__(self, parent, title, app, **kw): - pass + glade_file = app.dataloader.findFile('pysolfc.glade') + self.widgets_tree = gtk.glade.XML(glade_file) + + keys = ( + 'sans', + 'small', + 'fixed', + 'canvas_default', + 'canvas_fixed', + 'canvas_large', + 'canvas_small', + ) + + for n in keys: + font = app.opt.fonts[n] + self._setFont(n, font) + button = self.widgets_tree.get_widget(n+'_button') + button.connect('clicked', self._changeFont, n) + + self._translateLabels() + + dialog = self.widgets_tree.get_widget('fonts_dialog') + self.dialog = dialog + dialog.set_title(title) + dialog.set_transient_for(parent) + + self.status = -1 + self.button = -1 + self.fonts = {} + response = dialog.run() + if response == gtk.RESPONSE_OK: + self.status = 0 + self.button = 0 + for n in keys: + label = self.widgets_tree.get_widget(n+'_label') + font = label.get_data('user_data') + self.fonts[n] = font + + dialog.destroy() + + + def _setFont(self, name, font): + label = self.widgets_tree.get_widget(name+'_label') + font_desc = create_pango_font_desc(font) + label.modify_font(font_desc) + text = ' '.join([str(i) for i in font if not i in ('roman', 'normal')]) + label.set_text(text) + label.set_data('user_data', font) + + + def _changeFont(self, w, name): + label = self.widgets_tree.get_widget(name+'_label') + font = label.get_data('user_data') + dialog = gtk.FontSelectionDialog(_('Select color')) + dialog.set_transient_for(self.dialog) + dialog.set_position(gtk.WIN_POS_CENTER_ON_PARENT) + font_name = font[0] + bi = [] + if 'bold' in font: + bi.append('bold') + if 'italic' in font: + bi.append('italic') + if bi: + bi = ' '.join(bi) + font_name += ', '+bi + font_name += ' '+str(font[1]) + dialog.fontsel.set_font_name(font_name) + response = dialog.run() + if response == gtk.RESPONSE_OK: + font = dialog.fontsel.get_font_name() + fd = pango.FontDescription(font) + family = fd.get_family() + size = fd.get_size()/pango.SCALE + style = (fd.get_style() == pango.STYLE_NORMAL + and 'roman' or 'italic') + weight = (fd.get_weight() == pango.WEIGHT_NORMAL + and 'normal' or 'bold') + font = (family, size, style, weight) + self._setFont(name, font) + + dialog.destroy() + + + def _translateLabels(self): + for n in ( + 'label54', + 'label55', + 'label56', + 'label57', + 'label58', + 'label59', + 'label60', + 'label69', + 'label70', + 'label71', + 'label72', + 'label73', + 'label74', + 'label75', + ): + w = self.widgets_tree.get_widget(n) + w.set_text(gettext(w.get_text())) + diff --git a/pysollib/pysolgtk/menubar.py b/pysollib/pysolgtk/menubar.py index ced06062..26f817af 100644 --- a/pysollib/pysolgtk/menubar.py +++ b/pysollib/pysolgtk/menubar.py @@ -196,12 +196,15 @@ class PysolMenubar(PysolMenubarActions): ('cardset', None, ltk2gtk('Cards&et...'), 'E', None, self.mSelectCardsetDialog), - ('timeouts', None, - ltk2gtk('Time&outs...'), None, - None, self.mOptTimeouts), + ('fonts', None, + ltk2gtk('&Fonts...'), None, + None, self.mOptFonts), ('colors', None, ltk2gtk('&Colors...'), None, None, self.mOptColors), + ('timeouts', None, + ltk2gtk('Time&outs...'), None, + None, self.mOptTimeouts), ('contents', None, ltk2gtk('&Contents'), 'F1', None, self.mHelp), @@ -375,6 +378,7 @@ class PysolMenubar(PysolMenubarActions): + diff --git a/pysollib/pysolgtk/progressbar.py b/pysollib/pysolgtk/progressbar.py index 82e8e6c3..378b45ee 100644 --- a/pysollib/pysolgtk/progressbar.py +++ b/pysollib/pysolgtk/progressbar.py @@ -95,13 +95,13 @@ class PysolProgressBar: im.set_property('xpad', 10) im.set_property('ypad', 5) # set icon - if app: - try: - name = app.dataloader.findFile('pysol.xpm') - bg = self.top.get_style().bg[gtk.STATE_NORMAL] - pixmap, mask = create_pixmap_from_xpm(self.top, bg, name) - self.top.set_icon(pixmap, mask) - except: pass +## if app: +## try: +## name = app.dataloader.findFile('pysol.xpm') +## bg = self.top.get_style().bg[gtk.STATE_NORMAL] +## pixmap, mask = create_pixmap_from_xpm(self.top, bg, name) +## self.top.set_icon(pixmap, mask) +## except: pass setTransient(self.top, parent) self.top.show() self.top.window.set_cursor(gdk.Cursor(gdk.WATCH)) diff --git a/pysollib/pysolgtk/selectgame.py b/pysollib/pysolgtk/selectgame.py index f297d209..741e9418 100644 --- a/pysollib/pysolgtk/selectgame.py +++ b/pysollib/pysolgtk/selectgame.py @@ -45,7 +45,7 @@ from pysollib.mfxutil import destruct, Struct, KwStruct from pysollib.mfxutil import kwdefault from pysollib.mfxutil import format_time from pysollib.gamedb import GI -from pysollib.help import helpHTML +from pysollib.help import help_html from pysollib.resource import CSI # Toolkit imports @@ -539,7 +539,7 @@ class SelectGameDialogWithPreview(MfxDialog): if not doc: return dir = os.path.join("html", "rules") - helpHTML(self.app, doc, dir, self) + help_html(self.app, doc, dir, self) return self.status = 0 diff --git a/pysollib/pysolgtk/timeoutsdialog.py b/pysollib/pysolgtk/timeoutsdialog.py index 4d98ef31..f7793228 100644 --- a/pysollib/pysolgtk/timeoutsdialog.py +++ b/pysollib/pysolgtk/timeoutsdialog.py @@ -79,7 +79,6 @@ class TimeoutsDialog: dialog = self.widgets_tree.get_widget('timeouts_dialog') dialog.set_title(title) dialog.set_transient_for(parent) - dialog.set_position(gtk.WIN_POS_CENTER_ON_PARENT) self.status = -1 self.button = -1 diff --git a/pysollib/pysolgtk/tkcanvas.py b/pysollib/pysolgtk/tkcanvas.py index 43ff8751..0769fdfc 100644 --- a/pysollib/pysolgtk/tkcanvas.py +++ b/pysollib/pysolgtk/tkcanvas.py @@ -52,13 +52,13 @@ import os, sys, types import gobject -import gtk +import gtk, pango from gtk import gdk import gnome.canvas TRUE, FALSE = True, False # toolkit imports -from tkutil import anchor_tk2gtk, loadImage, bind +from tkutil import anchor_tk2gtk, loadImage, bind, create_pango_font_desc # /*********************************************************************** @@ -147,7 +147,7 @@ class _CanvasItem: self._is_hidden = True def connect(self, signal, func, args): - ##print signal + #print '_CanvasItem.connect:', self, signal self._item.connect('event', func, args) @@ -252,7 +252,7 @@ class MfxCanvasText(_CanvasItem): kw['fill'] = canvas._text_color for k, v in kw.items(): self[k] = v - self.text_format = None + ##~ self.text_format = None canvas._text_items.append(self) self._item.show() @@ -260,7 +260,9 @@ class MfxCanvasText(_CanvasItem): if key == 'fill': self._item.set(fill_color=value) elif key == 'font': - self._item.set(font=value) + ##print 'set font:', value + font_desc = create_pango_font_desc(value) + self._item.set(font_desc=font_desc) elif key == 'text': self._item.set(text=value) else: @@ -300,19 +302,16 @@ class MfxCanvas(gnome.canvas.Canvas): self._text_color = '#000000' # gnome.canvas.Canvas.__init__(self) - style = self.get_style().copy() - if bg is not None: - c = self.get_colormap().alloc(bg) - style.bg[gtk.STATE_NORMAL] = c - self.set_style(style) self.top_bg = top.style.bg[gtk.STATE_NORMAL] + if bg is not None: + self.modify_bg(gtk.STATE_NORMAL, gdk.color_parse(bg)) - ## + # self.top = top self.xmargin, self.ymargin = 0, 0 self.connect('size-allocate', self._sizeAllocate) - self.connect('destroy', self.destroyEvent) + ##self.connect('destroy', self.destroyEvent) def __setattr__(self, name, value): @@ -363,9 +362,7 @@ class MfxCanvas(gnome.canvas.Canvas): height, width = -1, -1 for k, v in kw.items(): if k in ('background', 'bg'): - ##print 'configure: bg:', v - c = self.get_colormap().alloc_color(v) - self.style.bg[gtk.STATE_NORMAL] = c + self.modify_bg(gtk.STATE_NORMAL, gdk.color_parse(v)) elif k == 'cursor': if not self.window: self.realize() @@ -390,9 +387,6 @@ class MfxCanvas(gnome.canvas.Canvas): i._item.destroy() ##i._item = None self._all_items = [] - if 0: #self.__tileimage: - self.__tileimage.destroy() - self.__tileimage = None def hideAllItems(self): self._hidden_items = [] diff --git a/pysollib/pysolgtk/tkhtml.py b/pysollib/pysolgtk/tkhtml.py index 607463d5..463ff81d 100644 --- a/pysollib/pysolgtk/tkhtml.py +++ b/pysollib/pysolgtk/tkhtml.py @@ -33,7 +33,7 @@ ## ##---------------------------------------------------------------------------## -__all__ = ['tkHTMLViewer'] +__all__ = ['HTMLViewer'] # imports import os, sys, re, types @@ -70,7 +70,7 @@ class tkHTMLWriter(formatter.NullWriter): formatter.NullWriter.__init__(self) self.text = text # gtk.TextBuffer - self.viewer = viewer # tkHTMLViewer + self.viewer = viewer # HTMLViewer self.anchor = None self.anchor_mark = None @@ -197,7 +197,7 @@ class tkHTMLParser(htmllib.HTMLParser): # // # ************************************************************************/ -class tkHTMLViewer: +class HTMLViewer: symbols_fn = {} # filenames, loaded in Application.loadImages3 symbols_img = {} @@ -581,7 +581,7 @@ def tkhtml_main(args): table.show() top.add(table) top.table = table - viewer = tkHTMLViewer(top) + viewer = HTMLViewer(top) viewer.app = None viewer.display(url) top.connect('destroy', lambda w: gtk.main_quit()) diff --git a/pysollib/pysolgtk/tkstats.py b/pysollib/pysolgtk/tkstats.py index 9e02ee7a..28e2281d 100644 --- a/pysollib/pysolgtk/tkstats.py +++ b/pysollib/pysolgtk/tkstats.py @@ -168,6 +168,7 @@ class Game_StatsDialog: def _translateLabels(self): # mnemonic for n in ( + 'label0', 'label1', 'label2', 'label3', diff --git a/pysollib/pysolgtk/tkutil.py b/pysollib/pysolgtk/tkutil.py index 9f8fbc95..489f7a8a 100644 --- a/pysollib/pysolgtk/tkutil.py +++ b/pysollib/pysolgtk/tkutil.py @@ -253,8 +253,8 @@ def bind(widget, sequence, func, add=None): widget.connect(signal, _wrap_event, l) __bindings[k] = l + def unbind_destroy(widget): - return k = id(widget) if __bindings.has_key(k): ## FIXME @@ -282,12 +282,20 @@ def after_cancel(t): # // font # ************************************************************************/ -def getTextWidth(text, font=None, root=None): +def create_pango_font_desc(font): + font_desc = pango.FontDescription(font[0]+' '+str(font[1])) + if 'italic' in font: + font_desc.set_style(pango.STYLE_ITALIC) + if 'bold' in font: + font_desc.set_weight(pango.WEIGHT_BOLD) + return font_desc + + +def get_text_width(text, font=None, root=None): if root: - pango_font_desc = pango.FontDescription(font[0]+' '+str(font[1])) + pango_font_desc = create_pango_font_desc(font) pangolayout = root.create_pango_layout(text) width = pangolayout.get_pixel_extents()[1][2] return width return 0 - diff --git a/pysollib/pysolgtk/tkwrap.py b/pysollib/pysolgtk/tkwrap.py index 7813fcc1..b4fb77c7 100644 --- a/pysollib/pysolgtk/tkwrap.py +++ b/pysollib/pysolgtk/tkwrap.py @@ -50,7 +50,7 @@ from tkutil import makeToplevel, loadImage class TclError: pass -def makeHelpToplevel(parent, title=None, class_=None): +def make_help_toplevel(parent, title=None, class_=None): return makeToplevel(parent, title=title, class_=class_, gtkclass=_MfxToplevel) @@ -219,6 +219,7 @@ class _MfxToplevel(gtk.Window): pass def wm_iconbitmap(self, name): + print 'wm_iconbitmap:', name if name and name[0] == '@' and name[-4:] == '.xbm': name = name[1:-4] + '.xpm' bg = self.get_style().bg[gtk.STATE_NORMAL] diff --git a/pysollib/resource.py b/pysollib/resource.py index 038c67c6..12935e33 100644 --- a/pysollib/resource.py +++ b/pysollib/resource.py @@ -41,8 +41,7 @@ import sys, os, glob, operator, types # PySol imports from mfxutil import win32api from mfxutil import Struct, KwStruct, EnvError, latin1_to_ascii -from version import VERSION -from settings import PACKAGE +from settings import PACKAGE, VERSION # /*********************************************************************** diff --git a/pysollib/settings.py b/pysollib/settings.py index 70cb08f8..9841f870 100644 --- a/pysollib/settings.py +++ b/pysollib/settings.py @@ -24,9 +24,13 @@ import sys, os n_ = lambda x: x # -#PACKAGE = "PySolFC" -PACKAGE = "PySol" -PACKAGE_URL = "http://sourceforge.net/projects/pysolfc/" +#PACKAGE = 'PySolFC' +PACKAGE = 'PySol' +PACKAGE_URL = 'http://sourceforge.net/projects/pysolfc/' + +VERSION = '4.82' +FC_VERSION = '0.9.3' +VERSION_TUPLE = (4, 82) TOOLKIT = 'gtk' TOOLKIT = 'tk' @@ -34,18 +38,18 @@ TOOLKIT = 'tk' # data dirs DATA_DIRS = [] # you can add your extra directories here -if os.name == "posix": +if os.name == 'posix': DATA_DIRS = [ '/usr/share/PySolFC', '/usr/local/share/PySolFC', '/usr/games/PySolFC', '/usr/local/games/PySolFC', ] -if os.name == "nt": +if os.name == 'nt': pass -if os.name == "mac": +if os.name == 'mac': pass TOP_SIZE = 10 -TOP_TITLE = n_("Top 10") +TOP_TITLE = n_('Top 10') diff --git a/pysollib/stack.py b/pysollib/stack.py index a43db16f..d65103de 100644 --- a/pysollib/stack.py +++ b/pysollib/stack.py @@ -105,7 +105,7 @@ from pysoltk import bind, unbind_destroy from pysoltk import after, after_idle, after_cancel from pysoltk import MfxCanvasGroup, MfxCanvasImage, MfxCanvasRectangle, MfxCanvasText from pysoltk import Card -from pysoltk import getTextWidth +from pysoltk import get_text_width from settings import TOOLKIT @@ -1585,7 +1585,8 @@ class TalonStack(Stack, else: ca = None font = self.game.app.getFont("canvas_default") - text_width = getTextWidth(_('Redeal'), font=font, root=self.game.canvas) + text_width = get_text_width(_('Redeal'), font=font, + root=self.game.canvas) if images.CARDW >= text_width+4 and ca: # add a redeal text above the bottom image if self.max_rounds != 1: diff --git a/pysollib/stats.py b/pysollib/stats.py index feb166bb..65b311db 100644 --- a/pysollib/stats.py +++ b/pysollib/stats.py @@ -40,7 +40,7 @@ import os, sys, time, types # PySol imports from mfxutil import SubclassResponsibility, Struct, destruct from mfxutil import format_time -from util import PACKAGE, VERSION +from settings import PACKAGE, VERSION from gamedb import GI diff --git a/pysollib/tk/menubar.py b/pysollib/tk/menubar.py index bc8c951f..55b906d0 100644 --- a/pysollib/tk/menubar.py +++ b/pysollib/tk/menubar.py @@ -43,7 +43,6 @@ import Tkinter, tkColorChooser, tkFileDialog # PySol imports from pysollib.mfxutil import destruct, Struct, kwdefault from pysollib.util import CARDSET -from pysollib.version import VERSION from pysollib.settings import PACKAGE from pysollib.settings import TOP_TITLE from pysollib.gamedb import GI diff --git a/pysollib/tk/selectgame.py b/pysollib/tk/selectgame.py index b291e678..5bbf2135 100644 --- a/pysollib/tk/selectgame.py +++ b/pysollib/tk/selectgame.py @@ -42,7 +42,7 @@ from UserList import UserList from pysollib.mfxutil import destruct, Struct, KwStruct from pysollib.mfxutil import format_time from pysollib.gamedb import GI -from pysollib.help import helpHTML +from pysollib.help import help_html from pysollib.resource import CSI # Toolkit imports @@ -286,7 +286,7 @@ class SelectGameDialog(MfxDialog): if not doc: return dir = os.path.join("html", "rules") - helpHTML(self.app, doc, dir, self.top) + help_html(self.app, doc, dir, self.top) return MfxDialog.mDone(self, button) diff --git a/pysollib/tk/tkhtml.py b/pysollib/tk/tkhtml.py index 5761cda0..04f60a6a 100644 --- a/pysollib/tk/tkhtml.py +++ b/pysollib/tk/tkhtml.py @@ -33,7 +33,7 @@ ## ##---------------------------------------------------------------------------## -__all__ = ['tkHTMLViewer'] +__all__ = ['HTMLViewer'] # imports import os, sys, re, types @@ -228,7 +228,7 @@ class tkHTMLParser(htmllib.HTMLParser): # // # ************************************************************************/ -class tkHTMLViewer: +class HTMLViewer: symbols_fn = {} # filenames, loaded in Application.loadImages3 symbols_img = {} @@ -528,7 +528,7 @@ def tkhtml_main(args): url = os.path.join(os.pardir, os.pardir, "data", "html", "index.html") top = Tkinter.Tk() top.wm_minsize(400, 200) - viewer = tkHTMLViewer(top) + viewer = HTMLViewer(top) viewer.app = None viewer.display(url) top.mainloop() diff --git a/pysollib/tk/tkutil.py b/pysollib/tk/tkutil.py index e26d8730..399c2f58 100644 --- a/pysollib/tk/tkutil.py +++ b/pysollib/tk/tkutil.py @@ -40,7 +40,7 @@ __all__ = ['wm_withdraw', 'wm_get_geometry', #'setTransient', #'makeToplevel', - 'makeHelpToplevel', + 'make_help_toplevel', 'bind', 'unbind_destroy', 'after', @@ -51,7 +51,7 @@ __all__ = ['wm_withdraw', 'loadImage', #'fillImage', 'createImage', - 'getTextWidth', + 'get_text_width', ] # imports @@ -169,7 +169,7 @@ def makeToplevel(parent, title=None): window.wm_iconname(title) return window -def makeHelpToplevel(app, title=None): +def make_help_toplevel(app, title=None): # Create an independent Toplevel window. parent = app.top window = Tkinter.Tk(className=PACKAGE) @@ -192,8 +192,6 @@ def makeHelpToplevel(app, title=None): window.wm_iconname(title) return window -#makeHelpToplevel = makeToplevel - def __getWidgetXY(widget, parent, relx=None, rely=None, w_width=None, w_height=None): @@ -405,6 +403,6 @@ def createImage(width, height, fill, outline=None): # // font utils # ************************************************************************/ -def getTextWidth(text, font, root=None): +def get_text_width(text, font, root=None): return Font(root=root, font=font).measure(text) diff --git a/pysollib/util.py b/pysollib/util.py index 3ae41ec9..765bc55f 100644 --- a/pysollib/util.py +++ b/pysollib/util.py @@ -63,10 +63,9 @@ __all__ = ['SUITS', import sys, os, re, time, types # PySol imports -from version import VERSION, VERSION_TUPLE from mfxutil import Pickler, Unpickler, UnpicklingError from mfxutil import Struct, EnvError -from settings import DATA_DIRS, PACKAGE +from settings import DATA_DIRS, PACKAGE, VERSION, VERSION_TUPLE # /*********************************************************************** # // constants diff --git a/pysollib/version.py b/pysollib/version.py deleted file mode 100644 index 8eeca7e0..00000000 --- a/pysollib/version.py +++ /dev/null @@ -1,30 +0,0 @@ -##---------------------------------------------------------------------------## -## -## PySol -- a Python Solitaire game -## -## This program is free software; you can redistribute it and/or modify -## it under the terms of the GNU General Public License as published by -## the Free Software Foundation; either version 2 of the License, or -## (at your option) any later version. -## -## This program is distributed in the hope that it will be useful, -## but WITHOUT ANY WARRANTY; without even the implied warranty of -## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -## GNU General Public License for more details. -## -## You should have received a copy of the GNU General Public License -## along with this program; see the file COPYING. -## If not, write to the Free Software Foundation, Inc., -## 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -## -##---------------------------------------------------------------------------## - -VERSION = "4.82" -#VERSION_DATE = "20 Aug 2003" -VERSION_MAJOR = 4 -VERSION_MINOR = 82 -VERSION_TUPLE = (4, 82) - -FC_VERSION = "0.9.3" -#FC_VERSION_TUPLE = (0, 4, 0) - diff --git a/scripts/create_iss.py b/scripts/create_iss.py index 52d8db50..2a6a57c1 100755 --- a/scripts/create_iss.py +++ b/scripts/create_iss.py @@ -11,7 +11,7 @@ for root, dirs, files in os.walk('dist'): files_list.append(root) dirs_list.append(root) -execfile(os.path.join('pysollib', 'version.py')) +execfile(os.path.join('pysollib', 'settings.py')) prog_version = FC_VERSION out = open('setup.iss', 'w') diff --git a/setup.py b/setup.py index 0e35d451..0cb1bf94 100644 --- a/setup.py +++ b/setup.py @@ -3,7 +3,7 @@ import os from distutils.core import setup -from pysollib.version import FC_VERSION as VERSION +from pysollib.settings import FC_VERSION as VERSION if os.name == 'nt': import py2exe