From d9d02d47ca1d3055de6fe5572fb7833ec8179461 Mon Sep 17 00:00:00 2001 From: Joe R Date: Thu, 21 Mar 2024 18:28:01 -0400 Subject: [PATCH] Added category to the tree for games with jokers. --- po/de_pysol.po | 11 +++++++---- po/fr_pysol.po | 11 +++++++---- po/it_pysol.po | 5 ++++- po/pl_pysol.po | 11 +++++++---- po/pt_BR_pysol.po | 11 +++++++---- po/pysol.pot | 3 +++ po/ru_pysol.po | 11 +++++++---- pysollib/kivy/selectgame.py | 5 ++++- pysollib/tile/selectgame.py | 3 +++ pysollib/tk/selectgame.py | 3 +++ 10 files changed, 52 insertions(+), 22 deletions(-) diff --git a/po/de_pysol.po b/po/de_pysol.po index c7194eb61..577e335c3 100644 --- a/po/de_pysol.po +++ b/po/de_pysol.po @@ -3,7 +3,7 @@ msgstr "" "Project-Id-Version: PySol 0.0.1\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2021-12-10 10:19-0500\n" -"PO-Revision-Date: 2024-03-15 23:06-0400\n" +"PO-Revision-Date: 2024-03-21 18:22-0400\n" "Last-Translator: H. Schaekel \n" "Language-Team: German\n" "Language: de\n" @@ -1266,9 +1266,6 @@ msgstr[1] "%d Wiederholungen" msgid "Talon." msgstr "Talon." -msgid "Reserve." -msgstr "Reserve." - #: pysollib/stack.py:2228 pysollib/stack.py:2992 msgid "Reserve. No building." msgstr "Reserve. Nicht aufgebaut." @@ -2376,6 +2373,9 @@ msgstr "" "Tableau. Aufgebaut nach Farbe. Sequenzen von Karten in der gleichen Farbe " "können als eine Einheit bewegt werden." +msgid "Reserve." +msgstr "Reserve." + #: pysollib/games/klondike.py:461 msgid "Reserve. Only Kings are acceptable." msgstr "Reserve. Nur Könige sind erlaubt." @@ -3264,6 +3264,9 @@ msgstr "" msgid "Games with Separate Decks" msgstr "Spiele mit separaten Decks" +msgid "Games with Jokers" +msgstr "" + #: pysollib/kivy/selectgame.py:271 pysollib/pysolgtk/selectgame.py:306 #: pysollib/tile/selectgame.py:249 pysollib/tk/selectgame.py:249 msgid "Open Games (all cards visible)" diff --git a/po/fr_pysol.po b/po/fr_pysol.po index f3cc05902..1a401033c 100644 --- a/po/fr_pysol.po +++ b/po/fr_pysol.po @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: 1.02\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2021-12-10 10:19-0500\n" -"PO-Revision-Date: 2024-03-15 23:06-0400\n" +"PO-Revision-Date: 2024-03-21 18:23-0400\n" "Last-Translator: Eric Rausch \n" "Language-Team: French\n" "Language: fr\n" @@ -1296,9 +1296,6 @@ msgstr[1] "%d donnes" msgid "Talon." msgstr "Talon." -msgid "Reserve." -msgstr "Réserve." - #: pysollib/stack.py:2228 pysollib/stack.py:2992 msgid "Reserve. No building." msgstr "Réserve. Aucun empilement." @@ -2415,6 +2412,9 @@ msgstr "" "Tableau. Décroissant par couleur. Les ensembles de cartes d'une même " "enseigne peuvent être déplacés entièrement." +msgid "Reserve." +msgstr "Réserve." + #: pysollib/games/klondike.py:461 msgid "Reserve. Only Kings are acceptable." msgstr "Réserve. Rois seuls." @@ -3303,6 +3303,9 @@ msgstr "" msgid "Games with Separate Decks" msgstr "Jeux avec jeux de cartes séparés" +msgid "Games with Jokers" +msgstr "" + #: pysollib/kivy/selectgame.py:271 pysollib/pysolgtk/selectgame.py:306 #: pysollib/tile/selectgame.py:249 pysollib/tk/selectgame.py:249 msgid "Open Games (all cards visible)" diff --git a/po/it_pysol.po b/po/it_pysol.po index e870d309f..12f39d579 100644 --- a/po/it_pysol.po +++ b/po/it_pysol.po @@ -12,7 +12,7 @@ msgstr "" "Project-Id-Version: it_pysol\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2021-12-10 10:19-0500\n" -"PO-Revision-Date: 2024-03-15 23:06-0400\n" +"PO-Revision-Date: 2024-03-21 18:23-0400\n" "Last-Translator: Giuliano Colla \n" "Language-Team: Italiano \n" "Language: it\n" @@ -3368,6 +3368,9 @@ msgstr "" msgid "Games with Separate Decks" msgstr "Giochi con mazzi separati" +msgid "Games with Jokers" +msgstr "" + #: pysollib/kivy/selectgame.py:271 pysollib/pysolgtk/selectgame.py:306 #: pysollib/tile/selectgame.py:249 pysollib/tk/selectgame.py:249 msgid "Open Games (all cards visible)" diff --git a/po/pl_pysol.po b/po/pl_pysol.po index 03309b5e5..f4eb2a095 100644 --- a/po/pl_pysol.po +++ b/po/pl_pysol.po @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: PySolFC\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2021-12-10 10:19-0500\n" -"PO-Revision-Date: 2024-03-15 23:05-0400\n" +"PO-Revision-Date: 2024-03-21 18:24-0400\n" "Last-Translator: Jerzy Trzeciak \n" "Language-Team: Polish \n" "Language: pl\n" @@ -1303,9 +1303,6 @@ msgstr[2] "%d rozdań" msgid "Talon." msgstr "Stos wyjściowy." -msgid "Reserve." -msgstr "Stos rezerwowy." - #: pysollib/stack.py:2228 pysollib/stack.py:2992 msgid "Reserve. No building." msgstr "Stos rezerwowy. Nie układaj." @@ -2429,6 +2426,9 @@ msgstr "" "Stół gry. Układaj w dół według barwy. Sekwens kart tego samego koloru można " "przenieść jako całość." +msgid "Reserve." +msgstr "Stos rezerwowy." + #: pysollib/games/klondike.py:461 msgid "Reserve. Only Kings are acceptable." msgstr "Stos rezerwowy. Tylko Króle są dozwolone." @@ -3318,6 +3318,9 @@ msgstr "" msgid "Games with Separate Decks" msgstr "Gry z odrębnymi taliami" +msgid "Games with Jokers" +msgstr "" + #: pysollib/kivy/selectgame.py:271 pysollib/pysolgtk/selectgame.py:306 #: pysollib/tile/selectgame.py:249 pysollib/tk/selectgame.py:249 msgid "Open Games (all cards visible)" diff --git a/po/pt_BR_pysol.po b/po/pt_BR_pysol.po index f62697d36..54040b9d5 100644 --- a/po/pt_BR_pysol.po +++ b/po/pt_BR_pysol.po @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2021-12-10 10:19-0500\n" -"PO-Revision-Date: 2024-03-15 23:05-0400\n" +"PO-Revision-Date: 2024-03-21 18:24-0400\n" "Last-Translator: Matheus Knack \n" "Language-Team: \n" "Language: pt_BR\n" @@ -1295,9 +1295,6 @@ msgstr[1] "%d redistribuições" msgid "Talon." msgstr "Monte" -msgid "Reserve." -msgstr "Reservar." - #: pysollib/stack.py:2228 pysollib/stack.py:2992 msgid "Reserve. No building." msgstr "Reservar. Sem construção." @@ -2437,6 +2434,9 @@ msgstr "" "Tableau. Descrescente por cor. Sequências de cartas de mesmo naipe podem ser " "movidas como uma unidade." +msgid "Reserve." +msgstr "Reservar." + #: pysollib/games/klondike.py:461 msgid "Reserve. Only Kings are acceptable." msgstr "Reserva. Somente Reis são aceitos." @@ -3324,6 +3324,9 @@ msgstr "Jogos com Baralhos Despojados" msgid "Games with Separate Decks" msgstr "Jogos com Baralhos Separados" +msgid "Games with Jokers" +msgstr "" + #: pysollib/kivy/selectgame.py:271 pysollib/pysolgtk/selectgame.py:306 #: pysollib/tile/selectgame.py:249 pysollib/tk/selectgame.py:249 msgid "Open Games (all cards visible)" diff --git a/po/pysol.pot b/po/pysol.pot index ab088b2fe..587211577 100644 --- a/po/pysol.pot +++ b/po/pysol.pot @@ -3132,6 +3132,9 @@ msgstr "" msgid "Games with Separate Decks" msgstr "" +msgid "Games with Jokers" +msgstr "" + #: pysollib/kivy/selectgame.py:271 pysollib/pysolgtk/selectgame.py:306 #: pysollib/tile/selectgame.py:249 pysollib/tk/selectgame.py:249 msgid "Open Games (all cards visible)" diff --git a/po/ru_pysol.po b/po/ru_pysol.po index a7660975a..238c5b137 100644 --- a/po/ru_pysol.po +++ b/po/ru_pysol.po @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2021-12-10 10:19-0500\n" -"PO-Revision-Date: 2024-03-15 23:05-0400\n" +"PO-Revision-Date: 2024-03-21 18:26-0400\n" "Last-Translator: Skomoroh \n" "Language-Team: Russian \n" "Language: ru\n" @@ -1293,9 +1293,6 @@ msgstr[2] "%d пересдач" msgid "Talon." msgstr "Колода." -msgid "Reserve." -msgstr "Резерв." - #: pysollib/stack.py:2228 pysollib/stack.py:2992 msgid "Reserve. No building." msgstr "Резерв. Без выкладывания." @@ -2422,6 +2419,9 @@ msgstr "" "Игровой стол. Складывать по убыванию в соответствии с цветом. Можно " "перемещать серии карт одинаковой масти." +msgid "Reserve." +msgstr "Резерв." + #: pysollib/games/klondike.py:461 msgid "Reserve. Only Kings are acceptable." msgstr "Резерв. Только для королей." @@ -3377,6 +3377,9 @@ msgstr "" msgid "Games with Separate Decks" msgstr "Игры с раздельными колодами" +msgid "Games with Jokers" +msgstr "" + #: pysollib/kivy/selectgame.py:271 pysollib/pysolgtk/selectgame.py:306 #: pysollib/tile/selectgame.py:249 pysollib/tk/selectgame.py:249 msgid "Open Games (all cards visible)" diff --git a/pysollib/kivy/selectgame.py b/pysollib/kivy/selectgame.py index 476b76730..4b84ccdf0 100644 --- a/pysollib/kivy/selectgame.py +++ b/pysollib/kivy/selectgame.py @@ -255,7 +255,7 @@ def select_func(gi, games=games): lambda gi: gi.si.redeals == 3), SelectGameNode(None, _("Unlimited redeals"), lambda gi: gi.si.redeals == -1), - SelectGameNode(None, "Variable redeals", + SelectGameNode(None, _("Variable redeals"), lambda gi: gi.si.redeals == -2), SelectGameNode(None, _("Other number of redeals"), lambda gi: gi.si.redeals not in @@ -274,6 +274,9 @@ def select_func(gi, games=games): lambda gi: gi.si.game_flags & GI.GT_STRIPPED), SelectGameNode(None, _("Games with Separate Decks"), lambda gi: gi.si.game_flags & GI.GT_SEPARATE_DECKS), + SelectGameNode(None, _("Games with Jokers"), + lambda gi: gi.category == GI.GC_FRENCH and + gi.subcategory == GI.GS_JOKER_DECK), SelectGameNode(None, _("Open Games (all cards visible)"), lambda gi: gi.si.game_flags & GI.GT_OPEN), SelectGameNode(None, _("Relaxed Variants"), diff --git a/pysollib/tile/selectgame.py b/pysollib/tile/selectgame.py index 9a23efdc6..a43e0b7d4 100644 --- a/pysollib/tile/selectgame.py +++ b/pysollib/tile/selectgame.py @@ -251,6 +251,9 @@ def select_func(gi, games=games): SelectGameNode(None, _("Games with Separate Decks"), lambda gi: gi.si.game_flags & GI.GT_SEPARATE_DECKS), + SelectGameNode(None, _("Games with Jokers"), + lambda gi: gi.category == GI.GC_FRENCH and + gi.subcategory == GI.GS_JOKER_DECK), SelectGameNode(None, _("Open Games (all cards visible)"), lambda gi: gi.si.game_flags & GI.GT_OPEN), SelectGameNode(None, _("Relaxed Variants"), diff --git a/pysollib/tk/selectgame.py b/pysollib/tk/selectgame.py index 57ec26d07..75fd009b5 100644 --- a/pysollib/tk/selectgame.py +++ b/pysollib/tk/selectgame.py @@ -250,6 +250,9 @@ def select_func(gi, games=games): SelectGameNode( None, _("Games with Separate Decks"), lambda gi: gi.si.game_flags & GI.GT_SEPARATE_DECKS), + SelectGameNode(None, _("Games with Jokers"), + lambda gi: gi.category == GI.GC_FRENCH and + gi.subcategory == GI.GS_JOKER_DECK), SelectGameNode(None, _("Open Games (all cards visible)"), lambda gi: gi.si.game_flags & GI.GT_OPEN), SelectGameNode(None, _("Relaxed Variants"),