From ba43e5e6a78e0438bbb63bd38c81e45baddddfd4 Mon Sep 17 00:00:00 2001
From: MrZ_26 <MrZ626@users.github.com>
Date: Wed, 12 Aug 2020 18:47:00 +0800
Subject: [PATCH] =?UTF-8?q?=E8=BD=AF=E4=BB=B6=E9=94=81=E5=8F=98=E9=87=8F?=
 =?UTF-8?q?=E5=90=8D=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Zframework/init.lua       |  2 +-
 Zframework/languages.lua  | 10 +++++-----
 Zframework/widgetList.lua |  2 +-
 parts/default_data.lua    |  2 +-
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/Zframework/init.lua b/Zframework/init.lua
index 4419fd9e..ea1958c0 100644
--- a/Zframework/init.lua
+++ b/Zframework/init.lua
@@ -1092,7 +1092,7 @@ function love.run()
 	local FCT=0--Framedraw counter
 
 	love.resize(gc.getWidth(),gc.getHeight())
-	SCN.init(setting.lock and "calculator"or"load")--Scene Launch
+	SCN.init(setting.appLock and "calculator"or"load")--Scene Launch
 	marking=true
 
 	return function()
diff --git a/Zframework/languages.lua b/Zframework/languages.lua
index 4a794425..826ed0f7 100644
--- a/Zframework/languages.lua
+++ b/Zframework/languages.lua
@@ -275,7 +275,7 @@ local langList={
 				autoPause="失去焦点自动暂停",
 				swap="组合键切换攻击模式",
 				fine="极简操作提示音",
-				lock="软件锁(密码626)",
+				appLock="软件锁(密码626)",
 				back="返回",
 			},
 			setting_video={
@@ -742,7 +742,7 @@ local langList={
 				autoPause="失去焦点自动暂停",
 				swap="组合键切换攻击模式",
 				fine="极简操作提示音",
-				lock="软件锁(密码626)",
+				appLock="软件锁(密码626)",
 				back="返回",
 			},
 			setting_video={
@@ -1198,7 +1198,7 @@ local langList={
 				autoPause="Pause when lose focus",
 				swap="Key Combination (Change Atk. Mode)",
 				fine="Finesse Error Sound",
-				lock="Game Lock(pw=626)",
+				appLock="App Lock(pw=626)",
 				back="Back",
 			},
 			setting_video={
@@ -1652,7 +1652,7 @@ local langList={
 				autoPause="A||",
 				swap="=+=+=",
 				fine="!#!X #!#",
-				lock="?XX(=626)",
+				appLock="?XX(=626)",
 				back="X",
 			},
 			setting_video={
@@ -2122,7 +2122,7 @@ local langList={
 				autoPause="失去焦点自动暂停",
 				swap="组合键切换攻击模式",
 				fine="极简操作提示音",
-				lock="家长锁(密码626)",
+				appLock="家长锁(密码626)",
 				back="返回",
 			},
 			setting_video={
diff --git a/Zframework/widgetList.lua b/Zframework/widgetList.lua
index acf2284f..e68478f4 100644
--- a/Zframework/widgetList.lua
+++ b/Zframework/widgetList.lua
@@ -249,7 +249,7 @@ local Widgets={
 		newSwitch({name="autoPause",x=1080,	y=320,	font=20,disp=SETval("autoPause"),	code=SETrev("autoPause")}),
 		newSwitch({name="swap",		x=1080,	y=380,	font=20,disp=SETval("swap"),		code=SETrev("swap")}),
 		newSwitch({name="fine",		x=1080,	y=440,	font=20,disp=SETval("fine"),		code=SETrev("fine")}),
-		newSwitch({name="lock",		x=1080,	y=500,	font=20,disp=SETval("lock"),		code=SETrev("lock")}),
+		newSwitch({name="appLock",	x=1080,	y=500,	font=20,disp=SETval("appLock"),		code=SETrev("appLock")}),
 		newButton({name="back",		x=1140,	y=650,	w=200,h=80,color="white",	font=40,code=BACK}),
 	},
 	setting_video={
diff --git a/parts/default_data.lua b/parts/default_data.lua
index dee02257..f7bafaf1 100644
--- a/parts/default_data.lua
+++ b/parts/default_data.lua
@@ -10,7 +10,7 @@ setting={
 	reTime=4,
 	autoPause=true,
 	fine=false,
-	lock=false,
+	appLock=false,
 	lang=1,
 	skinSet=1,
 	skin={1,5,8,2,10,3,7,1,5,1,5,8,2,10,3,7,10,7,8,2,8,2,1,5,3},