Merge remote-tracking branch 'upstream/main' into mod-patch

parts/language/lang_es.lua

@@ -549,6 +549,10 @@ return {
             bg_on="Fondo Normal",
             bg_off="Sin Fondo",
             bg_custom="Fondo Personalizado",
+            -- defaultBG="Default B.G.",
+            -- resetDbg="Reset to default",
+            -- lockBG="Lock B.G.",
+            -- noTheme="Disable theme",
 
             blockSatur="Saturac. de los Bloques",
             fieldSatur="Saturac. del Tablero",

parts/language/lang_fr.lua

@@ -525,6 +525,10 @@ return {
             bg_on="Arrière-plan normal",
             bg_off="Pas d'arrière-plan.",
             bg_custom="Utiliser un arrière-plan personnalisé",
+            -- defaultBG="Default B.G.",
+            -- resetDbg="Reset to default",
+            -- lockBG="Lock B.G.",
+            -- noTheme="Disable theme",
 
             -- blockSatur="Block Saturation",
             -- fieldSatur="Field Saturation",

parts/language/lang_id.lua

@@ -550,6 +550,10 @@ return {
             bg_on="B.G. Normal",
             bg_off="Tidak Ada B.G.",
             bg_custom="Ubah B.G.",
+            -- defaultBG="Default B.G.",
+            -- resetDbg="Reset to default",
+            -- lockBG="Lock B.G.",
+            -- noTheme="Disable theme",
 
             blockSatur="Kejenuhan Blok Aktif",
             fieldSatur="Kejenuhan Blok Terkunci",

parts/language/lang_ja.lua

@@ -594,6 +594,10 @@ C. ゲームパッド
             bg_on="通常背景",
             bg_off="背景なし ",
             bg_custom="カスタム背景",
+            -- defaultBG="Default B.G.",
+            -- resetDbg="Reset to default",
+            -- lockBG="Lock B.G.",
+            -- noTheme="Disable theme",
 
             blockSatur="ブロックデザイン",
             fieldSatur="設置ブロックデザイン",

parts/language/lang_pt.lua

@@ -538,6 +538,10 @@ return {
             -- bg_on="Normal B.G.",
             -- bg_off="No B.G.",
             -- bg_custom="Use Custom B.G.",
+            -- defaultBG="Default B.G.",
+            -- resetDbg="Reset to default",
+            -- lockBG="Lock B.G.",
+            -- noTheme="Disable theme",
 
             -- blockSatur="Block Saturation",
             -- fieldSatur="Field Saturation",

parts/language/lang_symbol.lua

@@ -297,6 +297,10 @@ return {
             bg_on="__?__",
             bg_off="__.__",
             bg_custom="__!__",
+            defaultBG="__$0__",
+            resetDbg="R$0",
+            lockBG="__↓__",
+            noTheme="\\^_^/ "..CHAR.icon.crossMark,
 
             blockSatur="==#0x",
             fieldSatur="[]#0x",

parts/language/lang_zh.lua

@@ -579,6 +579,10 @@ return {
             bg_on="普通背景",
             bg_off="关闭背景",
             bg_custom="应用自定义背景",
+            defaultBG="默认背景",
+            resetDbg="改回默认",
+            lockBG="锁定背景",
+            noTheme="关闭节日主题",
 
             blockSatur="方块饱和度",
             fieldSatur="场地饱和度",

parts/language/lang_zh_code.lua

@@ -498,6 +498,10 @@ return {
             bg_on="Set.BG(Normal);",
             bg_off="Set.BG(Off);",
             bg_custom="Set.BG(Ctm);",
+            -- defaultBG="Default B.G.",
+            -- resetDbg="Reset to default",
+            -- lockBG="Lock B.G.",
+            -- noTheme="Disable theme",
 
             blockSatur="Set.BlockSatur",
             fieldSatur="Set.FieldSatur",

parts/language/lang_zh_trad.lua

@@ -550,6 +550,10 @@ return {
             bg_on="普通背景",
             bg_off="無背景",
             bg_custom="應用自定義背景",
+            defaultBG="默認背景",
+            resetDbg="改回默認",
+            lockBG="鎖定背景",
+            noTheme="關閉節日主題",
 
             blockSatur="方塊飽和",
             fieldSatur="場地飽和",

parts/scenes/mod.lua

@@ -14,12 +14,7 @@ local function _toggleMod(M,back)
     else
         GAME.mod[number]=1-GAME.mod[number]
     end
-    -- Unranked
+    SFX.play(GAME.mod[number]>0 and 'mod_on' or 'mod_off')
-    SFX.play('touch',.6)
-    SFX.play('lock')
-    -- Still ranked
-    -- SFX.play('touch')
-    -- SFX.play('lock',.6)
     scene.widgetList.unranked.hide=scoreValid()
 end