fixes: language (de) and cardset option (android version).

shlomif · Mar 18, 2024 · de50c45 · de50c45
1 parent 96700c5
commit de50c45
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 6 deletions.
diff --git a/buildozer/aversion b/buildozer/aversion
@@ -9,7 +9,7 @@ else
 fi
 
 # current android version mumber.
-version="2.24.0"
+version="2.26.0"
 sversion=$(echo $version  | sed -E "s:(.*)\..*:\1:")
 tuple=$(echo $version | sed -E "s:(.*)\.(.*)\.(.*):(\1, \2, \3):")
 

diff --git a/...ta/android/en-US/changelogs/102122100.txt → ...ta/android/en-US/changelogs/102130000.txt b/...ta/android/en-US/changelogs/102122100.txt → ...ta/android/en-US/changelogs/102130000.txt
diff --git a/po/de_pysol.po b/po/de_pysol.po
@@ -1709,22 +1709,22 @@ msgstr "Name:"
 #: pysollib/tile/selectgame.py:179 pysollib/tile/selectgame.py:561
 #: pysollib/tk/selectgame.py:179 pysollib/tk/selectgame.py:561
 msgid "Luck only"
-msgstr "Nur Glück"
+msgstr "nur Glück"
 
 #: pysollib/wizardutil.py:110 pysollib/kivy/selectgame.py:204
 #: pysollib/pysolgtk/selectgame.py:237 pysollib/pysolgtk/selectgame.py:473
 #: pysollib/tile/selectgame.py:181 pysollib/tile/selectgame.py:562
 #: pysollib/tk/selectgame.py:181 pysollib/tk/selectgame.py:562
 msgid "Mostly luck"
-msgstr "Meist glücklich"
+msgstr "hauptsächlich Glück"
 
 #: pysollib/wizardutil.py:111 pysollib/wizardutil.py:115
 #: pysollib/kivy/selectgame.py:206 pysollib/pysolgtk/selectgame.py:238
 #: pysollib/pysolgtk/selectgame.py:474 pysollib/tile/selectgame.py:183
 #: pysollib/tile/selectgame.py:563 pysollib/tk/selectgame.py:183
 #: pysollib/tk/selectgame.py:563
 msgid "Balanced"
-msgstr "Ausgewogen"
+msgstr "ausgewogen"
 
 #: pysollib/wizardutil.py:112 pysollib/kivy/selectgame.py:208
 #: pysollib/pysolgtk/selectgame.py:239 pysollib/pysolgtk/selectgame.py:475
@@ -1738,7 +1738,7 @@ msgstr "viel Geschicklichkeit"
 #: pysollib/tile/selectgame.py:188 pysollib/tile/selectgame.py:565
 #: pysollib/tk/selectgame.py:188 pysollib/tk/selectgame.py:565
 msgid "Skill only"
-msgstr "Nur Geschicklichkeit"
+msgstr "nur Geschicklichkeit"
 
 #: pysollib/wizardutil.py:116 pysollib/pysolgtk/selectgame.py:118
 #: pysollib/tile/selectgame.py:396 pysollib/tk/selectgame.py:396

diff --git a/pysollib/options.py b/pysollib/options.py
@@ -569,10 +569,12 @@ def setDefaults(self, top=None):
             self.tabletile_name = None
         # cardsets
         c = "Standard"
+        m = "Crystal Mahjongg"
         if sw < 800 or sh < 600:
             c = "2000"
         if TOOLKIT == 'kivy':
             c = "Standard"
+            m = "Gnome Mahjongg 1"
 
         # if sw > 1024 and sh > 768:
         #    c = 'Dondorf'
@@ -608,7 +610,7 @@ def setDefaults(self, top=None):
                 0:                  {0: (c, "")},
                 CSI.TYPE_FRENCH:    {0: (c, ""), 1: (c, "")},
                 CSI.TYPE_HANAFUDA:  {0: ("Kintengu", "")},
-                CSI.TYPE_MAHJONGG:  {0: ("Crystal Mahjongg", "")},
+                CSI.TYPE_MAHJONGG:  {0: (m, "")},
                 CSI.TYPE_TAROCK:    {0: ("Vienna 2K", "")},
                 CSI.TYPE_HEXADECK:  {0: ("Hex A Deck", "")},
                 CSI.TYPE_MUGHAL_GANJIFA: {0: ("Mughal Ganjifa", "")},